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 b0afc8b98..2f62dadd8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -646,12 +646,28 @@ public class WxCouponController extends BaseController { return new ResultData(); } - @ApiOperation("券商户是否自动分账") + @ApiOperation("自己券商户是否自动分账") @PostMapping("/couponMerchantAutoShare") public ResultData couponMerchantAutoShare(@RequestBody WxCoupon wxCoupon) { wxCoupon.updateTenantInfo(getTenantInfo()); try { - Map map = wxCouponService.couponMerchantAutoShare(wxCoupon); + Map map = wxCouponService.couponMerchantAutoShare(wxCoupon,wxCoupon); + return new ResultData(map); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + + } + + @TenantIgnore + @ApiOperation("父券商户是否自动分账") + @PostMapping("/parentCouponMerchantAutoShare") + public ResultData parentCouponMerchantAutoShare(@RequestBody WxCoupon wxCoupon) { + TenantEntity tenantEntity = getTenantInfo(); + wxCoupon.setTenantId(tenantEntity.getParentTenantId()); + wxCoupon.setParentTenantId(null); + try { + Map map = wxCouponService.couponMerchantAutoShare(tenantEntity,wxCoupon); return new ResultData(map); } catch (Exception e) { return new ResultData(Result.ERROR,e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 21cb817a8..887e77369 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -290,5 +290,5 @@ public interface WxCouponService { void setCouponMerchants(WxCoupon wxCoupon) throws Exception; - Map couponMerchantAutoShare(WxCoupon wxCoupon) throws Exception; + Map couponMerchantAutoShare(TenantEntity tenantEntity,WxCoupon wxCoupon) throws Exception; } 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 05f86e838..2f40ced53 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -1475,7 +1475,7 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public Map couponMerchantAutoShare(WxCoupon wxCoupon) throws Exception { + public Map couponMerchantAutoShare(TenantEntity tenantEntity,WxCoupon wxCoupon) throws Exception { if (null == wxCoupon.getMerchantIds()) { throw new MallinkException(Result.ERROR,"缺少参数"); } @@ -1498,7 +1498,7 @@ public class WxCouponServiceImpl implements WxCouponService { } EnumAppPlat plat = EnumCouponType.getAppPlat(couponType); EnumPayWay payWay = EnumAppPlat.getPayWay(plat); - WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(wxCoupon,plat); + WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(tenantEntity,plat); if (cAppInfo == null) { throw new MallinkException(ErrorCode.APP_ID_NOT_FOUND); }