新增上朵德邦的快递打印功能(电商尊享)

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

@@ -93,37 +93,37 @@ public class AwaitSendController {
         if(orderWarehouse == null){
             return mv;
         }
-            salesOrder.setSalesWarehouseId(orderWarehouse.getWarehouseId());
-            salesOrder.setSalesStatus(1);
-            PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
-            if (totalNum != 0) {
-                pagedResult.setTotal(totalNum);
-            }
-            // 查询订单项
-            if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {
-                for (SalesOrder temp : pagedResult.getDataList()) {
-                    SalesOrderItem item = new SalesOrderItem();
-                    item.setItemOrderId(temp.getSalesId());
-                    temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
-                }
+        salesOrder.setSalesWarehouseId(orderWarehouse.getWarehouseId());
+        salesOrder.setSalesStatus(1);
+        PagedResult<SalesOrder> pagedResult = salesOrderService.listAwaitSendSalesOrderPage(pageNO, pageSize, salesOrder,totalNum == 0);
+        if (totalNum != 0) {
+            pagedResult.setTotal(totalNum);
+        }
+        // 查询订单项
+        if (pagedResult != null && pagedResult.getDataList() != null && !pagedResult.getDataList().isEmpty()) {
+            for (SalesOrder temp : pagedResult.getDataList()) {
+                SalesOrderItem item = new SalesOrderItem();
+                item.setItemOrderId(temp.getSalesId());
+                temp.setSalesOrderItemList(salesOrderService.listSalesOrderItem(item));
             }
-            int errorOrderNum = 0;
-            // 聚合打单方式
-            Map<String, Integer> postMap = new HashMap<>();
-            List<PostInfo> postInfos = salesOrderService.listWaitPrintOrderNum(orderWarehouse.getWarehouseId());
-            if (postInfos != null && !postInfos.isEmpty()) {
-                for (PostInfo temp : postInfos) {
-                    LogisticsInfo info = new LogisticsInfo();
-                    info.setLogisticsRstCode(temp.getPostFirm());
-                    List<LogisticsInfo> logisticsInfos = salesOrderService.getLogisticsInfo(info);
-                    if (logisticsInfos == null || logisticsInfos.size() <= 0) {
-                        errorOrderNum ++;
-                        continue;
-                    }
-                    String key = logisticsInfos.get(0).getLogisticsName();
-                    postMap.put(key, temp.getNumber());
+        }
+        int errorOrderNum = 0;
+        // 聚合打单方式
+        Map<String, Integer> postMap = new HashMap<>();
+        List<PostInfo> postInfos = salesOrderService.listWaitPrintOrderNum(orderWarehouse.getWarehouseId());
+        if (postInfos != null && !postInfos.isEmpty()) {
+            for (PostInfo temp : postInfos) {
+                LogisticsInfo info = new LogisticsInfo();
+                info.setLogisticsRstCode(temp.getPostFirm());
+                List<LogisticsInfo> logisticsInfos = salesOrderService.getLogisticsInfo(info);
+                if (logisticsInfos == null || logisticsInfos.size() <= 0) {
+                    errorOrderNum ++;
+                    continue;
                 }
+                String key = logisticsInfos.get(0).getLogisticsName();
+                postMap.put(key, temp.getNumber());
             }
+        }
         List<ProductColor> productColorList = productService.listproductAndColor(new ProductColor());
 
         salesOrder.setSalesOrderItemList(null);
@@ -270,7 +270,7 @@ public class AwaitSendController {
         } else if (post.equalsIgnoreCase("SDDB")) {
             // 上朵德邦（标准快递）
             eOrderRequestData.CustomerName = ("S20140809-60390596");
-            eOrderRequestData.ExpType = ("1");
+            eOrderRequestData.ExpType = ("3");
             eOrderRequestData.ShipperCode = "DBL";
         }
         LOGGER.info( "===salesId:" + salesId + "快递方式：" + post+ "订单编号:"+ orderId);
@@ -1030,7 +1030,7 @@ public class AwaitSendController {
                 if(salesOrder.getSalesDeliver() == null){
                     salesDeliver = "未出库";
                 }else{
-                   ///出库状态  1：未出库   2：已出库
+                    ///出库状态  1：未出库   2：已出库
                     switch (salesOrder.getSalesDeliver()){
                         case 1:
                             salesDeliver = "未出库";