From 9e10e7d221c8a7f5ca20ce11d0d721eff5370720 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 13 Apr 2021 15:06:22 +0800
Subject: [PATCH] 20210413 后台订单管理修改
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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 5246abe..d36a21e 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
@@ -307,14 +307,19 @@
if (moneyCardUseFlow.getCarUseId()==null) {
ShopPayLog payLog = new ShopPayLog();
- if(payMoney==moneyCardUseFlow.getTotal()){
+ if(payMoney.equals(moneyCardUseFlow.getTotal())){
threadResult.putInMap("status", "success");
resXml = AppConstance.RESULT_XML_SUCCESS;
MoneyCardUse moneyCardUse = moneyCardUseDao.selectVipCard(user.getId());
moneyCardUseFlow.setCarUseId(moneyCardUse.getId());
moneyCardUseFlow.setCardName(moneyCardUse.getCardName());
- moneyCardUseFlow.setBalance(moneyCardUse.getGiftMoney() + moneyCardUse.getRealMoney());
+ Double balance=moneyCardUse.getGiftMoney() + moneyCardUse.getRealMoney();
+ moneyCardUseFlow.setBalance(balance==null?0:balance);
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