From 7709381d0e96ca89b1b4a9030c7a9c081b2c0a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 29 Aug 2024 16:31:13 +0800
Subject: [PATCH] =?UTF-8?q?release:=E7=94=A8=E5=8F=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=8C=E5=95=86=E5=93=81=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E6=8F=90=E7=A4=BA=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bespoke/model/req/ReqParam.java     |  3 +++
 .../impl/CommonInterfaceServiceImpl.java        |  6 +++++-
 .../mybatis/mapper/YyOrderInfoMapper.xml        | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java
index 967b3dc..b2aa387 100644
--- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java
+++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/req/ReqParam.java
@@ -70,4 +70,7 @@ public class ReqParam {
 
     //订单号集合
     public List<String> fpqqlshList;
+
+    //排序字段
+    private String orderBy;
 }
diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
index 032b468..2ecfd0f 100644
--- a/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
+++ b/order-management-order/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
@@ -11,6 +11,7 @@ import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.asymmetric.SM2;
 import cn.hutool.crypto.symmetric.SM4;
 import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson2.JSON;
 import com.dxhy.base.common.constant.ConfigureConstant;
 import com.dxhy.base.common.constant.OrderInfoEnum;
 import com.dxhy.base.common.constant.OrderManagementConstant;
@@ -672,11 +673,14 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
 //                        }
                         CommodityCodeEntity commodityCodeEntity = commodityCodeEntityList.get(0);
                         completeCommodityMessageBySpid(item, commodityCodeEntity, fpzlDm, taxEquipmentInfo);
+                        log.info("{}订单明细信息补全完成:{}", LOGGER_MSG, JSON.toJSONString(item));
                     } else {
                         log.error("{}根据商品id查询商品信息异常：{}", LOGGER_MSG, "商品ID未维护商品信息");
                         errorStr.append(errorMsg)
                                 .append(ConfigureConstant.STRING_UNDERLINE)
-                                .append("商品ID未维护商品信息")
+                                .append(item.getXmmc())
+                                .append(ConfigureConstant.STRING_LINE)
+                                .append("未维护商品信息")
                                 .append("\r\n");
                     }
 
diff --git a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml
index 2f170c5..16e172b 100644
--- a/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml
+++ b/order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml
@@ -188,6 +188,23 @@
             </foreach>
         </if>
         and status = '0'
+        <choose>
+            <when test="orderBy != null and orderBy != '' and orderBy == 'ddhAsc'">
+                order by cdlcode
+            </when>
+            <when test="orderBy != null and orderBy != '' and orderBy == 'ddhDesc'">
+                order by cdlcode desc
+            </when>
+            <when test="orderBy != null and orderBy != '' and orderBy == 'pzhAsc'">
+                order by cpznum
+            </when>
+            <when test="orderBy != null and orderBy != '' and orderBy == 'pzhDesc'">
+                order by cpznum desc
+            </when>
+            <otherwise>
+                order by cpznum, cdldate
+            </otherwise>
+        </choose>
     </select>
 
     <delete id="delOrder">