diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHaiNanDXService.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHaiNanDXService.java index b3c7639277..0a58849cb7 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHaiNanDXService.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHaiNanDXService.java @@ -16,8 +16,10 @@ public class ApiHaiNanDXService extends ApiConfigService { public static final String Key_md5Key = "md5Key"; public static final String Key_publicKey = "publicKey"; public static final String Key_privateKey = "privateKey"; - public static final String Key_xAppId="xAppId"; - public static final String Key_xAppKey="xAppKey"; + public static final String Key_xAppId = "xAppId"; + public static final String Key_xAppKey = "xAppKey"; + public static final String Key_devMobile = "devMobile"; + public static final String Key_devStaffCode = "devStaffCode"; private HaiNanDianXinApi.HaiNanDianXinApiConfig getConfig(Long haokaSuperiorApiId) { Map devConfig = this.getDevConfig(haokaSuperiorApiId); @@ -30,6 +32,8 @@ public class ApiHaiNanDXService extends ApiConfigService { String privateKey = devConfig.get(Key_privateKey); String xAppId = devConfig.get(Key_xAppId); String xAppKey = devConfig.get(Key_xAppKey); + String devMobile = devConfig.get(Key_devMobile); + String devStaffCode = devConfig.get(Key_devStaffCode); HaiNanDianXinApi.HaiNanDianXinApiConfig config = new HaiNanDianXinApi.HaiNanDianXinApiConfig(); config.setXAppId(xAppId); config.setXAppKey(xAppKey); @@ -39,11 +43,13 @@ public class ApiHaiNanDXService extends ApiConfigService { config.setMd5Key(md5Key); config.setPublicKey(publicKey); config.setPrivateKey(privateKey); + config.setDevMobile(devMobile); + config.setDevStaffCode(devStaffCode); return config; } public HaiNanDianXinApi.HaiNanResponseInfo - qryNbrList(final SuperiorApiLogSaveReqVO logVO,Long haokaSuperiorApiId, HaiNanDianXinApi.QryNbrListRequest param) throws UnirestException { + qryNbrList(final SuperiorApiLogSaveReqVO logVO, Long haokaSuperiorApiId, HaiNanDianXinApi.QryNbrListRequest param) throws UnirestException { return HaiNanDianXinApi.qryNbrList(logVO, this.getConfig(haokaSuperiorApiId), param); } @@ -56,7 +62,7 @@ public class ApiHaiNanDXService extends ApiConfigService { * @throws UnirestException 请求异常 */ public HaiNanDianXinApi.HaiNanResponseInfo - qryReceiveAddr(final SuperiorApiLogSaveReqVO logVO,Long haokaSuperiorApiId, HaiNanDianXinApi.QryReceiveAddrRequest param) throws UnirestException { + qryReceiveAddr(final SuperiorApiLogSaveReqVO logVO, Long haokaSuperiorApiId, HaiNanDianXinApi.QryReceiveAddrRequest param) throws UnirestException { return HaiNanDianXinApi.qryReceiveAddr(logVO, this.getConfig(haokaSuperiorApiId), param); } @@ -64,7 +70,7 @@ public class ApiHaiNanDXService extends ApiConfigService { * 防诈校验接口查询 */ public HaiNanDianXinApi.HaiNanResponseInfo - fraudCheck(final SuperiorApiLogSaveReqVO logVO, Long haokaSuperiorApiId,HaiNanDianXinApi.FraudCheckRequest param) throws UnirestException { + fraudCheck(final SuperiorApiLogSaveReqVO logVO, Long haokaSuperiorApiId, HaiNanDianXinApi.FraudCheckRequest param) throws UnirestException { return HaiNanDianXinApi.fraudCheck(logVO, this.getConfig(haokaSuperiorApiId), param); } @@ -72,12 +78,13 @@ public class ApiHaiNanDXService extends ApiConfigService { * 订单信息查询 */ public HaiNanDianXinApi.HaiNanResponseInfo - queryOrderInfo(final SuperiorApiLogSaveReqVO logVO, Long haokaSuperiorApiId,HaiNanDianXinApi.QueryOrderInfoRequest param) throws UnirestException { + queryOrderInfo(final SuperiorApiLogSaveReqVO logVO, Long haokaSuperiorApiId, HaiNanDianXinApi.QueryOrderInfoRequest param) throws UnirestException { return HaiNanDianXinApi.queryOrderInfo(logVO, this.getConfig(haokaSuperiorApiId), param); } /** * 物流轨迹查询 + * * @return 物流轨迹查询返回结果 * @throws UnirestException 请求异常 */ @@ -93,7 +100,10 @@ public class ApiHaiNanDXService extends ApiConfigService { * @throws UnirestException 请求异常 */ public HaiNanDianXinApi.HaiNanResponseInfo - synOrderInfo(final SuperiorApiLogSaveReqVO logVO,Long haokaSuperiorApiId, HaiNanDianXinApi.SynOrderInfoRequest param) throws UnirestException { - return HaiNanDianXinApi.synOrderInfo(logVO, this.getConfig(haokaSuperiorApiId), param); + synOrderInfo(final SuperiorApiLogSaveReqVO logVO, Long haokaSuperiorApiId, HaiNanDianXinApi.SynOrderInfoRequest param) throws UnirestException { + HaiNanDianXinApi.HaiNanDianXinApiConfig config = this.getConfig(haokaSuperiorApiId); + param.setDevStaffCode(config.getDevStaffCode()); + param.setDevMobile(config.getDevMobile()); + return HaiNanDianXinApi.synOrderInfo(logVO, config, param); } } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hainandianxin/HaiNanDianXinApi.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hainandianxin/HaiNanDianXinApi.java index e3002c41c6..44568e04ef 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hainandianxin/HaiNanDianXinApi.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hainandianxin/HaiNanDianXinApi.java @@ -31,6 +31,8 @@ public class HaiNanDianXinApi { private String privateKey = ""; // RSA 私钥 private String xAppId = ""; private String xAppKey = ""; + private String devStaffCode =""; + private String devMobile =""; } // {"message":"JTEOP: Missing APP ID found in request","reason":"APPID not found","code":"10001","referenceError":"","status":401} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java index 2dfb310053..ff0b8d7e9f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java @@ -92,10 +92,13 @@ public class HaiNanDxApiDealStrategy implements ApiDealStrategy { createParam.setOrderAmount(configs.getString("ApiPrefix_orderAmount")); createParam.setBusiScenarioCode(configs.getString("ApiPrefix_busiScenarioCode")); createParam.setOrderType(configs.getString("ApiPrefix_orderType")); - HaiNanDianXinApi.OrderProdInst orderProdInst = new HaiNanDianXinApi.OrderProdInst(); - String string = configs.getString("ApiPrefix_prodNo"); - orderProdInst.setProdNo(string); + HaiNanDianXinApi.OrderProdInst orderProdInst = new HaiNanDianXinApi.OrderProdInst(); + SuperiorProductConfigRespVO superiorProductConfigRespVO = preProduct.getSuperiorProductConfigRespVO(); + if (superiorProductConfigRespVO!=null){ + String string = superiorProductConfigRespVO.getSuperiorCode(); + orderProdInst.setProdNo(string); + } orderProdInst.setProdName(configs.getString("ApiPrefix_prodName")); orderProdInst.setProdInstAct(configs.getString("ApiPrefix_prodInstAct")); createParam.setOrderProdInst(orderProdInst);