From e9b547fbcfdebea5d9a0ca046c48cc9609abca54 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Tue, 24 Sep 2024 15:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/RepairOrderInfoController.java         | 16 ++++++++++++++++
 .../order/service/RepairOrderInfoService.java    |  8 +-------
 .../service/impl/RepairOrderInfoServiceImpl.java |  5 +----
 .../mapper/order/RepairOrderInfoMapper.xml       |  6 +++++-
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
index 286ed727..3a84dad1 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.order.entity.RepairOrderInfo;
 import cn.iocoder.yudao.module.order.service.RepairOrderInfoService;
 import cn.iocoder.yudao.module.order.vo.RepairOrderInfoPageReqVO;
 import cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO;
+import cn.iocoder.yudao.module.order.vo.RepairOrderInfoSaveReqVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
@@ -48,6 +49,21 @@ public class RepairOrderInfoController {
         return success(BeanUtils.toBean(orderInfo, RepairOrderInfoRespVO.class));
     }
 
+
+
+    /**
+     * 更新订单信息
+     *
+     * @param saveReqVO 订单信息
+     */
+    @PutMapping("/update")
+    @Operation(summary = "更新车辆信息")
+    @PreAuthorize("@ss.hasPermission('base:car-main:update')")
+    public CommonResult<Boolean> updateCarMain(@RequestBody RepairOrderInfoSaveReqVO saveReqVO) {
+        repairOrderInfoService.rechargeCallback(saveReqVO.getOrderNo());
+        return success(true);
+    }
+
     /**
      * 分页查询订单内容
      *
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
index 2c895981..2a2e0649 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/RepairOrderInfoService.java
@@ -61,13 +61,7 @@ public interface RepairOrderInfoService extends IService<RepairOrderInfo> {
     **/
     RepairOrderInfo getOrderByOrderNo(String orderNo);
 
-    /**
-     * 获得维修模块 订单分页
-     *
-     * @param pageReqVO 分页查询
-     * @return 维修模块 订单分页
-     */
-    PageResult<RepairOrderInfo> getOrderInfoPage(RepairOrderInfoPageReqVO pageReqVO);
+
 
     /**
      * 分页查询订单信息
diff --git a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
index 42562e9c..96a27e59 100644
--- a/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
+++ b/dl-module-base/src/main/java/cn/iocoder/yudao/module/order/service/impl/RepairOrderInfoServiceImpl.java
@@ -113,10 +113,6 @@ public class RepairOrderInfoServiceImpl extends ServiceImpl<RepairOrderInfoMappe
         return getOne(lambdaQueryWrapper);
     }
 
-    @Override
-    public PageResult<RepairOrderInfo> getOrderInfoPage(RepairOrderInfoPageReqVO pageReqVO) {
-        return null;
-    }
 
     /**
      * 分页查询订单信息
@@ -144,6 +140,7 @@ public class RepairOrderInfoServiceImpl extends ServiceImpl<RepairOrderInfoMappe
         return baseMapper.getOrderPageByStatus(respVO, page);
     }
 
+
     /**
      * 查询订单详情(包括工单)
      *
diff --git a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
index eceefe24..22a1d4ce 100644
--- a/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
+++ b/dl-module-base/src/main/resources/mapper/order/RepairOrderInfoMapper.xml
@@ -20,7 +20,7 @@
                 and roi.order_no like concat('%', #{entity.orderNo}, '%')
             </if>
             <if test="entity.goodsTitle != null  and entity.goodsTitle != ''">
-                and roi.goods_totle like concat('%', #{entity.goodsTitle}, '%')
+                and roi.goods_title like concat('%', #{entity.goodsTitle}, '%')
             </if>
             <if test="entity.goodsType != null  and entity.goodsType != ''">
                 and roi.goods_type = #{entity.goodsType}
@@ -31,7 +31,11 @@
             <if test="entity.orderStatus != null  and entity.orderStatus != ''">
                 and roi.order_status = #{entity.orderStatus}
             </if>
+            <if test="entity.payType != null  and entity.payType != ''">
+                and roi.pay_type = #{entity.payType}
+            </if>
         </where>
+        order by roi.create_time desc
     </select>
 
     <select id="getOrderPageByStatus" resultType="cn.iocoder.yudao.module.order.vo.RepairOrderInfoRespVO">