出库

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

@@ -13,9 +13,11 @@ import com.iamberry.rst.core.sms.OrderMessage;
 import com.iamberry.rst.core.sys.Admin;
 import com.iamberry.rst.core.sys.OrderCheckStatus;
 import com.iamberry.rst.core.sys.Relu;
+import com.iamberry.rst.core.tools.LogisticsInfo;
 import com.iamberry.rst.faces.cm.SalesOrderService;
 import com.iamberry.rst.faces.cm.StoreInfoService;
 import com.iamberry.rst.faces.order.EfastOrderService;
+import com.iamberry.rst.faces.order.LogisticsInfoService;
 import com.iamberry.rst.faces.order.OrderBatchService;
 import com.iamberry.rst.faces.order.OrderService;
 import com.iamberry.rst.faces.product.ProductService;
@@ -27,7 +29,6 @@ import com.iamberry.rst.utils.ExcelUtil;
 import com.iamberry.rst.utils.GenerateKeyUtil;
 import com.iamberry.rst.utils.OrderNoUtil;
 import com.iamberry.wechat.tools.DateTimeUtil;
-import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ObjectExcelView;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.payUtil.DatetimeUtil;
@@ -88,6 +89,8 @@ public class AdminOrderController {
     private StoreInfoService storeInfoService;
     @Autowired
     private OrderBatchService orderBatchService;
+    @Autowired
+    private LogisticsInfoService logisticsInfoService;
 
     @Autowired
     private ExcelUtil excelUtil;
@@ -896,73 +899,18 @@ public class AdminOrderController {
     }
 
     /**物流名称替换**/
-    public static String replace(String code) {
+    public String replace(String code) {
         String name = "";
         if(code == null || "".equals(code)){
             return "";
         }
-        switch (code){
-            case "sto":
-                name= "申通快递";
-                break;
-            case "yto":
-                name= "圆通快递";
-                break;
-            case "zto":
-                name= "中通速递";
-                break;
-            case "sf":
-                name= "顺丰快递";
-                break;
-            case "ems":
-                name= "邮政EMS";
-                break;
-            case "eyb":
-                name= "省外EMS";
-                break;
-            case "zjs":
-                name= "宅急送";
-                break;
-            case "yunda":
-                name= "韵达快递";
-                break;
-            case "cces":
-                name= "cces快递";
-                break;
-            case "pick":
-                name= "上门提货";
-                break;
-            case "htky":
-                name= "汇通快递";
-                break;
-            case "ttkdex":
-                name= "天天快递";
-                break;
-            case "stars":
-                name= "星晨急便";
-                break;
-            case "jd":
-                name= "京东快递";
-                break;
-            case "01":
-                name= "其他";
-                break;
-            case "02":
-                name= "上门送货";
-                break;
-            case "longbanwuliu":
-                name= "龙邦快递";
-                break;
-            case "YZPY":
-                name= "省外EMS";
-                break;
-            case "EYB":
-                name= "省外EMS";
-                break;
-            default:
-                break;
+        List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
+        for (LogisticsInfo logistics:logisticsInfoList) {
+            if(code .equalsIgnoreCase(logistics.getLogisticsRstCode())){
+                return logistics.getLogisticsName();
+            }
         }
-        return name;
+        return "";
     }
 
     @ResponseBody

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

@@ -218,10 +218,10 @@ public class AwaitSendController {
 
         // 获取收件人邮编
         String PostCode = AddrUtil.getPostCode(addrs[2]);
-        if (PostCode == null) {
+        if (PostCode == null || "".equals(PostCode)) {
             PostCode = AddrUtil.getPostCode(addrs[1]);
         }
-        if (PostCode == null) {
+        if (PostCode == null || "".equals(PostCode)) {
             PostCode = AddrUtil.getPostCode(addrs[0]);
         }