From 4976039719f9e171c13dd2f34d3d7fe17eba9a79 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 30 一月 2024 14:49:41 +0800
Subject: [PATCH] 用户端充值记录修改
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 10 +++++-----
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java | 11 +++++++++++
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 2 ++
3 files changed, 18 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();
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 00db4fa..6f6176a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -1717,6 +1717,8 @@
String birthday = map.get("birthday").toString();
map.put("birthday", DateUtil.conversionFormat(language, birthday));
}
+ double sum = paymentRecordService.queryRechargeMoneySum(uid);
+ map.put("rechargeAmountSum",sum);
return map;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
index b8c361b..cd591cf 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/UserInfoWarpper.java
@@ -46,6 +46,16 @@
private String emergencyContact;
@ApiModelProperty("紧急联系人电话")
private String emergencyContactNumber;
+ @ApiModelProperty("充值记录总和")
+ private Double rechargeAmountSum;
+
+ public Double getRechargeAmountSum() {
+ return rechargeAmountSum;
+ }
+
+ public void setRechargeAmountSum(Double rechargeAmountSum) {
+ this.rechargeAmountSum = rechargeAmountSum;
+ }
public Integer getId() {
return id;
@@ -231,6 +241,7 @@
userInfoWarpper.setLastName(null != map.get("lastName") ? String.valueOf(map.get("lastName")) : "");
userInfoWarpper.setFirstName(null != map.get("firstName") ? String.valueOf(map.get("firstName")) : "");
userInfoWarpper.setLanguage(null != map.get("language") ? Integer.valueOf(String.valueOf(map.get("language"))) : 1);
+ userInfoWarpper.setRechargeAmountSum(null != map.get("rechargeAmountSum") ? Double.valueOf(String.valueOf(map.get("rechargeAmountSum"))) : 0.00);
}
return userInfoWarpper;
}
--
Gitblit v1.7.1