From 543dfc25f8ccaf48e5e5f98334a46cc91f46b1fa Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Mon, 9 Jun 2025 14:07:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sip):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改服务等级设置错误：将产品值改为产品代码
- 调整订单列表排序方式：按项目编号是否为空及项目编号排序
- 修正折扣计算：保留三位小数- 添加订单处理方式字段
---
 .../src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java  | 4 ++++
 .../com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java   | 2 +-
 .../java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java | 1 +
 .../src/main/resources/mapper/manage/OrderInfoMapper.xml      | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
index 4c5f92d7..b62a777d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProjectOrderInfo.java
@@ -162,6 +162,10 @@ public class ProjectOrderInfo extends BaseEntity {
     private String partnerUserName;
     private String partnerPhone;
     private String level;
+    /**
+     * 订单处理方式
+     */
+    private String processType;
 
 
     /**
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
index 32919771..f3711c40 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/DeliveryListServiceImpl.java
@@ -244,7 +244,7 @@ public class DeliveryListServiceImpl implements IDeliveryListService {
     private static Date updateStartTimeAndAddList(DeliveryInfoVo deliveryInfoVo, ProductInfo productInfo, Date startTime, List<DeliveryInfoVo.ServiceInfo> serviceInfoList) {
         int year = productInfo.getValue() == null ? 0 : Integer.parseInt(productInfo.getValue());
         DeliveryInfoVo.ServiceInfo serviceInfo = deliveryInfoVo.new ServiceInfo();
-        serviceInfo.setServiceLevel(productInfo.getValue());
+        serviceInfo.setServiceLevel(productInfo.getProductCode());
         serviceInfo.setServiceDescribe(productInfo.getDescription());
         serviceInfo.setServiceStartTime(startTime);
         serviceInfo.setServiceEndTime(DateUtils.addYears(startTime, year));
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
index 1258e597..37abd601 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderInfoServiceImpl.java
@@ -363,6 +363,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService
             if (orderList.getDiscount()!=null){
                 amount = amount.multiply(orderList.getDiscount()).setScale(2, RoundingMode.HALF_UP);
             }
+            orderList.setDiscount(orderList.getDiscount().setScale(3, RoundingMode.HALF_UP));
             orderList.setAmount(amount);
         }
         return orderListList;
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index c1a61260..91edbe90 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -151,7 +151,7 @@
                 select delivery_id from delivery_list where serial_number=#{serialNumber}))
             </if>
         </where>
-        order by t1.created_at desc
+        order by ISNULL(t1.project_code)||t1.project_code='' ,t1.project_code
     </select>
 
     <select id="selectOrderInfoById" parameterType="Long" resultMap="OrderInfoOrderListResult">