diff --git a/src/main/java/com/ccsens/defaultwbs/api/UserController.java b/src/main/java/com/ccsens/defaultwbs/api/UserController.java index 53785ee..6886fd2 100644 --- a/src/main/java/com/ccsens/defaultwbs/api/UserController.java +++ b/src/main/java/com/ccsens/defaultwbs/api/UserController.java @@ -1,14 +1,22 @@ package com.ccsens.defaultwbs.api; +import com.ccsens.common.bean.dto.CMemberDto; +import com.ccsens.common.bean.dto.CTaskDto; +import com.ccsens.defaultwbs.service.IUserService; import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @Api(tags = "DEBUG" , description = "DebugController | ") @@ -16,15 +24,26 @@ import javax.servlet.http.HttpServletRequest; @RequestMapping("/user") @Slf4j public class UserController { + @Resource + private IUserService userService; - @ApiOperation(value = "/测试",notes = "") + @ApiOperation(value = "根据手机号更新成员的userId",notes = "") @ApiImplicitParams({ }) - @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) - public JsonResponse debug(HttpServletRequest request) throws Exception { - - return JsonResponse.newInstance().ok("测试"); + @RequestMapping(value="/memberWithPhone",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) + public JsonResponse memberWithPhone(@ApiParam @Validated @RequestBody CMemberDto.PhoneAndUserId params) throws Exception { + log.info("根据手机号更新成员userId"); + userService.memberWithPhone(params); + return JsonResponse.newInstance().ok(); } - + @ApiOperation(value = "合并用户后修改userId",notes = "") + @ApiImplicitParams({ + }) + @RequestMapping(value="/mergeUser",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) + public JsonResponse mergeUser(@ApiParam @Validated @RequestBody CMemberDto.MergeUser params) throws Exception { + log.info("合并用户后修改userId"); + userService.mergeUser(params); + return JsonResponse.newInstance().ok(); + } } diff --git a/src/main/java/com/ccsens/defaultwbs/service/IUserService.java b/src/main/java/com/ccsens/defaultwbs/service/IUserService.java new file mode 100644 index 0000000..106e402 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/service/IUserService.java @@ -0,0 +1,17 @@ +package com.ccsens.defaultwbs.service; + +import com.ccsens.common.bean.dto.CMemberDto; + +public interface IUserService { + /** + * 根据手机号修改成员的userId + * @param params 手机号和userId + */ + void memberWithPhone(CMemberDto.PhoneAndUserId params); + + /** + * 合并用户后修改userId + * @param params 新旧userId + */ + void mergeUser(CMemberDto.MergeUser params); +} diff --git a/src/main/java/com/ccsens/defaultwbs/service/UserService.java b/src/main/java/com/ccsens/defaultwbs/service/UserService.java new file mode 100644 index 0000000..1855470 --- /dev/null +++ b/src/main/java/com/ccsens/defaultwbs/service/UserService.java @@ -0,0 +1,33 @@ +package com.ccsens.defaultwbs.service; + +import com.ccsens.common.bean.dto.CMemberDto; +import com.ccsens.common.service.IMemberService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class UserService implements IUserService{ + + @Resource + private IMemberService memberService; + + @Override + public void memberWithPhone(CMemberDto.PhoneAndUserId params) { + memberService.relevancePhone(params); + } + + @Override + public void mergeUser(CMemberDto.MergeUser params) { + //最小项目关联的userId + memberService.mergeUser(params); + //TODO 其他业务 + } + + +}