From cf71570fb38ad1983cd40e65fb09e259e509d2a3 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 06 五月 2024 09:36:45 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 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 81224fe..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
@@ -15,6 +15,9 @@
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.warpper.*;
+import com.stylefeng.guns.modular.taxi.model.TransactionDetails;
+import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
+import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -74,6 +77,10 @@
@Autowired
private TEmailService emailService;
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
@@ -1237,6 +1244,48 @@
}
/**
+ * 用户查询充值记录
+ * @param request
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/api/user/queryRechargeRecord")
+ @ApiOperation(value = "用户查询充值记录", tags = {"用户端-个人中心"}, notes = "")
+ @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,Integer language,HttpServletRequest request){
+ try {
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ 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);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+ /**
* 下载pdf
* @param orderId
* @param orderType
--
Gitblit v1.7.1