From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
index 7c3f929..436ecf1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java
@@ -1263,7 +1263,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
-// RechargeRecordWarpper rechargeRecordWarpper = new RechargeRecordWarpper();
+ RechargeRecordWarpper rechargeRecordWarpper = new RechargeRecordWarpper();
List<Map<String,Object>> paymentRecord = paymentRecordService.queryRechargeRecord(uid, pageNum, size);
for (Map<String, Object> map : paymentRecord) {
if(null != map.get("insertTime")){
@@ -1275,10 +1275,10 @@
List<TransactionDetailsWarpper> transactionDetailsWarpper = TransactionDetailsWarpper.getTransactionDetailsWarpper(paymentRecord);
// 查询充值金额总和
-// double sum = paymentRecordService.queryRechargeMoneySum(uid);
-// rechargeRecordWarpper.setSum(sum);
-// rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper);
- return ResultUtil.success(transactionDetailsWarpper);
+ double sum = paymentRecordService.queryRechargeMoneySum(uid);
+ rechargeRecordWarpper.setSum(sum);
+ rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper);
+ return ResultUtil.success(rechargeRecordWarpper);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1