From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 945781e..0e782eb 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -233,7 +233,7 @@
             @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<TravelRecordWarpper> queryMyTravelRecord(Integer pageNum, Integer size, Integer language, HttpServletRequest request){
+    public ResultUtil<List<TravelRecordListWarpper>> queryMyTravelRecord(Integer pageNum, Integer size, Integer language, HttpServletRequest request){
         try {
             Integer uid = userInfoService.getUserIdFormRedis(request);
             if(null == uid){
@@ -288,10 +288,10 @@
             }else{
                 orderWarpper = new ArrayList<>();
             }
-            TravelRecordWarpper travelRecordWarpper = new TravelRecordWarpper();
-            travelRecordWarpper.setList(orderWarpper);
-            travelRecordWarpper.setTotal(sum);
-            return ResultUtil.success(travelRecordWarpper);
+            orderWarpper.forEach(s->{
+                s.setTotal(sum);
+            });
+            return ResultUtil.success(orderWarpper);
         }catch (Exception e){
             e.printStackTrace();
             return ResultUtil.runErr();
@@ -1045,9 +1045,12 @@
                 return ResultUtil.tokenErr();
             }
             Map<String, Object> map = new HashMap<>();
+            Double payMoney = 0D;
             switch (orderType){
                 case 1:
                     map = orderPrivateCarService.queryBalance(orderId, uid);
+                    OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
+                    payMoney = orderPrivateCar.getPayMoney();
                     break;
 //                case 2:
 //                    map = orderTaxiService.queryBalance(orderId, uid);
@@ -1057,11 +1060,22 @@
 //                    break;
                 case 4:
                     map = orderLogisticsService.queryBalance(orderId, uid);
+                    OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
+                    payMoney = orderLogistics.getPayMoney();
                     break;
 //                case 5:
 //                    map = orderLogisticsService.queryBalance(orderId, uid);
 //                    break;
             }
+            Double aDouble = userRedPacketRecordService.queryRemainingAmount(uid);
+            map.put("redTotal", aDouble);
+            RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings();
+            if(null == redEnvelopePaymentSettings){
+                map.put("deductionAmount", 0D);
+            }else{
+                Double deductionAmount = new BigDecimal(payMoney).multiply(redEnvelopePaymentSettings.getDeductionRatio().divide(new BigDecimal(100))).doubleValue();
+                map.put("deductionAmount", deductionAmount);
+            }
             return ResultUtil.success(map);
         }catch (Exception e){
             e.printStackTrace();

--
Gitblit v1.7.1