release:用友添加排序，商品不存在提示商品信息

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;
 }

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java

@@ -49,6 +49,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service("skOrderServiceImpl")
@@ -348,6 +349,7 @@ public class SkOrderServiceImpl implements OrderService {
         //发票明细信息
         List<DdmxxxBO> ddmxxxBOList = new ArrayList<>();
         int index = ConfigureConstant.INT_0;
+        boolean isZk = !skOrderItemInfoList.stream().filter(item->item.getXgdjbh().startsWith("XSB")).collect(Collectors.toList()).isEmpty();
         for (SkOrderItemInfo orderItemInfo : skOrderItemInfoList) {
             DdmxxxBO ddmxxxBO = new DdmxxxBO();
             ddmxxxBO.setXH(String.valueOf(++index));
@@ -369,6 +371,15 @@ public class SkOrderServiceImpl implements OrderService {
             taxAmount = DecimalCalculateUtil.bigDecimalAdd(taxAmount, orderItemInfo.getSe(), ConfigureConstant.INT_2);
             //设置红字回写订单号
             ddmxxxBO.setBYZD2(orderItemInfo.getXgdjbh());
+            //添加则扣行判断
+            if (isZk){
+                ddmxxxBO.setXH(ConfigureConstant.STRING_1);
+                ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_2);
+                if (orderItemInfo.getXgdjbh().startsWith("XSB")){
+                    ddmxxxBO.setXH(ConfigureConstant.STRING_2);
+                    ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_1);
+                }
+            }
             ddmxxxBOList.add(ddmxxxBO);
         }
         //金额、税额、价税合计

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");
                     }
 

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">