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);