优化订单列表展示

watero-rst-service/src/main/java/com/iamberry/rst/service/order/OrderSyncLogServiceImpl.java

@@ -468,6 +468,9 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
     @Override
     public Integer syncXYTOrderPostNum(Integer salesId){
         SalesOrder salesOrder = salesOrderService.getSalesOrderByIdConcise(salesId);
+        if (salesOrder.getOrderCaseDate() != null) {
+            return 0;
+        }
         OrderSyncPlatform orderSyncPlatform =  getXYTPlatform();
         Map<String,Object> paramsMap = new HashMap<>();
         List<Map<String,Object>> conditionTypeList = new ArrayList<>();
@@ -555,6 +558,7 @@ public class OrderSyncLogServiceImpl implements OrderSyncLogService {
                             so.setSalesDeliver(2);
                             so.setOrderCaseDate(sdf.parse(deliveryTime));
                             so.setSalesDeliverTime(sdf.parse(deliveryTime));
+                            so.setSalesSendTime(sdf.parse(deliveryTime));
                             Integer res = salesOrderMapper.updateSalesOrder(so);
                             if(res > 0){
                                 //添加操作跟踪信息

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

@@ -219,6 +219,15 @@
         <table class="table table-border table-bg table-bordered" style="margin-top: 10px;">
             <thead>
             <tr>
+                <th width="10">发货仓库：</th>
+                <td width="10" colspan="4">
+                    <#if order.salesSendType==3>京东仓库
+                    <#else>爱贝源仓库
+                    </#if>
+                </td>
+            </tr>
+
+            <tr>
                 <th width="10">是否发货：</th>
                 <td width="10" style="font-weight: normal;"><span>
                 <#if order.salesShippingStatus == 0>

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

@@ -177,7 +177,7 @@
                 <th width="30">类型</th>
                 <th width="60">交易号</th>
                 <#--<#if admin.adminDept==1 ||  admin.adminDept==2>-->
-                    <th width="69">商城编号</th>
+                <th width="69">商城编号</th>
                 <#--</#if>-->
                 <th width="68">批次号</th>
                 <th width="40">录入人</th>
@@ -269,10 +269,10 @@
                             <span  title="京东仓自发，无需做任何操作！">京东自发</span>
                         </#if>
                     </td>
-                    <td>
+                    <td <#if order.salesSendType==3>title="京东仓发货" style="color: red"</#if>>
                         ${order.salesPostFirm!''}
-                    <br>
-                    ${order.salesPostNum!''}
+                        <br>
+                        ${order.salesPostNum!''}
                     </td>
                     <td>
                         <#if order.salesUserRemark??>