拉取淘宝订单完成。

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -2232,7 +2232,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                 }
                 TaobaoClient client = new DefaultTaobaoClient(TaobaoConfig.TAOBAO_URL, TaobaoConfig.appkey, TaobaoConfig.secret);
                 AlibabaAscpLogisticsOfflineSendRequest req = new AlibabaAscpLogisticsOfflineSendRequest();
-                req.setTid(salesOrder.getSalesOrderId());
+                req.setTid(salesOrder.getSalesDealCode());
                 req.setSubTid(oid);
                 List<AlibabaAscpLogisticsOfflineSendRequest.TopConsignPkgRequest> list2 = new ArrayList<AlibabaAscpLogisticsOfflineSendRequest.TopConsignPkgRequest>();
                 AlibabaAscpLogisticsOfflineSendRequest.TopConsignPkgRequest obj3 = new AlibabaAscpLogisticsOfflineSendRequest.TopConsignPkgRequest();

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -237,7 +237,13 @@ public class AwaitSendController {
                 // 校验淘宝订单
                 if (temp.getSalesBatchId().startsWith("ST")) {
                     LOGGER.info("淘宝订单需要校验订单状态{}", temp.getSalesOrderId());
-                    Trade details = taobaoTask.getOrderDetails(Long.parseLong(temp.getSalesOrderId()));
+                    String id = null;
+                    if (temp.getSalesOrderId().contains("-")) {
+                        id = temp.getSalesDealCode();
+                    } else {
+                        id = temp.getSalesOrderId();
+                    }
+                    Trade details = taobaoTask.getOrderDetails(Long.parseLong(id));
                     LOGGER.info("获取到的淘宝订单数据:{}", JSONObject.toJSONString(details));
                     int stats = 0;
                     for (Order order : details.getOrders()) {