打单配置

sd-cainiao/src/main/java/com/sd/cainiao/service/impl/IsticeServiceImpl.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -131,6 +132,7 @@ public class IsticeServiceImpl implements IsticeService {
         request.setTradeOrderInfoDtos(getTradeOrderInfoDtoList(dto));
 
         TmsWaybillGetResponse response = client.send(request, params);
+
         if (response.isSuccess()) {
             return response.getWaybillCloudPrintResponseList();
         }
@@ -156,34 +158,33 @@ public class IsticeServiceImpl implements IsticeService {
         return tradeOrderInfoDtoList;
     }
 
+    /**
+     * 订单信息
+     */
     private OrderInfoDto getOrderInfoDto(TakeNumParamDto dto) {
-
-        List<String> orderList = new ArrayList<>();
-        // 订单列表，这里的场景是一个订单获取一个面单号
-        orderList.add(dto.getOrderNum());
-
         OrderInfoDto orderInfoDto = new OrderInfoDto();
         orderInfoDto.setOrderChannelsType("OTHERS");
-        orderInfoDto.setTradeOrderList(orderList);
-
+        orderInfoDto.setTradeOrderList(Collections.singletonList(dto.getOrderNum()));
         return orderInfoDto;
     }
 
+    /**
+     * 包装信息
+     */
     private PackageInfoDto getPackageInfo(TakeNumParamDto dto) {
-        PackageInfoDto packageInfoDto = new PackageInfoDto();
-        packageInfoDto.setWeight(dto.getWeight());
-        packageInfoDto.setVolume(dto.getVolume());
-        packageInfoDto.setItems(getItems(dto));
-        return packageInfoDto;
-    }
-
-    private List<Item> getItems(TakeNumParamDto dto) {
-        return dto.getItems().stream().map(itemParamDto -> {
+        // 商品信息
+        List<Item> itemList = dto.getItems().stream().map(itemParamDto -> {
             Item item = new Item();
             item.setName(itemParamDto.getItemName());
             item.setCount(itemParamDto.getItemCount());
             return item;
         }).collect(Collectors.toList());
+
+        PackageInfoDto packageInfoDto = new PackageInfoDto();
+        packageInfoDto.setWeight(dto.getWeight());
+        packageInfoDto.setVolume(dto.getVolume());
+        packageInfoDto.setItems(itemList);
+        return packageInfoDto;
     }
 
     /**

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

@@ -90,7 +90,7 @@ public class WlnOutboundOrderServiceImpl implements WlnOutboundOrderService {
         long startTime;
         long endTime = System.currentTimeMillis();
         if (outboundOrder != null) {
-            startTime = outboundOrder.getOutboundTimestamp();
+            startTime = outboundOrder.getOutboundTimestamp() + 1;
         } else {
             startTime = endTime - 1000 * 60 * 60 * 24 * 7;
         }