From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/UserInfoController.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 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 a9dff81..ee0750b 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
@@ -13,6 +13,7 @@
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
+import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil;
import com.stylefeng.guns.modular.system.util.itextpdf.HtmlToPdfUtils;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.TransactionDetails;
@@ -81,6 +82,9 @@
private ITransactionDetailsService transactionDetailsService;
@Autowired
private IPaymentRecordService paymentRecordService;
+
+ @Autowired
+ private FleetEngineUtil fleetEngineUtil;
@@ -1254,24 +1258,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(transactionDetailsWarpper);
+ double sum = paymentRecordService.queryRechargeMoneySum(uid);
+ rechargeRecordWarpper.setSum(sum);
+ rechargeRecordWarpper.setTransactionDetailsWarpper(transactionDetailsWarpper);
+ return ResultUtil.success(rechargeRecordWarpper);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -1323,4 +1334,27 @@
}
}
}
+
+
+
+ @ResponseBody
+ @PostMapping("/api/user/getFleetEngineAuth")
+ @ApiOperation(value = "获取google地图授权token", tags = {"用户端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<Map<String, Object>> getFleetEngineAuth(HttpServletRequest request){
+ try {
+ Integer uid = userInfoService.getUserIdFormRedis(request);
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ Map<String, Object> s = fleetEngineUtil.fleetEngineAuth(1, uid);
+ return ResultUtil.success(s);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
}
--
Gitblit v1.7.1