From d3b6cdf7ff1ede243be7f1e3274e752b84d09a4e Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 11 Apr 2022 10:47:09 +0800 Subject: [PATCH] //update --- .../java/com/iformall/domain/po/WxProfitSharingReceiver.java | 2 +- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java index d9afd4874..6109218a2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java @@ -46,7 +46,7 @@ public class WxProfitSharingReceiver extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="分账金额(分)",name="sharingAmount") private Integer sharingAmount; - @io.swagger.annotations.ApiModelProperty(value = "是否使用回执 0,不使用 1,使用", name = "isUse") + @io.swagger.annotations.ApiModelProperty(value = "0,不使用 1,使用", name = "isUse") private Integer isUse; @io.swagger.annotations.ApiModelProperty(value = "进件页面", name = "ttImportUrl") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 5ab53cf65..bf10dfd66 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1283,6 +1283,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { psReceiverQ.setMerchantId(merchantId); psReceiverQ.setSharingType(payServiceFactory.getPayShareAdapterService(couponOrder.getPayVendor()).getProfitSharingType()); psReceiverQ.setStatus(EnumProfitSharingReceiverStatus.PROFIT_SHARING_RECEIVER_STATUS_VALID.getCode()); + psReceiverQ.setPlat(appInfo.getPlat()); + if(EnumAppPlat.TOUTIAO.getCode().equals(psReceiverQ.getPlat())){ + psReceiverQ.setIsUse(EnumProfitSharingUse.YES.getCode()); + } List psReceiverList = wxProfitSharingReceiverMapper.findList(psReceiverQ); if (null == payAccount.getShare()) { throw new MallinkException(ErrorCode.PROFIT_SHARING_RECEIVER_INVALID.getCode(),"该租户payAccount未设置分账.");