判断京津冀无特快

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinGetShunFengPriceController.java

@@ -29,13 +29,20 @@ public class KylinGetShunFengPriceController {
     @GetMapping("getPrice")
     @ApiOperation("运费查询")
     public ResponseDto<String> getFreightCharge(String adcode, String expressType){
+        String substring = adcode.substring(0, 3);
+        if(substring.equals("110") || substring.equals("120") || substring.equals("130")){
+            if (expressType.equals("1")){
+                expressType="2";
+            }
+
+        }
+        Object  obj = redisUtil.get(KylinRedisConst.RETURN_ADDRESS_CODE + adcode + KylinRedisConst.EXPRESS_TYPE + expressType);
 
-        Object obj =redisUtil.get(KylinRedisConst.RETURN_ADDRESS_CODE+adcode+KylinRedisConst.EXPRESS_TYPE+expressType);
         if (obj != null){
             KylinFreightChargeDao k= (KylinFreightChargeDao)obj;
             return ResponseDto.success(k.getPrice());
         }else {
-            return null;
+            return ResponseDto.failure("查询失败");
         }
     }
 

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

@@ -67,14 +67,16 @@ 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("河北省")){
+                          /*  if (dProvince.equals("北京市") || dProvince.equals("天津市") || dProvince.equals("河北省")){
                                 if (productCode.equals("1")){
                                     hBody.put("expressType", "2");//快递类型
                                 }else {
                                     hBody.put("expressType", productCode);//快递类型
                                 }
-                            }
+                            }else {
+                                hBody.put("expressType", productCode);//快递类型
+                            }*/
+                            hBody.put("expressType", productCode);
                             hBody.put("dProvince", dProvince); //省
                             hBody.put("dCity", dCity);
                             hBody.put("dAddress", dAddress);