获取对账单所有万里牛单号

sd-business/src/main/java/com/sd/business/controller/order/OrderSkuController.java

@@ -34,4 +34,13 @@ public class OrderSkuController {
         return orderSkuService.getPage(dto);
     }
 
+    /**
+     * 获取万里牛单号
+     */
+    @PostMapping("/getOrderWlnCodeStr")
+    public String getOrderWlnCodeStr(@RequestBody OrderSkuSelectDto dto) {
+        return orderSkuService.getOrderWlnCodeStr(dto);
+    }
+
+
 }

sd-business/src/main/java/com/sd/business/controller/statement/StatementOfAccountController.java

@@ -142,8 +142,8 @@ public class StatementOfAccountController {
      * 获取万里牛单号
      */
     @PostMapping("/getOrderWlnCodeStr")
-    public String getOrderWlnCodeStr(@RequestBody BaseSelectDto dto) {
-        return statementOfAccountService.getOrderWlnCodeStr(dto.getId());
+    public String getOrderWlnCodeStr(@RequestBody List<Long> idList) {
+        return statementOfAccountService.getOrderWlnCodeStr(idList);
     }
 
 }

sd-business/src/main/java/com/sd/business/service/order/OrderSkuService.java

@@ -22,4 +22,9 @@ public interface OrderSkuService extends BaseService<OrderSku> {
      */
     Page<OrderSkuVo> getPage(OrderSkuSelectDto dto);
 
+    /**
+     * 获取万里牛单号
+     */
+    String getOrderWlnCodeStr(OrderSkuSelectDto dto);
+
 }

sd-business/src/main/java/com/sd/business/service/order/impl/OrderSkuServiceImpl.java

@@ -1,5 +1,7 @@
 package com.sd.business.service.order.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.wrapper.IWrapper;
@@ -15,6 +17,9 @@ import com.sd.business.mapper.order.OrderSkuMapper;
 import com.sd.business.service.order.OrderSkuService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 
 /**
  * <p>
@@ -52,4 +57,15 @@ public class OrderSkuServiceImpl extends ServiceImpl<OrderSkuMapper, OrderSku> i
         return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 
+    @Override
+    public String getOrderWlnCodeStr(OrderSkuSelectDto dto) {
+        dto.setPageNum(1);
+        dto.setPageSize(9999999);
+        Page<OrderSkuVo> page = getPage(dto);
+        List<OrderSkuVo> records = page.getRecords();
+
+        List<String> wlnCodeList = records.stream().map(OrderSkuVo::getOrderCode).filter(ObjectUtil::isNotNull).collect(Collectors.toList());
+        return JSON.toJSONString(wlnCodeList);
+    }
+
 }

sd-business/src/main/java/com/sd/business/service/statement/StatementOfAccountService.java

@@ -77,6 +77,6 @@ public interface StatementOfAccountService extends BaseService<StatementOfAccoun
     /**
      * 获取万里牛单号
      */
-    String getOrderWlnCodeStr(Long id);
+    String getOrderWlnCodeStr(List<Long> idList);
 
 }

sd-business/src/main/java/com/sd/business/service/statement/impl/StatementOfAccountServiceImpl.java

@@ -493,8 +493,8 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
     }
 
     @Override
-    public String getOrderWlnCodeStr(Long id) {
-        List<OrderInfo> list = orderService.list(q -> q.eq(OrderInfo::getStatementOfAccountId, id));
+    public String getOrderWlnCodeStr(List<Long> idList) {
+        List<OrderInfo> list = orderService.list(q -> q.in(OrderInfo::getStatementOfAccountId, idList));
         List<String> wlnCodeList = list.stream().map(OrderInfo::getWlnCode).filter(ObjectUtil::isNotNull).collect(Collectors.toList());
         return JSON.toJSONString(wlnCodeList);
     }

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -104,7 +104,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
                     // 审核通过之前的订单不同步
                     Integer processStatus = wlnOrder.getInteger("process_status");
-                    if (processStatus < 1) {
+                    if (processStatus < 1 || processStatus == 14) {
                         continue;
                     }