Ver código fonte

【深爱-物流价格查询】

DINGYL 10 meses atrás
pai
commit
7d17f89085

BIN
lib/SF-CSIM-EXPRESS-SDK-V2.1.7.jar


BIN
lib/dop-sdk-1.0-SNAPSHOT.jar


BIN
lib/fastjson-1.2.15.jar


BIN
lib/openapi-java-sdk-2.3.0.jar


+ 6 - 0
src/main/java/com/uas/eis/controller/ERPController.java

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

+ 38 - 0
src/main/java/com/uas/eis/entity/dop/DoPPriceQueryReq.java

@@ -0,0 +1,38 @@
+package com.uas.eis.entity.dop;
+
+import com.uas.eis.entity.sf.SFDestAddress;
+import com.uas.eis.entity.sf.SFSrcAddress;
+import lombok.Data;
+
+@Data
+public class DoPPriceQueryReq {
+    String ceiveMethod ;//提货方式 N
+      /*  DELIVER_NOUP汽运送货(不含上楼);
+        DELIVER_UP汽运送货(上楼);
+        SELF_PICKUP汽运自提;
+        DELIVER_INGA汽运送货进仓;
+        LARGE_DELIVER_UP大件上楼费;
+        DELIVER_NOUP_AIR送货不上楼(备注:官网时效查询默认:DELIVER_NOUP_AIR,接口默认:DELIVER_NOUP_AIR)
+     */
+    String logisticCompanyID="DEPPON";//物流公司ID
+    String originalsStreet;// 目标城市 Y 需要符合 “省-市-区,详细地址”,注意中间的“,”为英文格式,如上海-上海市-青浦区,徐泾镇明珠路
+    String originalsaddress;// 出发城市 Y 需要符合 “省-市-区,详细地址”,注意中间的“,”为英文格式,如上海-上海市-青浦区,徐泾镇明珠路
+    String sendDateTime;// 发出时间  Y yyyy-MM-dd HH:mm:ss
+    String totalVolume;//体积 Y 无体积则填写0.001 单位:立方米
+    String totalWeight;//重量 Y 公斤
+    //String type;//新零担标识 N 获取新零担价格时效时必填:DPLD
+    //String insuredAmount;//保价 N 无值时默认0
+    //String productCode;// 运输方式/产品类型 N
+    /*快递运输方式: ①RCP:大件快递360
+                  ②NZBRH:重包入户
+                  ③ZBTH:重包特惠
+                  ④WXJTH:微小件特惠
+                  ⑤PACKAGE:标准快递
+                  ⑥HKDJC:航空大件次日达
+                  ⑦HKDJG:航空大件隔日达
+                  ⑧TZKJC:特快专递;
+     */
+    //String customerCode;//客户编码/月结账号 N  生产环境是德邦网点或者销售提供的月结客户编码(该字段传值时根据客户编码返货合同折扣价),沙箱环境不支持此字段传值
+    //String isOffSiteTransfer;// 是否异地调货 N  当customerCode传值时,异地调货合同必传值
+    //String leaveDepartmentCode;//合同归属部门编码 N 当customerCode传值时,非异地调货合同客户此字段必传值(具体传值可咨询营业部或者德邦销售)
+}

+ 21 - 0
src/main/java/com/uas/eis/entity/ky/KYPriceQueryReq.java

@@ -0,0 +1,21 @@
+package com.uas.eis.entity.ky;
+
+import lombok.Data;
+
+@Data
+public class KYPriceQueryReq {
+    String platformFlag="6820933B508C2977269F78B2DCD329CB";//平台标识  是 6820933B508C2977269F78B2DCD329CB
+    String customerCode="075525131031";//寄件客户编码 是 075525131031
+    String beginAreaCode;//始发区号 是 0755
+    String endAreaCode;//目的区号 否 0711
+    String billingTime;//货好时间 是 2019-04-25 14:25 时间格为: yyyy-MM-dd HH:mm
+    String pickupCustomerCode;//付款公司编码 是 075525131031
+    Double weight;//计费重量 否 60 默认单位KG,传值不需要带单位(重量、件数、方数,体积四种不能同时为空)
+    Integer unit;//件数 否 1 默认单位:件,传值不需要带单位
+    Double size;//方数 否 2.2 默认单位:方,传值不需要带单位 立方米
+    Double manageWeight;//经营重量 否 13
+    String beginCityName;//始发城市 否 深圳
+    String endCityName;//目的城市 否 广州
+    String beginAddress;//始发地址 否
+    String endAddress;//目的地址 否
+}

+ 18 - 0
src/main/java/com/uas/eis/entity/sf/SFDestAddress.java

@@ -0,0 +1,18 @@
+package com.uas.eis.entity.sf;
+
+import lombok.Data;
+
+@Data
+public class SFDestAddress {
+    /* 例:
+        "province": "广东省"
+        "city": "广州市",
+        "district": "越秀区",
+        "address": "北京街道西湖路38号首层102号东南铺江博士",
+    */
+    String  province;//条件		目的地所在省份,字段填写要求:必须是标准的省名称称谓 如:广东省; 如果是直辖市,请直接传北京、上海等,如果字段code为空时为必填。
+    String  city;// 条件		目的地所在城市,必须是标准的城市称谓 如:深圳市,如果字段code为空时为必填。
+    String  district;//N		目的地所在县/区,必须是标准的县/区称谓,示例:“福田区”。
+    String  address;//N		目的地详细地址,此详细地址需包含省市信息,以提高地址识别的成功率,示例:“广东省深圳市福田区新洲十一街万基商务大厦10楼”
+    String  code;//目的地区域代码,如果填写了此项,则查询时忽略省市区具体地址,如果不填此项,则综合省市区具体地址识别区域代码,字段province或city为空时为必填,示例:020、755。
+}

+ 10 - 0
src/main/java/com/uas/eis/entity/sf/SFPriceApiResultData.java

@@ -0,0 +1,10 @@
+package com.uas.eis.entity.sf;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SFPriceApiResultData extends SFApiRespData{
+    SFPriceMsgData msgData;//返回的详细数据
+}

+ 13 - 0
src/main/java/com/uas/eis/entity/sf/SFPriceDeliverTmDto.java

@@ -0,0 +1,13 @@
+package com.uas.eis.entity.sf;
+
+import lombok.Data;
+
+@Data
+public class SFPriceDeliverTmDto {
+    String businessType	;//快件产品;
+    String businessTypeDesc;//快件产品描述:
+    String deliverTime;//承诺时间;
+    Double fee	;//价格;
+    String searchPrice;//是否查询价格(1,返回价格;0,不返回价格);
+    String closeTime;//截单时间;
+}

+ 10 - 0
src/main/java/com/uas/eis/entity/sf/SFPriceMsgData.java

@@ -0,0 +1,10 @@
+package com.uas.eis.entity.sf;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SFPriceMsgData {
+    List<SFPriceDeliverTmDto> deliverTmDto;
+}

+ 14 - 0
src/main/java/com/uas/eis/entity/sf/SFPriceQueryReq.java

@@ -0,0 +1,14 @@
+package com.uas.eis.entity.sf;
+
+import lombok.Data;
+
+@Data
+public class SFPriceQueryReq {
+    String businessType;//   Y	快件产品:可以为空,为空时查询默认时效对应的产品列表。不为空时以数字代码业务类型,例如:1:表示顺丰特快 2:表示顺丰特惠 5:表示顺丰次晨 6:表示即日件
+    Double weight;//N		货物总重量,包含子母件,单位千克,精确到小数点后2位,如果提供此值,必须>0
+    Double volume;//N      货物的体积(长、宽、高分别以厘米为单位计算体积),精确到小数点后2位。 立方厘米
+    String consignedTime;//N 寄件时间,格式为YYYY-MM-DD HH24:MM:SS,示例2013-12-27 17:54:20。
+    String searchPrice="1";//1:表示查询含价格的接口 0:表示查询不含价格的接口 备注:限制只能为0,1或者不传searchPrice,不可以为空,null
+    SFDestAddress destAddress;//目的地信息
+    SFSrcAddress srcAddress;//Y		//原寄地信息
+}

+ 12 - 0
src/main/java/com/uas/eis/entity/sf/SFSrcAddress.java

@@ -0,0 +1,12 @@
+package com.uas.eis.entity.sf;
+
+import lombok.Data;
+
+@Data
+public class SFSrcAddress {
+    String province;//条件		原寄地所在省份,字段填写要求:必须是标准的省名称称谓 如:广东省如果是直辖市,请直接传北京、上海等,与字段city同时存在时忽略字段address如果字段code与字段address皆为空时为必填。
+    String city;//条件		原寄地所在城市,必须是标准的城市称谓 如:深圳市,与字段province同时存在时忽略字段address,如果字段code与字段address皆为空时为必填。
+    String district;//否		原寄地所在县/区,必须是标准的县/区称谓,示例:“福田区”。
+    String address;//原寄地详细地址,此详细地址需包含省市信息,以提高地址识别的成功率,示例:“广东省深圳市福田区新洲十一街万基商务大厦10楼”,字段code为空且字段province或字段city其一为空时为必填。
+    String code;//条件		原寄地区域代码,如果填写了此项,则忽略字段address,字段province及字段city。字段address为空且字段province或字段city其一为空时为必填,示例:020、755。
+}

+ 2 - 0
src/main/java/com/uas/eis/service/ERPService.java

@@ -14,4 +14,6 @@ public interface ERPService {
     Map<String, Object> creatSFOrder(String master, Integer id,String emCode);
 
     Map<String, Object> cancelSFOrder(String master, Integer id, String emCode);
+
+    Map<String, Object> getLogisticsPrice(Integer id);
 }

+ 230 - 0
src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -1,14 +1,22 @@
 package com.uas.eis.service.Impl;
 
+import com.deppon.dop.module.sdk.shared.domain.price.QueryPriceRequest;
+import com.deppon.dop.module.sdk.shared.util.FastJsonUtil;
+import com.deppon.dop.module.sdk.shared.util.HttpUtils;
+import com.deppon.dop.module.sdk.shared.util.SecurityUtil;
+import com.kyexpress.openapi.sdk.KyeDefaultOpenApi;
 import com.sf.csim.express.service.CallExpressServiceTools;
 import com.sf.csim.express.service.HttpClientUtil;
 import com.sf.csim.express.service.IServiceCodeStandard;
 import com.sf.csim.express.service.code.ExpressServiceCodeEnum;
 import com.uas.eis.core.config.SpObserver;
 import com.uas.eis.dao.*;
+import com.uas.eis.entity.dop.DoPPriceQueryReq;
+import com.uas.eis.entity.ky.KYPriceQueryReq;
 import com.uas.eis.entity.sf.*;
 import com.uas.eis.service.ERPService;
 import com.uas.eis.utils.*;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -376,4 +384,226 @@ public class ERPServiceImpl implements ERPService {
         retMap.put("message","取消成功。");
         return retMap;
     }
+
+    @Override
+    public Map<String, Object> getLogisticsPrice(Integer id) {
+        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_route"),
+                    "广东省","深圳市");
+            data.put("SF", id);
+            //跨越
+            //getPrice_KY(id);
+           /* getPrice_DoP(id);*/
+            modelMap.put("success", true);
+        }else{
+            modelMap.put("message", "单据不存在!");
+            modelMap.put("success", false);
+        }
+
+        return modelMap;
+    }
+    //
+    private Map<String, Object> getPrice_DoP(Integer id){
+        /*
+        * http://dpsanbox.deppon.com/sandbox-web/standard-order/queryPriceTime.action
+        *   params String 核算请求参数 是
+            digest String 区域密文摘要 是
+            timestamp String 核算当前时间戳 ,当前时间毫秒数 是
+            companyCode String 核算第三方接入商的公司编码(双方约定,建议公司简拼或者代码,字母大写)请求报文字段 是
+        * */
+        Map<String,Object> retMap = new HashMap<>();
+        try{
+            Object[] obs = baseDao.getFieldsDataByCondition("SZSI_P.DOCK_LOGISTICS_CONFIG A "
+                    , new String[]{"CALL_URL","CLIENT_CODE","CHECK_WORD","ENABLE_"}, "LOGISTICS_='DOPTEST' and type_='GETPRICE' AND A.ENABLE_ = 1");
+            String CALL_URL = obs[0].toString();
+            String CHECK_WORD = obs[1].toString();
+              /* originalsStreet": "上海-上海市-长宁区",
+                "originalsaddress": "上海-上海市-长宁区",
+                "sendDateTime": "2018-08-07 11:00:03",
+                "totalVolume": 0.001,
+                "totalWeight": 500,*/
+            /*QueryPriceRequest queryPriceRequest=new QueryPriceRequest();
+            queryPriceRequest.setLogisticCompanyID("DEPPON");
+            queryPriceRequest.setOriginalProvince("广东省");
+            queryPriceRequest.setOriginalCity("深圳市");
+            queryPriceRequest.setDestProvince("广东省");
+            queryPriceRequest.setDestCity("深圳市");*/
+            //queryPriceRequest.set
+             DoPPriceQueryReq doPPriceQueryReq=new DoPPriceQueryReq();
+            doPPriceQueryReq.setOriginalsStreet("上海-上海市-长宁区");
+            doPPriceQueryReq.setOriginalsaddress("上海-上海市-长宁区");
+            doPPriceQueryReq.setSendDateTime("2025-03-14 11:00:03");
+            doPPriceQueryReq.setTotalVolume("0.001");
+            doPPriceQueryReq.setTotalWeight("500");
+            String msgData = FastJsonUtil.toJSONString(doPPriceQueryReq);
+            String timeStamp = SecurityUtil.getTimestamp();
+            Map<String, String> params = new HashMap<String, String>();
+            String appkey="6c64b3a0a580ac616b2e74454b6be7dc";
+            String digest= SecurityUtil.getDigest(msgData+appkey+timeStamp);
+            System.out.println(msgData);
+            System.out.println(timeStamp);
+            System.out.println(digest);
+
+            params.put("params", msgData);
+            params.put("digest", digest);
+            params.put("timestamp", timeStamp);
+            params.put("companyCode", CHECK_WORD);
+            String result = HttpClientUtil.post(CALL_URL, params);
+            System.out.println(result);
+            return retMap;
+        }catch (Exception e){
+            e.printStackTrace();
+            retMap.put("success",false);
+            retMap.put("message","获取失败"+(StringUtil.nvl(e.getMessage(),"")));
+            logger.info("getPrice_dop-F:id {} err {}",id,retMap.get("message"));
+            return retMap;
+        }
+    }
+    //跨越
+    private Map<String, Object> getPrice_KY(Integer id){
+        /*
+        正式环境:https://open.ky-express.com/router/rest
+        沙箱环境:https://open.ky-express.com/sandbox/router/rest
+        ======================================================
+        参数名称      类型    是否必填  描述
+        appkey      string    是     应用key                11000
+        format      string    是    返回参数格式(默认json)    json
+        timestamp   string    否    时间戳                  12345672333
+        method      string    是    请求方法                open.api.openCommon.queryFreightCharge
+        sign        string    否     签名                  CF529FFB8B49499EC30BE2C29C02AE67
+        token       string    是     请求票据               eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9....
+        */
+        Map<String,Object> retMap = new HashMap<>();
+        try{
+            Object[] obs = baseDao.getFieldsDataByCondition("SZSI_P.DOCK_LOGISTICS_CONFIG A "
+                    , new String[]{"CALL_URL","CLIENT_CODE","CHECK_WORD","ENABLE_"}, "LOGISTICS_='KYTEST' and type_='GETPRICE' AND A.ENABLE_ = 1");
+            String timeStamp = String.valueOf(System.currentTimeMillis());
+            // 是否沙盒环境 true标识沙盒环境,false标识正式环境,发布生产环境时注意切换
+            boolean isSandbox = true;
+            Map<String, String> params = new HashMap<String, String>();
+            String appkey="83913";//obs[1].toString();
+            String appSecret ="DF10929B05F1963BC3A6F140CEF1892E";// obs[2].toString();
+            params.put("format","json");
+            params.put("timestamp",timeStamp);
+            String method="open.api.openCommon.queryFreightCharge";
+            KYPriceQueryReq kyPriceQueryReq=new KYPriceQueryReq();
+            kyPriceQueryReq.setBeginAreaCode("0755");
+            kyPriceQueryReq.setBeginAreaCode("0711");
+            kyPriceQueryReq.setBillingTime("2025-03-14 14:25");
+            kyPriceQueryReq.setPickupCustomerCode("075525131031");
+            kyPriceQueryReq.setWeight(50.00);
+            String bizBody = FlexJsonUtil.toJsonDeep(kyPriceQueryReq);
+            System.out.println(appkey);
+            System.out.println(appSecret);
+            String response = KyeDefaultOpenApi.builder(appkey, appSecret ) //应用Key,密钥
+                    .env("uat") // //对应环境,包含(uat:测试环境,prod:生产环境),获取对应环境的请求路径
+                    .api(method) //所调用Api Code
+                    .sandbox(isSandbox) //是否沙盒环境(env=prod且isSandbox=true时对应的就是跨越测试环境)
+                    .body(bizBody) //请求体参数,可接受字符串,List,Map三种类型的参数
+                    .connectTimeout(3000) //连接超时时间
+                    .readTimeout(15000) //读取超时时间
+                    .request()
+                    .response();
+            System.out.println(response);
+        }catch (Exception e){
+            e.printStackTrace();
+            retMap.put("success",false);
+            retMap.put("message","获取失败"+(StringUtil.nvl(e.getMessage(),"")));
+            logger.info("getPrice_KY-F:id {} err {}",id,retMap.get("message"));
+            return retMap;
+        }
+        return retMap;
+    }
+    //顺丰
+    private Map<String, Object> getPrice_SF(Integer id,String type,double weight,double volume,String province_d,String city_d,String province_s,String city_s) {
+        Map<String,Object> retMap = new HashMap<>();
+         /*生产环境地址	https://bspgw.sf-express.com/std/service
+            沙箱环境地址	https://sfapi-sbox.sf-express.com/std/service*/
+        /*1	partnerID	String(64)	是	合作伙伴编码(即顾客编码)
+        2	requestID	String(40)	是	请求唯一号UUID
+        3	serviceCode	String(50)	是	接口服务代码
+        4	timestamp	long	是	调用接口时间戳
+        5	msgDigest	String(128)	条件	数字签名,使用数字签名方式认证时必填
+        6	accessToken	Number	条件	访问令牌,使用OAuth2方式认证时必填
+        7	msgData	String	是	业务数据报文*/
+        try{
+            Object[] obs = baseDao.getFieldsDataByCondition("SZSI_P.DOCK_LOGISTICS_CONFIG A "
+                    , new String[]{"CALL_URL","CLIENT_CODE","CHECK_WORD","ENABLE_"}, "LOGISTICS_='SF' and type_='GETPRICE' AND A.ENABLE_ = 1");
+            String msgData = "";
+            String businessType="";
+            if("特快".equals(type)){
+                businessType="1";
+            }else if("标快".equals(type)){
+                businessType="2";
+            }else if("物流".equals(type)){
+                businessType="255";//卡航
+            }
+            SFPriceQueryReq sfPriceQueryReq=new SFPriceQueryReq();
+            sfPriceQueryReq.setBusinessType(businessType);//特快
+            sfPriceQueryReq.setWeight(weight);
+            sfPriceQueryReq.setVolume(volume);
+            //sfPriceQueryReq.setConsignedTime("2025-03-14 09:00:00");
+            //目的地
+            SFDestAddress sfDestAddress=new SFDestAddress();
+            sfDestAddress.setProvince(province_d);
+            sfDestAddress.setCity(city_d);
+            //sfDestAddress.setCode("3310");//不是这个code
+            sfPriceQueryReq.setDestAddress(sfDestAddress);
+            //寄件方信息
+            SFSrcAddress srcAddress=new SFSrcAddress();
+            //srcAddress.setCode("5840");//深圳?
+            srcAddress.setProvince(province_s);
+            srcAddress.setCity(city_s);
+            sfPriceQueryReq.setSrcAddress(srcAddress);
+
+            msgData = FlexJsonUtil.toJsonDeep(sfPriceQueryReq);
+            CallExpressServiceTools tools=CallExpressServiceTools.getInstance();
+            String CLIENT_CODE = obs[1].toString();
+            String CHECK_WORD = obs[2].toString();
+            String CALL_URL = obs[0].toString();
+            System.out.println("CALL_URL:"+CALL_URL);
+            System.out.println("CLIENT_CODE:"+CLIENT_CODE);
+            System.out.println("CHECK_WORD:"+CHECK_WORD);
+            System.out.println("msgData:"+msgData);
+            String timeStamp = String.valueOf(System.currentTimeMillis());
+
+            Map<String, String> params = new HashMap<String, String>();
+            params.put("partnerID", CLIENT_CODE);  // 顾客编码 ,对应丰桥上获取的clientCode
+            params.put("requestID", UUID.randomUUID().toString().replace("-", ""));
+            params.put("serviceCode",ExpressServiceCodeEnum.EXP_RECE_QUERY_DELIVERTM.getCode());// 接口服务码
+            params.put("timestamp", timeStamp);
+            params.put("msgData", msgData);
+            params.put("msgDigest", tools.getMsgDigest(msgData,timeStamp,CHECK_WORD));
+            String result = HttpClientUtil.post(CALL_URL, params);
+            SFApiResp sfApiResp= FlexJsonUtil.fromJson(result, SFApiResp.class);
+            if(sfApiResp!=null){
+                if("A1000".equals(sfApiResp.getApiResultCode())){
+                    String apiResultData = sfApiResp.getApiResultData();
+                    SFPriceApiResultData sfPriceApiResultData=FlexJsonUtil.fromJson(apiResultData, SFPriceApiResultData.class);
+                    if(sfPriceApiResultData.isSuccess()){
+                        for(SFPriceDeliverTmDto sfd:sfPriceApiResultData.getMsgData().getDeliverTmDto() ){
+                            if(businessType.equals(sfd.getBusinessType()) && sfd.getFee() !=null){
+                                baseDao.execute("update LogisticsPrice set LP_REALTIMEPRICE1="+sfd.getFee()+" where lp_id="+id);
+                            }
+                        }
+                    }
+
+                }
+            }
+            System.out.println("result:"+result);
+        }catch (Exception e){
+            e.printStackTrace();
+            retMap.put("success",false);
+            retMap.put("message","获取失败"+(StringUtil.nvl(e.getMessage(),"")));
+            logger.info("getPrice_SF-F:id {} err {}",id,retMap.get("message"));
+            return retMap;
+        }
+        return retMap;
+    }
 }

+ 4 - 4
src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: JYX_ZS
+        username: SZSI_P
         password: select!#%*(
-        url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
+        url: jdbc:oracle:thin:@10.1.81.208:11522:orcl
         initialSize: 1
         maxActive: 3
         maxWait: 30000
@@ -22,8 +22,8 @@ server:
     tomcat:
         uri_encoding: UTF-8
     context-path:
-        /eis_sf
-    port: 8186
+        /eis_pl
+    port: 8187
 
 action:
     api_action: /EIS/api,/EIS/mes,/EIS/erp

+ 3 - 3
src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: JYX_ZS
+        username: SZSI_P
         password: select!#%*(
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 1
@@ -22,8 +22,8 @@ server:
     tomcat:
         uri_encoding: UTF-8
     context-path:
-        /eis_sf
-    port: 8186
+        /eis_pl
+    port: 8187
 
 action:
     api_action: /EIS/api,/EIS/mes,/EIS/erp

+ 1 - 1
src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
     profiles:
-        active: prod
+        active: dev
     http:
         encoding:
             force: true

+ 7 - 0
src/test/java/com/uas/eis/UasEisApplicationTests.java

@@ -1,6 +1,7 @@
 package com.uas.eis;
 
 
+import com.deppon.dop.module.sdk.shared.util.SecurityUtil;
 import com.uas.eis.dao.*;
 import com.uas.eis.entity.sf.*;
 import com.uas.eis.service.ERPService;
@@ -311,4 +312,10 @@ public class UasEisApplicationTests {
 			}
 		}
 	}
+
+ 	@Test
+	public void TestSF_getprice(){
+		Map<String, Object> res = erpService.getLogisticsPrice(3020);
+		System.out.println("res==="+res.get("success")+":"+res.get("message"));
+	}
 }