判断京津冀无特快

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/KylinFreightChargeServiceImpl.java

@@ -67,12 +67,11 @@ public class KylinFreightChargeServiceImpl {
                             String productCode = kylinExpressModuleVo.getProductCode().toString(); //快件类型码
                             String adcode = (String) adMap.get("adcode");
                             String dAddress = (String) adMap.get("name");
-//                            if (dProvince.equals("北京市") || dProvince.equals("天津市") || dProvince.equals("河北省")){
-//                                hBody.put("expressType", "2");//快递类型
-//                            }else {
-//                                hBody.put("expressType", productCode);//快递类型
-//                            }
-                            hBody.put("expressType", productCode);//快递类型
+                            if (dProvince.equals("北京市") || dProvince.equals("天津市") || dProvince.equals("河北省")){
+                                hBody.put("expressType", "2");//快递类型
+                            }else {
+                                hBody.put("expressType", productCode);//快递类型
+                            }
                             hBody.put("dProvince", dProvince); //省
                             hBody.put("dCity", dCity);
                             hBody.put("dAddress", dAddress);
@@ -91,14 +90,14 @@ public class KylinFreightChargeServiceImpl {
                                 kylinFreightCharge.setAdcode(adcode);
                                 String price = map.get("price");
 
-                                if (price.equals("0元")){
+                               /* if (price.equals("0元")){
                                     hBody.put("expressType", "2");//快递类型
                                     // 生成签名并请求
                                     String SFresult = shunfengSignUtils.generateSignatureAndRequestNew(hBody, "/public/order/v1/getFreight");
                                     hashMap = JsonUtils.fromJson(SFresult, HashMap.class);
                                     HashMap<String, String> SFmap = (HashMap<String, String>) hashMap.get("result");
                                     price=SFmap.get("price");
-                                }
+                                }*/
                                 String p = price.replace("元",".00");
                                 kylinFreightCharge.setPrice(p);
                                 kylinFreightCharge.setBusinessType(map.get("businessType"));