拉取淘宝订单完成。

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.getSalesDealCode());
+                req.setTid(salesOrder.getSalesExOrderId());
                 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,12 +237,7 @@ public class AwaitSendController {
                 // 校验淘宝订单
                 if (temp.getSalesBatchId().startsWith("ST")) {
                     LOGGER.info("淘宝订单需要校验订单状态{}", temp.getSalesOrderId());
-                    String id = null;
-                    if (temp.getSalesOrderId().contains("-")) {
-                        id = temp.getSalesDealCode();
-                    } else {
-                        id = temp.getSalesOrderId();
-                    }
+                    String id = temp.getSalesExOrderId();
                     Trade details = taobaoTask.getOrderDetails(Long.parseLong(id));
                     LOGGER.info("获取到的淘宝订单数据:{}", JSONObject.toJSONString(details));
                     int stats = 0;

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -212,7 +212,7 @@
             <#if page.dataList?? &&  (page.dataList?size > 0) >
                 <#list page.dataList as order>
 
-                <tr class="text-c order_tr" status="${(order.salesShippingStatus)!"0"},${(order.salesDeliver)!"1"},${(order.salesStatus)!"0"}" sendType="${(order.salesSendType)!}">
+                <tr class="text-c order_tr" ordertel="${(order.salesAddressTel)!}" isjd="${(order.storeName)!}" status="${(order.salesShippingStatus)!"0"},${(order.salesDeliver)!"1"},${(order.salesStatus)!"0"}" sendType="${(order.salesSendType)!}">
                     <td width="16"><input type="checkbox" class="sales_id" value="${order.salesId!''}" ></td>
                     <td width="16">
                         <#if (order.salesCustomerId)??>
@@ -515,6 +515,12 @@
                    tr.find(".del_order_target").hide();
 
                }
+               // 新增需求：京东订单运行修改数据
+               let jd = tr.attr("isjd");
+               let ordertel = tr.attr("ordertel");
+               if (jd.indexOf("京东") !== -1 && ordertel.length >= 20) {
+                   tr.find(".edit_order_target").show();
+               }
            }
        }
     });