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/RedEnvelopeController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java
index fabc30c..b3ecfe9 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/RedEnvelopeController.java
@@ -101,16 +101,16 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<TravelRecordWarpper>> queryRedEnvelope(Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<TravelRecordWarpper>> queryRedEnvelope(Integer language, Integer pageNum, Integer size, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
return ResultUtil.tokenErr();
}
pageNum = (pageNum - 1) * size;
- List<Map<String, Object>> list = orderPrivateCarService.queryRedEnvelope(uid);//专车
- List<Map<String, Object>> list1 = orderTaxiService.queryRedEnvelope(uid);//出租车
- List<Map<String, Object>> list2 = orderCrossCityService.queryRedEnvelope(uid);//跨城
+ List<Map<String, Object>> list = orderPrivateCarService.queryRedEnvelope(language, uid);//专车
+ List<Map<String, Object>> list1 = orderTaxiService.queryRedEnvelope(language, uid);//出租车
+ List<Map<String, Object>> list2 = orderCrossCityService.queryRedEnvelope(language, uid);//跨城
list.addAll(list1);
list.addAll(list2);
--
Gitblit v1.7.1