From 6b8bba1d072a5612aaa1f7b77d5483a6d51fb2ca Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 29 Jul 2019 17:11:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E5=82=A8=E5=80=BC=E5=8D=A1=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E6=88=90=E9=95=BF=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCardSpendServiceImpl.java | 5 ++++- 1 file changed, 4 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 45dc1c9a4..e7f1584cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -156,6 +156,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 6. update order status WxOrder orderUpdate = new WxOrder(); orderUpdate.setId(order.getId()); + orderUpdate.setTenantId(record.getTenantId()); + orderUpdate.setCUserId(record.getOwnerId()); orderUpdate.setPaymentTime(curDate); orderUpdate.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); orderUpdate.setUpdateDate(curDate); @@ -248,6 +250,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 成长值 try { + orderUpdate.setPayment(real_payment); wxScoreRulesService.addScore2(EnumScoreType.CONSUMPTION, orderUpdate, coupon.getBusiness()); } catch (Exception e) { logger.error("成长值:" + e.getMessage()); @@ -265,7 +268,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); creditHistory.setCouponId(coupon.getId()); creditHistory.setBusinessId(Long.valueOf(coupon.getBusiness())); - creditHistory.setSpend(record.getPayment()); + creditHistory.setSpend(real_payment); //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 creditHistory.setMerchantId(record.getMerchantId()); wxCreditHistoryService.saveOrUpdate(creditHistory);