|
|
@@ -17,6 +17,8 @@ import com.fs.common.config.FSSysConfig;
|
|
|
import com.fs.common.core.domain.R;
|
|
|
import com.fs.common.exception.CustomException;
|
|
|
import com.fs.common.utils.DateUtils;
|
|
|
+import com.fs.his.config.FsSysConfig;
|
|
|
+import com.fs.his.utils.ConfigUtil;
|
|
|
import com.fs.hisStore.config.StoreConfig;
|
|
|
import com.fs.hisStore.domain.FsStoreOrderScrm;
|
|
|
import com.fs.hisStore.dto.ExpressAddressDTO;
|
|
|
@@ -51,6 +53,9 @@ public class FsExpressScrmServiceImpl implements IFsExpressScrmService
|
|
|
@Autowired
|
|
|
private ISysConfigService configService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ConfigUtil configUtil;
|
|
|
+
|
|
|
/**
|
|
|
* 查询快递公司
|
|
|
*
|
|
|
@@ -138,8 +143,9 @@ public class FsExpressScrmServiceImpl implements IFsExpressScrmService
|
|
|
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
|
try {
|
|
|
- String json = this.configService.selectConfigByKey("his.config");
|
|
|
- FSSysConfig sysConfig= JSON.parseObject(json,FSSysConfig.class);
|
|
|
+// String json = this.configService.selectConfigByKey("his.config");
|
|
|
+// FSSysConfig sysConfig= JSON.parseObject(json,FSSysConfig.class);
|
|
|
+ FsSysConfig sysConfig = configUtil.getSysConfig();
|
|
|
params.put("RequestData", URLEncoder.encode(requestData, "UTF-8"));
|
|
|
params.put("EBusinessID",sysConfig.getKdnId().trim());
|
|
|
params.put("RequestType", "8001");
|
|
|
@@ -147,7 +153,7 @@ public class FsExpressScrmServiceImpl implements IFsExpressScrmService
|
|
|
params.put("DataSign", URLEncoder.encode(dataSign, "UTF-8"));
|
|
|
params.put("DataType", "2");
|
|
|
|
|
|
- String result = HttpUtil.post(sysConfig.getKdnUrl().trim(), params);
|
|
|
+ String result = HttpUtil.post(sysConfig.getKdnAddressUrl().trim(), params);
|
|
|
|
|
|
//根据公司业务处理返回的信息......
|
|
|
ExpressInfoDTO dto=JSONUtil.toBean(result,ExpressInfoDTO.class);
|