From 912d447c47613b37bfd14b9c7362134fce992b89 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Wed, 23 Nov 2022 11:12:17 +0800 Subject: [PATCH] fix bug --- .../com/iformall/controller/market/WxCouponController.java | 4 ++-- .../src/main/java/com/iformall/enums/EnumCouponType.java | 6 ++++++ .../com/iformall/service/impl/WxCouponServiceImpl.java | 7 ++++++- 3 files changed, 14 insertions(+), 3 deletions(-) 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 2f62dadd8..763b390ef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -651,7 +651,7 @@ public class WxCouponController extends BaseController { public ResultData couponMerchantAutoShare(@RequestBody WxCoupon wxCoupon) { wxCoupon.updateTenantInfo(getTenantInfo()); try { - Map map = wxCouponService.couponMerchantAutoShare(wxCoupon,wxCoupon); + Map map = wxCouponService.couponMerchantAutoShare(wxCoupon); return new ResultData(map); } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); @@ -667,7 +667,7 @@ public class WxCouponController extends BaseController { wxCoupon.setTenantId(tenantEntity.getParentTenantId()); wxCoupon.setParentTenantId(null); try { - Map map = wxCouponService.couponMerchantAutoShare(tenantEntity,wxCoupon); + Map map = wxCouponService.couponMerchantAutoShare(wxCoupon); return new ResultData(map); } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java index a714ff03c..df91d2d30 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -141,4 +141,10 @@ public enum EnumCouponType { throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "券平台错误,未找到对应类型"); } + public static boolean isParentCoupon(Integer couponType) { + if (couponType == COUPON_DOUYIN_PLAT.getCode() || couponType == COUPON_DOUYIN_BRAND.getCode()) { + return true; + } + return false; + } } 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 2f40ced53..7aaff3b97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1498,7 +1498,12 @@ public class WxCouponServiceImpl implements WxCouponService { } EnumAppPlat plat = EnumCouponType.getAppPlat(couponType); EnumPayWay payWay = EnumAppPlat.getPayWay(plat); - WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(tenantEntity,plat); + WxAppinfo cAppInfo = null; + if (EnumCouponType.isParentCoupon(couponType)) { + cAppInfo = wxAppinfoService.getCAppInfo(wxCoupon,plat); + }else { + cAppInfo = wxAppinfoService.getCAppInfo(tenantEntity,plat); + } if (cAppInfo == null) { throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); }