From 8f18c2543d51e521f256fc197aff0f0cbcba155e Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 31 Jul 2022 18:06:46 +0800 Subject: [PATCH] // mianfeijuan --- .../src/main/java/com/iformall/domain/po/WxCoupon.java | 3 ++- .../service/pay/service/share/douyin/TtPayShareService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 00200106f..e88fa754d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -444,9 +444,10 @@ public class WxCoupon extends TenantEntity { if(this.getType().equals(EnumCouponType.COUPON_DOUYIN.getCode())){ return true; } - if(isShare){ + if(isShare && this.getSalePrice() > 0 && !this.checkIsCard()){ Date valid_date = getOuterRealValidDate(curr); Date limit_date = DateUtils.getTimeAfterDays(Constant.WX_LIMIT_DAYS, curr); + if (valid_date.after(limit_date)) { return false; } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java index fe664f0e2..00862506f 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/share/douyin/TtPayShareService.java @@ -338,7 +338,7 @@ public class TtPayShareService extends PayShareBaseAdapterService{ jo.put("amount", childOrderShare.getShareAmount() - darenTakeAmount); jo.put("rateAmount", childOrderShare.getRateAmount()); - jo.put("realRateAmount", childOrderShare.getRateAmount()); + jo.put("realRateAmount", childOrderShare.getRealRateAmount()); jo.put("commissionAmount", childOrderShare.getCommissionAmount()); jo.put("darenTakeAmount", darenTakeAmount); //jo.put("description",receiver.getReceiverComments()); //改为存ID,