From a075cdd2f76fae321ecf95dce363141ade30f0f1 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 12 四月 2024 22:37:58 +0800
Subject: [PATCH] 新增加功能
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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..7c3f929 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
@@ -1254,24 +1254,31 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "语言", name = "language", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil queryRechargeRecord(Integer pageNum, Integer size,HttpServletRequest request){
+ public ResultUtil queryRechargeRecord(Integer pageNum, Integer size,Integer language,HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
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")){
+ String time = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, time));
+ }
+ }
// 分装返回充值记录实体
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