【深爱-物流价格查询-跨越 同城及省内物流类型修改】

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -404,7 +404,9 @@ public class ERPServiceImpl implements ERPService {
                     "广东省","深圳市",
                     rs.getDate("LP_SENDDATETIME"));
             //跨越
-           getPrice_KY(id,rs.getGeneralString("LP_TYPE"),rs.getGeneralDouble("LP_WEIGHT"),  rs.getGeneralString("lp_route"),
+           getPrice_KY(id,rs.getGeneralString("LP_TYPE"),rs.getGeneralDouble("LP_WEIGHT"),
+                   rs.getGeneralString("lp_province"),
+                   rs.getGeneralString("lp_route"),
                     rs.getDate("LP_SENDDATETIME"));
            //德邦
            getPrice_DoP(id,rs.getGeneralString("LP_TYPE"),rs.getGeneralDouble("LP_WEIGHT"),rs.getGeneralDouble("LP_VOLUME"),
@@ -472,7 +474,7 @@ public class ERPServiceImpl implements ERPService {
         SqlRowList rs = baseDao.queryForRowSet("select LP_ID, LP_CODE, LP_INDATE, LP_CALDATE, LP_TYPE, LP_ROUTE, LP_WEIGHT, LP_VOLUME, LP_RECIPIENT, LP_TEL, LP_ADD,  LP_RECORDER, LP_COMPANY1,    LP_PROVINCE, LP_DISTRICT, LP_SENDDATETIME,to_char(LP_SENDDATETIME,'yyyy-mm-dd hh24:mi:ss') SENDDATETIME" +
                 " from LogisticsPrice where lp_id="+id);
         if(rs.next()){
-            getPrice_KY(id,rs.getGeneralString("LP_TYPE"),rs.getGeneralDouble("LP_WEIGHT"),  rs.getGeneralString("lp_route"),
+            getPrice_KY(id,rs.getGeneralString("LP_TYPE"),rs.getGeneralDouble("LP_WEIGHT"),rs.getGeneralString("lp_province"),rs.getGeneralString("lp_route"),
                     rs.getDate("LP_SENDDATETIME"));
         }
     }
@@ -571,7 +573,7 @@ public class ERPServiceImpl implements ERPService {
         }
     }
     //跨越
-    private Map<String, Object> getPrice_KY(Integer id,String type,double weight,String city_d,Date sendDateTime){
+    private Map<String, Object> getPrice_KY(Integer id,String type,double weight,String province_d,String city_d,Date sendDateTime){
         /*
         正式环境:https://open.ky-express.com/router/rest
         沙箱环境:https://open.ky-express.com/sandbox/router/rest
@@ -604,8 +606,12 @@ public class ERPServiceImpl implements ERPService {
                 businessType="30";
             }else if("物流".equals(type)){
                 businessType="40";
+                if("深圳市".equals(city_d)){
+                    businessType="50";
+                }else if("广东省".equals(province_d)){
+                    businessType="160";
+                }
             }
-            //businessType="50";
             params.put("format","json");
             params.put("timestamp",timeStamp);
             String method="open.api.openCommon.queryFreightCharge";