From 1baa21c114f634b8ecc3af64efcfaab6a57a571e Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期六, 11 七月 2026 14:33:25 +0800
Subject: [PATCH] feat: 增加余额变更记录

---
 UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index e11db41..6b38b59 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -5,6 +5,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.common.constant.state.BalanceChangeType;
 import com.stylefeng.guns.core.util.ToolUtil;
 import com.stylefeng.guns.modular.account.controller.AppOrderController;
 import com.stylefeng.guns.modular.crossCity.dao.*;
@@ -839,7 +840,7 @@
 			if (userInfo.getBalance() == null || userInfo.getBalance() < orderMoney) {
 				return ResultUtil.error("余额不足,无法完成支付", "");
 			}
-			
+			userInfo.setBalanceChangeType(BalanceChangeType.CONSUME.getCode());
 			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
 			OpenCity openCity = openCityService.openCity1(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
 			SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
@@ -1091,7 +1092,7 @@
 			if (userInfo.getBalance() == null || userInfo.getBalance() < orderMoney) {
 				return ResultUtil.error("余额不足,无法完成支付");
 			}
-			
+			userInfo.setBalanceChangeType(BalanceChangeType.CONSUME.getCode());
 			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
 			OpenCity openCity = openCityService.openCity1(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
 			SysIntegral query1 = sysIntegralMapper.query(openCity.getId());
@@ -1716,7 +1717,7 @@
 //                if(resultUtil.getCode()==500){
 //                    return ResultUtil.error("电子余额不足,无法完成支付");
 //                }
-				
+				userInfo.setBalanceChangeType(BalanceChangeType.CONSUME.getCode());
 				userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
 				//添加交易明细
 				transactionDetailsService.saveData(uid, "跨城出行取消订单", query.getMoney(), 2, 1, 1, 3, id);
@@ -2108,6 +2109,7 @@
 			}
 			
 			if (orderCrossCity.getPayType() == 3) {//余额支付
+				userInfo.setBalanceChangeType(BalanceChangeType.REFUND.getCode());
 				userInfo.setBalance(userInfo.getBalance() + orderCrossCity.getPayMoney());
 				userInfoService.updateById(userInfo);
 				//添加交易明细
@@ -2143,6 +2145,7 @@
 					transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城出行取消退款", query.getAmount(), 1, 1, 1, 3, id);
 				} else if (query.getPayType() == 4) { // 云闪付
 					// TODO 退款
+					userInfo.setBalanceChangeType(BalanceChangeType.REFUND.getCode());
 					userInfo.setBalance(userInfo.getBalance() + orderCrossCity.getPayMoney());
 					userInfoService.updateById(userInfo);
 					//添加交易明细
@@ -2786,6 +2789,7 @@
 //            if(resultUtil.getCode()==500){
 //                return ResultUtil.error("电子余额不足,无法完成支付");
 //            }
+			userInfo.setBalanceChangeType(BalanceChangeType.CONSUME.getCode());
 			userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(money)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
 			
 			OpenCity openCity = openCityService.openCity1(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());

--
Gitblit v1.7.1