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 cf1086978..3fd630fd6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -636,6 +636,7 @@ public class WxCouponController extends BaseController { } } + @TenantIgnore @ApiOperation("商场设置平台券商户") @PostMapping("/setParentCouponMerchants") public ResultData setMallMerchants(@RequestBody WxCoupon wxCoupon) { diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 33ce2f7d2..64d4a47cc 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -125,4 +125,6 @@ public interface WxCouponMapper extends CommonMapper { List ttCouponList(TtCouponVo ttCouponVo); Integer findCategoryIdById(@Param("id")Long id,@Param("tenantId")String tenantId); + + void setMakeMerchantId(WxCoupon couponQ); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 77db55873..e6e7cf2de 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -811,7 +811,7 @@ public class WxCouponServiceImpl implements WxCouponService { WxMerchant makeMerchant = null; //平台券,集团商管商户 if (EnumCouponType.COUPON_DOUYIN_PLAT.getCode() == coupon.getType()) { - //TODO 查询集团商管商户 + //查询集团商管商户 makeMerchant = wxMerchantService.findAdmin(coupon); //品牌券,查询集团品牌商户 }else if (EnumCouponType.COUPON_DOUYIN_BRAND.getCode() == coupon.getType()) { @@ -1530,6 +1530,7 @@ public class WxCouponServiceImpl implements WxCouponService { if (null == wxCoupon.getMerchantIds()) { throw new MallinkException(Result.ERROR,"请选择商户"); } + Long makeMerchantId = coupon.getMakeMerchantId(); // StringBuffer merchantParams = new StringBuffer("{\"tenantId\":").append(mallTenantEntity.getTenantId()).append(",\"mallMerchantParams\":").append("["); Long[] mids = wxCoupon.getMerchantIds(); @@ -1544,6 +1545,10 @@ public class WxCouponServiceImpl implements WxCouponService { checkCouponMerchantReceiver(coupon,true); final IdWorker idWorker = IdWorker.get(); updateCouponMerchants(coupon,idWorker); + //平台券设置商管商户 + if (null == makeMerchantId) { + wxCouponMapper.setMakeMerchantId(coupon); + } }catch(Exception e) { throw e; } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 4ce873f6d..1ab55a626 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -1494,5 +1494,9 @@ where id = #{id} and tenant_id = #{tenantId} + + + update wx_coupon set make_merchant_id = #{makeMerchantId} where id = #{id} and tenant_id = #{tenantId} +