From 785994b056124cea63120ba6b592a0d277f70075 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 12 Apr 2021 18:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
index 19f6644..8c31f22 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java
@@ -315,6 +315,10 @@
moneyCardUseFlow.setCardName(moneyCardUse.getCardName());
moneyCardUseFlow.setBalance(moneyCardUse.getGiftMoney() + moneyCardUse.getRealMoney());
moneyCardUseFlowDao.update(moneyCardUseFlow);
+
+ moneyCardUse.setRealMoney(moneyCardUse.getRealMoney()+payMoney.doubleValue());
+ moneyCardUseDao.update(moneyCardUse);
+
//充值记录
recordPayLog(Integer.valueOf(moneyCardUseFlowId),2,moneyCardUseFlow.getPayNo(),new BigDecimal(payMoney), payLog, "充值成功", ShopOrder.ORDER_PAY_STATUS_SUCCESS);
}else{
--
Gitblit v1.9.1