From a2a1f3b4c7cf5d9da58554c8b91dca44d2e8c02b Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 22 Dec 2018 20:56:30 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A1=A5=E8=B4=B4][=E6=96=B0=E5=A2=9E]:?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E8=A1=A5=E8=B4=B4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCardSpendServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 6995a3c90..3a045d99c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -170,7 +170,16 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { merchantSubsidy.setRealPayment(real_payment); merchantSubsidy.setSubsidy(subsidyFee); merchantSubsidy.setRealSubsidy(realSubsidyFee); - merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); + if (coupon.getSubsidyType().equals(EnumCouponSubsidyType.WECHAT_COUPON.getCode())) { + // 立减领券 + merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.SUBSIDIED.getCode()); + } else if (coupon.getSubsidyType().equals(EnumCouponSubsidyType.WECHAT_MCHPAY.getCode())) { + // 转账倒现金 + } else { + // 未补贴 + merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); + } + merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); try {