1.贸易订单列表接口优化

2.订单受理接口优化

sckw-modules/sckw-order/src/main/java/com/sckw/order/serivce/KwoTradeOrderService.java

@@ -1130,9 +1130,11 @@ public class KwoTradeOrderService {
             kwoTradeOrderAddressService.delByIds(oldLoadAddressIds);
             tradeOrderAmountService.delByOrderIdAndAddressIds(param.getId(), oldLoadAddressIds);
         }
+        AtomicInteger loadSort = new AtomicInteger(0);
         loadAddressInfo.forEach(e -> {
             KwoTradeOrderAddress address = BeanUtil.copyProperties(e, KwoTradeOrderAddress.class);
-            address.setTOrderId(param.getId()).setTOrderNo(order.getTOrderNo());
+            address.setTOrderId(param.getId()).setTOrderNo(order.getTOrderNo())
+                    .setSort(loadSort.getAndIncrement());
             //地址信息
             Long addressId = kwoTradeOrderAddressService.add(address);
             //分配量信息
@@ -1737,10 +1739,10 @@ public class KwoTradeOrderService {
         if (StringUtils.isNotBlank(unloadCode) && Objects.nonNull(params.getUnloadingAddressLevel())) {
             switch (params.getUnloadingAddressLevel()) {
                 case 1 -> dto.setUnloadAddressCode(
-                        loadCode.substring(0, 2).trim());
+                        unloadCode.substring(0, 2).trim());
                 case 2 -> dto.setUnloadAddressCode(
-                        loadCode.substring(0, 4).trim());
-                case 3 -> dto.setUnloadAddressCode(loadCode);
+                        unloadCode.substring(0, 4).trim());
+                case 3 -> dto.setUnloadAddressCode(unloadCode);
             }
         }
         String keywords = params.getKeywords();

sckw-modules/sckw-order/src/main/resources/mapper/KwoTradeOrderMapper.xml

@@ -57,13 +57,7 @@
         a.source                                            AS source,
         f.contract_id                                       AS contractId,
         f.contract_no                                       AS contractNo,
---         f.contract_name                                     as contractName,
---         f.signing_way                                       AS contractSigningWay,
         g.goods_id                                          AS goodsId,
---         g.goods_name                                        AS goodsName,
---         g.goods_spec                                        AS goodsSpec,
---         g.goods_tax_rate                                    AS goodsTaxRate,
---         g.goods_thumb                                       AS goodsThumb,
         g.unit_price                                        AS unitPrice,
         a.price                                             AS price,
         a.amount                                            AS amount,
@@ -177,7 +171,6 @@
             <if test="query.keywords != null and query.keywords != ''">
                 and (
                 a.t_order_no like concat('%', #{query.keywords}, '%')
-                or a.l_order_no like concat('%', #{query.keywords}, '%')
                 or d.firm_name like concat('%', #{query.keywords}, '%')
                 or e.firm_name like concat('%', #{query.keywords}, '%')
                 <if test="goodIds != null and goodIds.size() > 0">
@@ -309,7 +302,6 @@
             <if test="query.keywords != null and query.keywords != ''">
                 and (
                 a.t_order_no like concat('%', #{query.keywords}, '%')
-                or a.l_order_no like concat('%', #{query.keywords}, '%')
                 or d.firm_name like concat('%', #{query.keywords}, '%')
                 or e.firm_name like concat('%', #{query.keywords}, '%')
                 <if test="goodIds != null and goodIds.size() > 0">