From 8d1602b4cafcbe116ea2ee11b0a02c71caa51384 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Apr 2023 17:52:35 +0800 Subject: [PATCH 1/4] //MALL FEE --- .../basic/TtMallGoodsCategoryController.java | 24 ++++++++++++++++--- .../service/TtMallGoodsCategoryService.java | 2 +- .../impl/TtMallGoodsCategoryServiceImpl.java | 5 ++-- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java index d7f33764c..0934bdb22 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMallGoodsCategoryController.java @@ -7,11 +7,14 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.TtGoodsCategory; +import com.iformall.domain.po.WxMall; import com.iformall.domain.vo.TtMallGoodsCategoryVo; import com.iformall.service.TtGoodsCategoryService; import com.iformall.service.TtMallGoodsCategoryService; +import com.iformall.service.WxMallService; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -29,16 +32,24 @@ public class TtMallGoodsCategoryController extends BaseController { @Autowired private TtMallGoodsCategoryService ttMallGoodsCategoryService; + @Autowired + private WxMallService wxMallService; + + @TenantIgnore @ApiOperation("分页列表接口") @GetMapping("allTreeList") @ApiImplicitParams({}) @SystemControllerLog(description = "列表") - public ResultData allTreeList() { + public ResultData allTreeList(String tenantId) { logger.debug("[" + getIpAddr() + "] TtMerchantPoiController::allTreeList"); - return new ResultData(ttMallGoodsCategoryService.findAllTreeList(getTenantInfo())); + if(StringUtils.isBlank(tenantId)){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId 为null"); + } + return new ResultData(ttMallGoodsCategoryService.findAllTreeList(tenantId)); } + @TenantIgnore @ApiOperation("设置软件服务费") @PostMapping("setMallSoftwareFee") @ApiImplicitParams({}) @@ -48,7 +59,14 @@ public class TtMallGoodsCategoryController extends BaseController { if(record.getCategoryId() == null || record.getMallSoftwareFee() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - record.updateTenantInfo(getTenantInfo()); + if(record.getTenantId() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId 为null"); + } + WxMall mall = wxMallService.getByTenantId(record.getTenantId()); + if(mall == null){ + return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); + } + record.updateTenantInfo(mall); ttMallGoodsCategoryService.updateFee(record); return new ResultData(); diff --git a/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java b/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java index 3da831f73..cd0aea9dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/TtMallGoodsCategoryService.java @@ -10,7 +10,7 @@ import java.util.List; public interface TtMallGoodsCategoryService { - List findAllTreeList(TenantEntity tenantInfo); + List findAllTreeList(String tenantId); void updateFee(TtMallGoodsCategoryVo record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java index 653c9162f..4bd76a957 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java @@ -40,9 +40,10 @@ public class TtMallGoodsCategoryServiceImpl implements TtMallGoodsCategoryServic @Override - public List findAllTreeList(TenantEntity tenantInfo) { + public List findAllTreeList(String tenantId) { TtMallGoodsCategoryVo mgcVoQ = new TtMallGoodsCategoryVo(); - mgcVoQ.updateTenantInfo(tenantInfo); +// mgcVoQ.updateTenantInfo(tenantInfo); + mgcVoQ.setTenantId(tenantId); mgcVoQ.setIsDel(EnumYesOrNo.NO.getCode()); mgcVoQ.setSortColumns(BaseEntity.SortField.Id_ASC); List listAll = ttMallGoodsCategoryMapper.findAllTreeList(mgcVoQ); From 5b2903c6d1375609cc3be3b424c8492280fffd42 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Apr 2023 17:58:12 +0800 Subject: [PATCH 2/4] //MALL FEE --- .../src/main/resources/mapper/TtMallGoodsCategoryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml b/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml index 7f1e583ab..ef75c1254 100644 --- a/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml @@ -81,7 +81,7 @@ - + From e6fa8c7fa8455eb7c4c704032c45c162e1446e38 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Apr 2023 18:23:40 +0800 Subject: [PATCH 3/4] //MALL FEE --- .../src/main/resources/mapper/TtMallGoodsCategoryMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml b/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml index ef75c1254..7dc02206b 100644 --- a/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/TtMallGoodsCategoryMapper.xml @@ -71,7 +71,7 @@ (#{item.goodsCategoryId,jdbcType=INTEGER}, #{item.tenantId,jdbcType=VARCHAR}, #{item.parentTenantId,jdbcType=VARCHAR}, - #{item.software_fee,jdbcType=INTEGER}, + #{item.softwareFee,jdbcType=INTEGER}, #{item.createDate,jdbcType=TIMESTAMP}, #{item.updateDate,jdbcType=TIMESTAMP}) From 126c9c6598303606cccaa64e6d7f1f5ad55da83e Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 7 Apr 2023 18:34:20 +0800 Subject: [PATCH 4/4] //MALL FEE --- .../service/impl/TtMallGoodsCategoryServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java index 4bd76a957..0f9e4f475 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMallGoodsCategoryServiceImpl.java @@ -142,11 +142,11 @@ public class TtMallGoodsCategoryServiceImpl implements TtMallGoodsCategoryServic List childList = new ArrayList<>(); for (Integer childId:childIds) { TtMallGoodsCategory child = new TtMallGoodsCategory(); - old.setGoodsCategoryId(childId); - old.updateTenantInfo(tenantEntity); - old.setSoftwareFee(softwareFee); - old.setCreateDate(now); - old.setUpdateDate(now); + child.setGoodsCategoryId(childId); + child.updateTenantInfo(tenantEntity); + child.setSoftwareFee(softwareFee); + child.setCreateDate(now); + child.setUpdateDate(now); childList.add(child); } ttMallGoodsCategoryMapper.insertList(childList);