From fc02394c0f2021dd4d7d71e0e0881d76fafd3aca Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 14 八月 2025 20:06:10 +0800
Subject: [PATCH] update

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java |   37 +++++++++++++++++++++++++++++++------
 1 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
index d126c3b..636739c 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TAbnormalOrderCarController.java
@@ -80,6 +80,10 @@
 
     @Autowired
     private TAbnormalPayOrderService tAbnormalPayOrderService;
+
+
+    @Autowired
+    private ITSystemNoticeService systemNoticeService;
     
     
     /**
@@ -291,6 +295,9 @@
         }
         abnormal = 2;
         Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+        if(type==null){
+            type=1;
+        }
         // 快车
         if(type==1){
             page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
@@ -670,18 +677,21 @@
     @RequestMapping(value = "/save")
     @ResponseBody
     public Object save(Integer responsibilityTypeVal,String remark,String money,Integer type,String orderNum) {
+        Integer userId =null;
         if(type==1){
-            TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("orderNum",orderNum));
+            TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>().eq("id",orderNum));
+            userId = tOrderPrivateCar.getUserId();
             tOrderPrivateCar.setResponsibilityType(responsibilityTypeVal);
             tOrderPrivateCar.setAbnormalStatus(2);
             if(responsibilityTypeVal>3){
                 tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getPayMoney());
-                tOrderPrivateCar.setPayMoney(new BigDecimal(money));
+                tOrderPrivateCar.setOrderMoney(new BigDecimal(money));
             }
             if(responsibilityTypeVal>2){
                 // 追偿订单记录表
                 TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
                 tAbnormalPayOrder.setOrderNum(orderNum);
+                tAbnormalPayOrder.setOrderNo(tOrderPrivateCar.getOrderNum());
                 tAbnormalPayOrder.setType(1);
                 tAbnormalPayOrder.setUserId(tOrderPrivateCar.getUserId());
                 tAbnormalPayOrder.setPayStatus(1);
@@ -703,17 +713,20 @@
         }
 
         if(type==2){
-            TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("orderNum", orderNum));
+            TOrderCrossCity tOrderCrossCity = tOrderCrossCityService.selectOne(new EntityWrapper<TOrderCrossCity>().eq("id", orderNum));
+            userId = tOrderCrossCity.getUserId();
             tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
             tOrderCrossCity.setAbnormalStatus(2);
             if(responsibilityTypeVal>3) {
                 tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getPayMoney());
-                tOrderCrossCity.setPayMoney(new BigDecimal(money));
+                tOrderCrossCity.setOrderMoney(new BigDecimal(money));
             }
             if(responsibilityTypeVal>2){
                 // 追偿订单记录表
                 TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
                 tAbnormalPayOrder.setOrderNum(orderNum);
+
+                tAbnormalPayOrder.setOrderNo(tOrderCrossCity.getOrderNum());
                 tAbnormalPayOrder.setType(2);
                 tAbnormalPayOrder.setUserId(tOrderCrossCity.getUserId());
                 tAbnormalPayOrder.setPayStatus(1);
@@ -734,17 +747,19 @@
 
         }
         if(type==3){
-            TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("orderNum", orderNum));
+            TOrderTaxi tOrderTaxi = tOrderTaxiService.selectOne(new EntityWrapper<TOrderTaxi>().eq("id", orderNum));
+            userId = tOrderTaxi.getUserId();
             tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
             tOrderTaxi.setAbnormalStatus(2);
             if(responsibilityTypeVal>3) {
                 tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getPayMoney());
-                tOrderTaxi.setPayMoney(new BigDecimal(money));
+                tOrderTaxi.setOrderMoney(new BigDecimal(money));
             }
             if(responsibilityTypeVal>2){
                 // 追偿订单记录表
                 TAbnormalPayOrder tAbnormalPayOrder = new TAbnormalPayOrder();
                 tAbnormalPayOrder.setOrderNum(orderNum);
+                tAbnormalPayOrder.setOrderNo(tOrderTaxi.getOrderNum());
                 tAbnormalPayOrder.setType(3);
                 tAbnormalPayOrder.setUserId(tOrderTaxi.getUserId());
                 tAbnormalPayOrder.setPayStatus(1);
@@ -764,6 +779,16 @@
             tOrderTaxi.setAbnormalRemark(remark);
             tOrderTaxiService.updateById(tOrderTaxi);
         }
+
+
+        TSystemNotice tSystemNotice = new TSystemNotice();
+        tSystemNotice.setType(2);
+        tSystemNotice.setNoticeType(1);
+        tSystemNotice.setUserType(1);
+        tSystemNotice.setContent("您提交的申诉平台已处理");
+        tSystemNotice.setRead(1);
+        tSystemNotice.setInsertTime(new Date());
+        systemNoticeService.insert(tSystemNotice);
         return SUCCESS_TIP;
     }
 

--
Gitblit v1.7.1