Explorar o código

修改bug:
1、上传邮费信息时,优化线程池大小;
2、打印电子面单时,如果是德邦的快递,增加备注;
3、下载订单信息时,增加邮费成本和发货仓库。

xian %!s(int64=4) %!d(string=hai) anos
pai
achega
345827d2e4

+ 7 - 3
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -855,10 +855,14 @@ public class AdminOrderController {
                 row.add(salesOrder.getSalesPostageCost() == null ? 0 : salesOrder.getSalesPostageCost()/100);
                 String temp = "京东仓";
                 if (salesOrder.getSalesSendType() != 3) {
-                    if (salesOrder.getSalesWarehouseId() == 1) {
-                        temp = "正常仓库";
+                    if (salesOrder.getSalesWarehouseId() == null) {
+                        temp = null;
                     } else {
-                        temp = "维修仓库";
+                        if (salesOrder.getSalesWarehouseId() == 1) {
+                            temp = "正常仓库";
+                        } else {
+                            temp = "维修仓库";
+                        }
                     }
                 }
                 row.add(temp);