对接万中物流逻辑变更

src/custom/utility/WzwlDocking.java

@@ -40,48 +40,48 @@ public class WzwlDocking extends BaseClass {
         JSONObject consigner = new JSONObject();
         JSONObject consignee = new JSONObject();
         JSONArray cargo = new JSONArray();
-        int settleType=1;
-        int deliverType=2;
-        switch (logisticRow.getString("paytype")){
-            case "发货人付款（现付）":{
-                settleType=1;
-                break;
-            }
-            case "按月支付（月结）":{
-                settleType=2;
-                break;
-            }
-            case "收货人付款（到付）":{
-                settleType=3;
-                break;
-            }
-            case "回付":{
-                settleType=4;
-                break;
-            }
-            case "混合支付":{
-                settleType=5;
-                break;
-            }
-            default:
-                break;
-        }
-        switch (logisticRow.getString("delivertype")){
-            case "送货上门":{
-                deliverType=1;
-                break;
-            }
-            case "自提":{
-                deliverType=2;
-                break;
-            }
-            case "送货安装":{
-                deliverType=4;
-                break;
-            }
-            default:
-                break;
-        }
+        String settleType=logisticRow.getString("paytype");
+        String deliverType=logisticRow.getString("delivertype");
+//        switch (logisticRow.getString("paytype")){
+//            case "发货人付款（现付）":{
+//                settleType=1;
+//                break;
+//            }
+//            case "按月支付（月结）":{
+//                settleType=2;
+//                break;
+//            }
+//            case "收货人付款（到付）":{
+//                settleType=3;
+//                break;
+//            }
+//            case "回付":{
+//                settleType=4;
+//                break;
+//            }
+//            case "混合支付":{
+//                settleType=5;
+//                break;
+//            }
+//            default:
+//                break;
+//        }
+//        switch (logisticRow.getString("delivertype")){
+//            case "送货上门":{
+//                deliverType=1;
+//                break;
+//            }
+//            case "自提":{
+//                deliverType=2;
+//                break;
+//            }
+//            case "送货安装":{
+//                deliverType=4;
+//                break;
+//            }
+//            default:
+//                break;
+//        }
         data.put("companyCode", companyCode);
         data.put("logisticCompanyID", "WZ");
         data.put("custOrderNo", logisticRow.getString("billno"));
@@ -90,9 +90,9 @@ public class WzwlDocking extends BaseClass {
         data.put("totalNum", StringUtils.isBlank(logisticRow.getString("packageqty"))?0:logisticRow.getInteger("packageqty")); //待定
         data.put("totalWeight", StringUtils.isBlank(logisticRow.getString("weight"))?0:logisticRow.getBigDecimal("weight"));//待定
         data.put("totalVolume", StringUtils.isBlank(logisticRow.getString("volume"))?0:logisticRow.getBigDecimal("volume"));//待定
-        data.put("settleType", settleType);
+        data.put("settleType", StringUtils.isBlank(logisticRow.getString("paytype"))?3:logisticRow.getInteger("paytype"));
         data.put("isPickup", "false");
-        data.put("deliverType", deliverType);
+        data.put("deliverType", StringUtils.isBlank(logisticRow.getString("delivertype"))?2:logisticRow.getInteger("delivertype"));
         data.put("remark", logisticRow.getString("remarks"));
         //发货人
         consigner.put("company", sender.getString("company"));