【深爱-物流价格查询】

src/main/java/com/uas/eis/controller/ERPController.java

@@ -40,7 +40,7 @@ public class ERPController {
 
     @RequestMapping(value="/erp/getLogisticsPrice")
     @ResponseBody
-    public Map<String, Object> getLogisticsPrice(Integer id){
-        return erpService.getLogisticsPrice(id);
+    public Map<String, Object> getLogisticsPrice(String master,Integer id){
+        return erpService.getLogisticsPrice(master,id);
     }
 }

src/main/java/com/uas/eis/service/ERPService.java

@@ -15,5 +15,5 @@ public interface ERPService {
 
     Map<String, Object> cancelSFOrder(String master, Integer id, String emCode);
 
-    Map<String, Object> getLogisticsPrice(Integer id);
+    Map<String, Object> getLogisticsPrice(String master, Integer id);
 }

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

@@ -386,14 +386,15 @@ public class ERPServiceImpl implements ERPService {
     }
 
     @Override
-    public Map<String, Object> getLogisticsPrice(Integer id) {
+    public Map<String, Object> getLogisticsPrice(String master, Integer id) {
+        SpObserver.putSp(master);
         Map<String, Object> modelMap = new HashMap<String, Object>();
         SqlRowList rs = baseDao.queryForRowSet("select * from LogisticsPrice where lp_id="+id);
         if(rs.next()){
             Map<String, Object> data = new HashMap<String, Object>();
             //顺丰
             getPrice_SF(id,rs.getGeneralString("LP_TYPE"),rs.getGeneralDouble("LP_WEIGHT"),rs.getGeneralDouble("LP_VOLUME"),
-                    "上海市",//rs.getGeneralString("上海市"),
+                    rs.getGeneralString("lp_province"),
                     rs.getGeneralString("lp_route"),
                     "广东省","深圳市");
             data.put("SF", id);

src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -315,7 +315,7 @@ public class UasEisApplicationTests {
 
  	@Test
 	public void TestSF_getprice(){
-		Map<String, Object> res = erpService.getLogisticsPrice(3020);
+		Map<String, Object> res = erpService.getLogisticsPrice("SZSI_P",3040);
 		System.out.println("res==="+res.get("success")+":"+res.get("message"));
 	}
 }