From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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 2ade56d..a9dff81 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
@@ -1262,16 +1262,16 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- RechargeRecordWarpper rechargeRecordWarpper = new RechargeRecordWarpper();
+// RechargeRecordWarpper rechargeRecordWarpper = new RechargeRecordWarpper();
List<Map<String,Object>> paymentRecord = paymentRecordService.queryRechargeRecord(uid, pageNum, size);
// 分装返回充值记录实体
List<TransactionDetailsWarpper> transactionDetailsWarpper = TransactionDetailsWarpper.getTransactionDetailsWarpper(paymentRecord);
// 查询充值金额总和
- double sum = paymentRecordService.queryRechargeMoneySum(uid);
- rechargeRecordWarpper.setSum(sum);
- rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper);
- return ResultUtil.success(rechargeRecordWarpper);
+// double sum = paymentRecordService.queryRechargeMoneySum(uid);
+// rechargeRecordWarpper.setSum(sum);
+// rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper);
+ return ResultUtil.success(transactionDetailsWarpper);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1