diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index b8baa4700..f50a926e4 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -218,7 +218,6 @@ public class BaseController { if (member == null) { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } - setCUserBasicChild(member); RedisCacheUtils.cache(objectCommonRedisTemplate, key, member, seconds); } @@ -276,13 +275,5 @@ public class BaseController { return ipaddress; } - private void setCUserBasicChild(WxCUserBasicInfo basicInfo){ - WxCUserBasicChild child = new WxCUserBasicChild(); - child.setCUserId(basicInfo.getId()); - child.setTenantId(basicInfo.getFinalTenantId()); - List list = wxCUserBasicChildService.findList(child); - basicInfo.setChildrenList(list); - } - } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoChildController.java b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoChildController.java new file mode 100644 index 000000000..c1efb50d2 --- /dev/null +++ b/mallinkCApi/src/main/java/com/iformall/controller/UserBasicInfoChildController.java @@ -0,0 +1,122 @@ +package com.iformall.controller; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.domain.po.UserBasicInfoAddress; +import com.iformall.domain.po.WxCUserBasicChild; +import com.iformall.service.UserBasicInfoAddressService; +import com.iformall.service.WxCUserBasicChildService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("api/userBasicInfoAddress") +@Api(description = "会员子女相关接口") +public class UserBasicInfoChildController extends BaseController { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + private WxCUserBasicChildService wxCUserBasicChildService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + public ResultData list(@ModelAttribute WxCUserBasicChild userBasicChild, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] UserBasicInfoChildController::list"); + if (null == userBasicChild) { + userBasicChild = new WxCUserBasicChild(); + } + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + userBasicChild.setCUserId(memberId); + userBasicChild.setTenantId(getTenantInfo().getFinalTenantId()); + PageInfo page = wxCUserBasicChildService.listAsPage(userBasicChild, pageNum, pageSize); + return new ResultData(page); + } + + @PostMapping("saveOrUpdate") + public ResultData saveOrUpdate(@RequestBody WxCUserBasicChild userBasicChild) { + logger.debug("[" + getIpAddr() + "] UserBasicInfoChildController::saveOrUpdate"); + if(userBasicChild == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + userBasicChild.setCUserId(memberId); + userBasicChild.setTenantId(getTenantInfo().getFinalTenantId()); + wxCUserBasicChildService.saveOrUpdate(userBasicChild); + return new ResultData(); + } + + @PostMapping("saveList") + public ResultData saveOrUpdate(@RequestBody List userBasicChilds) { + logger.debug("[" + getIpAddr() + "] UserBasicInfoChildController::saveOrUpdate"); + if(userBasicChilds == null || userBasicChilds.isEmpty()){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + for (WxCUserBasicChild userBasicChild:userBasicChilds) { + userBasicChild.setCUserId(memberId); + userBasicChild.setTenantId(getTenantInfo().getFinalTenantId()); + wxCUserBasicChildService.saveOrUpdate(userBasicChild); + } + return new ResultData(); + } + + @ApiOperation("删除") + @GetMapping("/del") + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) + public ResultData delete(Long id) { + logger.debug("[" + getIpAddr() + "] UserBasicInfoChildController::delete"); + if(id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "Id为空"); + } + WxCUserBasicChild userBasicChild = new WxCUserBasicChild(); + userBasicChild.setId(id); + userBasicChild.setTenantId(getTenantInfo().getFinalTenantId()); + wxCUserBasicChildService.updDelById(userBasicChild); + return new ResultData(); + } + + @ApiOperation("查询") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "String", paramType = "query", required = true) + public ResultData findById(Long id) { + logger.debug("[" + getIpAddr() + "] UserBasicInfoChildController::findById"); + if(id == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "Id为空"); + } + WxCUserBasicChild userBasicChild = new WxCUserBasicChild(); + userBasicChild.setId(id); + userBasicChild.setTenantId(getTenantInfo().getFinalTenantId()); + userBasicChild = wxCUserBasicChildService.findById(userBasicChild); + return new ResultData(userBasicChild); + } + +} \ No newline at end of file diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 986c58407..3a8f4564a 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -537,7 +537,6 @@ public class WxUserGrantController extends BaseController { userVo.setWeight(wxCUserBasicInfo.getWeight()); userVo.setAddress(wxCUserBasicInfo.getAddress()); userVo.setStatus(wxCUserBasicInfo.getStatus()); - userVo.setChildrenList(wxCUserBasicInfo.getChildrenList()); } } catch (Exception e) { logger.error("userinfo error.",e); @@ -696,8 +695,6 @@ public class WxUserGrantController extends BaseController { record.setAddress(wxCUserBasicInfo.getAddress()); record.setUpdateDate(new Date()); record.setFinalTenantId(tenantEntity.getFinalTenantId()); - record.setChildrenList(wxCUserBasicInfo.getChildrenList()); - record.setUpdChild(true); wxCUserBasicInfoService.update(record); try{ diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 5b79df666..104f9e690 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -161,9 +161,6 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { @TableField(exist = false) private List childrenList; - @TableField(exist = false) - private boolean updChild = false; - @TableField(exist = false) private String tagIds; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java index 1674dba2c..73bb11955 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicChildService.java @@ -15,5 +15,8 @@ public interface WxCUserBasicChildService { int updDelById(WxCUserBasicChild record); int deleteByUserBasicId(WxCUserBasicChild record); + + WxCUserBasicChild findById(WxCUserBasicChild userBasicChild); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java index 1c76b8fa9..4216a3648 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicChildServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; @@ -57,4 +58,9 @@ public class WxCUserBasicChildServiceImpl implements WxCUserBasicChildService { public int deleteByUserBasicId(WxCUserBasicChild record) { return wxCUserBasicChildMapper.deleteByUserBasicId(record); } + + @Override + public WxCUserBasicChild findById(WxCUserBasicChild userBasicChild) { + return wxCUserBasicChildMapper.selectOne(new QueryWrapper<>(userBasicChild)); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index c91bfc60a..d16050363 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -756,21 +756,6 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc @Override public void update(WxCUserBasicInfo record) { - if(record.isUpdChild()){ - WxCUserBasicChild childvo = new WxCUserBasicChild(); - childvo.setCUserId(record.getId()); - childvo.setTenantId(record.getFinalTenantId()); - wxCUserBasicChildService.deleteByUserBasicId(childvo); - List childrenList = record.getChildrenList(); - if(childrenList != null && childrenList.size() > 0){ - for (WxCUserBasicChild child:childrenList) { - child.setId(null); - child.setTenantId(record.getFinalTenantId()); - child.setCUserId(record.getId()); - wxCUserBasicChildService.saveOrUpdate(child); - } - } - } wxCUserBasicInfoMapper.updateById(record); } diff --git a/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java b/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java index 743d47fac..df1deb9d2 100644 --- a/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java +++ b/mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java @@ -496,7 +496,6 @@ public class TtUserGrantController extends BaseController { userVo.setSex(wxCUserBasicInfo.getSex()); userVo.setAddress(wxCUserBasicInfo.getAddress()); userVo.setStatus(wxCUserBasicInfo.getStatus()); - userVo.setChildrenList(wxCUserBasicInfo.getChildrenList()); } } catch (Exception e) { logger.error("userinfo error.",e);