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 |    3 ++-
 1 files changed, 2 insertions(+), 1 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 8c31f22..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
@@ -313,7 +313,8 @@
                                 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());

--
Gitblit v1.9.1