| @@ -156,6 +156,8 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| // 6. update order status | // 6. update order status | ||||
| WxOrder orderUpdate = new WxOrder(); | WxOrder orderUpdate = new WxOrder(); | ||||
| orderUpdate.setId(order.getId()); | orderUpdate.setId(order.getId()); | ||||
| orderUpdate.setTenantId(record.getTenantId()); | |||||
| orderUpdate.setCUserId(record.getOwnerId()); | |||||
| orderUpdate.setPaymentTime(curDate); | orderUpdate.setPaymentTime(curDate); | ||||
| orderUpdate.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | orderUpdate.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); | ||||
| orderUpdate.setUpdateDate(curDate); | orderUpdate.setUpdateDate(curDate); | ||||
| @@ -248,6 +250,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| // 成长值 | // 成长值 | ||||
| try { | try { | ||||
| orderUpdate.setPayment(real_payment); | |||||
| wxScoreRulesService.addScore2(EnumScoreType.CONSUMPTION, orderUpdate, coupon.getBusiness()); | wxScoreRulesService.addScore2(EnumScoreType.CONSUMPTION, orderUpdate, coupon.getBusiness()); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| logger.error("成长值:" + e.getMessage()); | logger.error("成长值:" + e.getMessage()); | ||||
| @@ -265,7 +268,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||||
| creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); | creditHistory.setCreditType(EnumScoreType.CONSUMPTION.getCode()); | ||||
| creditHistory.setCouponId(coupon.getId()); | creditHistory.setCouponId(coupon.getId()); | ||||
| creditHistory.setBusinessId(Long.valueOf(coupon.getBusiness())); | creditHistory.setBusinessId(Long.valueOf(coupon.getBusiness())); | ||||
| creditHistory.setSpend(record.getPayment()); | |||||
| creditHistory.setSpend(real_payment); | |||||
| //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | //如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户 | ||||
| creditHistory.setMerchantId(record.getMerchantId()); | creditHistory.setMerchantId(record.getMerchantId()); | ||||
| wxCreditHistoryService.saveOrUpdate(creditHistory); | wxCreditHistoryService.saveOrUpdate(creditHistory); | ||||