From 14e9a48a5b73385fef63fa226fe8c447d3f2af91 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 24 Nov 2022 20:58:18 +0800 Subject: [PATCH] fix bug --- .../basic/WxProjectConfigController.java | 18 ++++++++++++++++++ .../controller/market/WxCouponController.java | 16 +++++++++++++++- .../iformall/mapper/WxCouponMallMapper.java | 1 + .../iformall/service/WxCouponMallService.java | 1 + .../service/impl/WxCouponMallServiceImpl.java | 5 +++++ .../resources/mapper/WxCouponMallMapper.xml | 5 +++++ 6 files changed, 45 insertions(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 4ac381cb1..de62541d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -118,6 +118,24 @@ public class WxProjectConfigController extends BaseController { // // } + @ApiOperation("查询商场集团列表") + @GetMapping(value = "/childMallList") + @SystemControllerLog(description = "商场基础数据") + @TenantIgnore + public ResultData childMallList(@ModelAttribute WxMall wxMall, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getMallList"); + try { + if(wxMall == null){ + wxMall = new WxMall(); + } + wxMall.setParentTenantId(this.getTenantInfo().getTenantId()); + PageInfo page = wxMallService.listAsPage(wxMall, pageNum, pageSize); + return new ResultData(page); + }catch (Exception e){ + logger.error(e.getMessage(),e); + return new ResultData(ErrorCode.SYS_SERVER_ERROR); + } + } @ApiOperation("查询商场集团列表") @GetMapping(value = "/mallList") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 95bd0ee6e..473ee58eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -84,8 +84,22 @@ public class WxCouponController extends BaseController { public ResultData parentCouponList(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); - wxCoupon.setTenantId(getTenantInfo().getParentTenantId()); + TenantEntity mallTenantEntity = getTenantInfo(); + wxCoupon.setTenantId(mallTenantEntity.getParentTenantId()); wxCoupon.setParentTenantId(null); + //平台券 + if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == wxCoupon.getType()) { + //查询已经分配了的parentCouponList + WxCouponMall couponMall = new WxCouponMall(); + couponMall.updateTenantInfo(wxCoupon); + couponMall.setMallTenantId(mallTenantEntity.getTenantId()); + List couponIds = wxCouponMallService.listCouponIds(couponMall); + if (null != couponIds && couponIds.size() > 0 ) { + wxCoupon.setIds(couponIds); + }else { + wxCoupon.setId(-1L); + } + } return couponList(wxCoupon, pageNum, pageSize, isList); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java index 64057ed30..a71c617c8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMallMapper.java @@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Param; public interface WxCouponMallMapper extends CommonMapper { List findList(WxCouponMall wxCouponMall); + List findCouponIdList(WxCouponMall wxCouponMall); void updateStatus(WxCouponMall wxCouponMall); void delteAllByProductId(WxCouponMall wxCouponMall); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java index 29eeda8af..560398a41 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java @@ -23,6 +23,7 @@ public interface WxCouponMallService { PageInfo listAsPage(WxCouponMall record, Integer pageIndex, Integer pageSize); List list(WxCouponMall wxCouponMall,boolean queryMall); + List listCouponIds(WxCouponMall wxCouponMall); void finised(String tenantId,Long couponId,String mallTenantId); void unfinised(String tenantId, Long couponId,Integer couponType, String mallTenantId) throws Exception; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java index c7ecfc6ed..74cbcf681 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java @@ -61,6 +61,11 @@ public class WxCouponMallServiceImpl implements WxCouponMallService { return list; } + @Override + public List listCouponIds(WxCouponMall wxCouponMall){ + return wxCouponMallMapper.findCouponIdList(wxCouponMall); + } + @Override public PageInfo listAsPage(WxCouponMall record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMallMapper.findList(record)); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMallMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMallMapper.xml index 7ca9d1158..7b7e5e3f4 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMallMapper.xml @@ -77,6 +77,11 @@ + + update wx_coupon_mall set status = #{status} where `product_id` = #{productId} and `tenant_id` = #{tenantId} and `mall_tenant_id` = #{mallTenantId}