1.修改请求第三方产品,订单信息接口,增加授权字段

master
MrZhai 3 years ago
parent b84972bafb
commit 1a51186b72

@ -66,6 +66,8 @@ public class BasicUnitMaintainController {
private CompanyService companyService;
@Resource
private OrderService orderService;
@Resource
private ErpBasicClient erpBasicClient;
@GetMapping("/udiwms/basic/unit/maintain/filter")
public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest,
@ -335,7 +337,7 @@ public class BasicUnitMaintainController {
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 || (unitMaintainFilterRequest.getIsDownThrSys() != null && unitMaintainFilterRequest.getIsDownThrSys())) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
for (ErpUnitsResponse erpUnitsResponse : udiDlDeviceResponse.getData().getList()) {

@ -4,7 +4,10 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.github.pagehelper.PageInfo;
import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
import com.glxp.sale.admin.entity.basic.*;
import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.sale.admin.entity.basic.UdiCompanyEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
import com.glxp.sale.admin.entity.udid.UdiEntity;
import com.glxp.sale.admin.httpclient.ErpBasicClient;
@ -14,7 +17,6 @@ import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.ErpProductsResponse;
import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.thrsys.ThrProductsService;
@ -44,15 +46,14 @@ public class UdiInfoController {
UdiRelevanceService udiRelevanceService;
@Resource
UdiInfoService udiInfoService;
@Resource
BasicThirdSysService basicThirdSysService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
private ThrProductsService thrProductsService;
@Value("${UDI_SERVER_URL}")
private String udiUrl;
@Resource
private ErpBasicClient erpBasicClient;
//获取同步库UDI信息
@AuthRuleAnnotation("")
@ -171,8 +172,7 @@ public class UdiInfoController {
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0 || (filterErpGoodsRequest.getIsDownThrSys() != null && filterErpGoodsRequest.getIsDownThrSys())) {
ErpBasicClient erpBasicHttpClient = new ErpBasicClient();
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
List<ErpProductsResponse> invmandocResponses = udiDlDeviceResponse.getData().getList();
if (invmandocResponses != null) {

@ -53,6 +53,8 @@ public class ThrCorpExportLogController {
ThrCorpsDlService thrCorpsDlService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
private ErpBasicClient erpBasicClient;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/thrCorp/exportLog/filter")
@ -165,7 +167,7 @@ public class ThrCorpExportLogController {
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getFromType() == 0) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
return udiDlDeviceResponse;
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();

@ -57,6 +57,8 @@ public class ThrOrderExportLogController {
private ThrOrderDetailService thrOrderDetailService;
@Value("${file_path}")
String filePath;
@Resource
private ErpOrderClient erpOrderClient;
@AuthRuleAnnotation("")
@GetMapping("/udiwms/thrOrder/exportLog/filter")
@ -184,6 +186,7 @@ public class ThrOrderExportLogController {
}
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
filterErpOrderRequest.setThirdSys(basicThirdSysDetailEntity.getThirdSysFk());
if (basicThirdSysDetailEntity.getValue() == null) {
return ResultVOUtils.error(500, "业务单据查询接口未定义");
}
@ -192,7 +195,7 @@ public class ThrOrderExportLogController {
}
if (basicThirdSysDetailEntity.getFromType() == 0) {
return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest);
return erpOrderClient.getErpOrderResponse(basicThirdSysDetailEntity.getValue(), filterErpOrderRequest);
} else {
//todo 订单查询,需加日期
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();

@ -2,14 +2,19 @@ package com.glxp.sale.admin.httpclient;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.req.basic.BasicUnitMaintainFilterRequest;
import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.ErpProductsResponse;
import com.glxp.sale.admin.res.basic.ErpUnitsResponse;
import com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.util.HttpClient;
import com.glxp.sale.common.res.BaseResponse;
import com.glxp.sale.common.util.ResultVOUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
@ -17,8 +22,12 @@ import java.util.Map;
/**
* ERP
*/
@Slf4j
@Service
public class ErpBasicClient {
@Autowired
private BasicThirdSysService basicThirdSysService;
//获取往来单位
public BaseResponse<PageSimpleResponse<ErpUnitsResponse>> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) {
@ -29,16 +38,16 @@ public class ErpBasicClient {
paramMap.put("page", unitMaintainFilterRequest.getPage());
paramMap.put("limit", unitMaintainFilterRequest.getLimit());
String response = HttpClient.uCloudPost(url, unitMaintainFilterRequest);
// String response = HttpClient.mipsGet(url, paramMap);
//查询第三方系统接口授权参数
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys());
String response = HttpClient.uCloudPost(url, unitMaintainFilterRequest, basicThirdSysEntity);
try {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpUnitsResponse>>>() {
});
return udiDlDeviceResponse;
} catch (Exception e) {
e.printStackTrace();
log.error("获取往来单位异常", e);
return ResultVOUtils.error(500, "连接ERP服务出错");
}
}
@ -51,15 +60,16 @@ public class ErpBasicClient {
paramMap.put("limit", filterErpGoodsRequest.getLimit());
paramMap.put("page", filterErpGoodsRequest.getPage());
// String response = HttpClient.mipsGet(url, paramMap);
String response = HttpClient.uCloudPost(url, filterErpGoodsRequest);
//查询第三方系统接口授权参数
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys());
String response = HttpClient.uCloudPost(url, filterErpGoodsRequest, basicThirdSysEntity);
try {
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpProductsResponse>>>() {
});
return udiDlDeviceResponse;
} catch (Exception e) {
e.printStackTrace();
log.error("获取产品信息异常", e);
return ResultVOUtils.error(500, "连接ERP服务出错");
}
}

@ -2,15 +2,20 @@ package com.glxp.sale.admin.httpclient;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
import com.glxp.sale.admin.req.inout.ERPPostBillRequest;
import com.glxp.sale.admin.req.inout.FilterOrderRequest;
import com.glxp.sale.admin.req.inout.USignRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.inout.ErpOrderResponse;
import com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.util.DateUtil;
import com.glxp.sale.admin.util.HttpClient;
import com.glxp.sale.common.res.BaseResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
@ -20,22 +25,18 @@ import java.util.Map;
/**
* ERP
*/
@Slf4j
@Service
public class ErpOrderClient {
private String url;
public ErpOrderClient() {
@Autowired
private BasicThirdSysService basicThirdSysService;
}
public ErpOrderClient(String url) {
this.url = url;
}
public List<ErpOrderEntity> getErpOrder(List<String> billCodes, String action) {
public List<ErpOrderEntity> getErpOrder(String url, List<String> billCodes, String action) {
List<ErpOrderEntity> erpOrderEntities = new ArrayList<>();
if (billCodes != null && billCodes.size() > 0) {
for (int i = 0; i < billCodes.size(); i++) {
ErpOrderEntity erpOrderEntity = getErpOrder(billCodes.get(i), action);
ErpOrderEntity erpOrderEntity = getErpOrder(url, billCodes.get(i), action);
if (erpOrderEntity != null) {
erpOrderEntities.add(erpOrderEntity);
}
@ -44,7 +45,7 @@ public class ErpOrderClient {
return erpOrderEntities;
}
public BaseResponse<PageSimpleResponse<ErpOrderResponse>> getErpOrderResponse(FilterOrderRequest filterOrderRequest) {
public BaseResponse<PageSimpleResponse<ErpOrderResponse>> getErpOrderResponse(String url, FilterOrderRequest filterOrderRequest) {
Map<String, Object> paramMap = new HashMap<>(16);
paramMap.put("billNo", filterOrderRequest.getBillNo());
paramMap.put("page", filterOrderRequest.getPage());
@ -62,8 +63,9 @@ public class ErpOrderClient {
paramMap.put("startDate", filterOrderRequest.getStartDate());
paramMap.put("endDate", filterOrderRequest.getEndDate());
// response = HttpClient.mipsGet(url, paramMap);
String response = HttpClient.uCloudPost(url, filterOrderRequest);
//查询第三方服务接口授权参数
BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterOrderRequest.getThirdSys());
String response = HttpClient.uCloudPost(url, filterOrderRequest, basicThirdSysEntity);
try {
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ErpOrderResponse>>>() {
@ -77,10 +79,10 @@ public class ErpOrderClient {
return null;
}
public List<ErpOrderEntity> getErpOrder(FilterOrderRequest filterOrderRequest) {
public List<ErpOrderEntity> getErpOrder(String url, FilterOrderRequest filterOrderRequest) {
try {
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = getErpOrderResponse(filterOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = getErpOrderResponse(url, filterOrderRequest);
List<ErpOrderResponse> purchaseinResponseList = responseBaseResponse.getData().getList();
if (purchaseinResponseList != null && purchaseinResponseList.size() > 0) {
List<ErpOrderEntity> erpOrderEntities = new ArrayList<>();
@ -111,13 +113,13 @@ public class ErpOrderClient {
return null;
}
public ErpOrderEntity getErpOrder(String billCode, String action) {
public ErpOrderEntity getErpOrder(String url, String billCode, String action) {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setPage(1);
filterOrderRequest.setLimit(1);
filterOrderRequest.setBillAction(action);
filterOrderRequest.setBillNo(billCode);
List<ErpOrderEntity> erpOrderEntities = getErpOrder(filterOrderRequest);
List<ErpOrderEntity> erpOrderEntities = getErpOrder(url, filterOrderRequest);
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
return erpOrderEntities.get(0);
}

@ -22,4 +22,7 @@ public class FilterOrderRequest {
private Boolean isLocal;
private String localAction;
//第三方系统ID
private String thirdSys;
}

@ -21,5 +21,7 @@ public class FilterThrOrderRequest extends ListPageRequest {
private String originType;
private String status;
private String thirdSys;
private List<ErpOrderResponse> erpOrderResponses;
}

@ -41,6 +41,9 @@ public class ThrDataService {
private StockOrderService stockOrderService;
@Resource
private StockOrderDetailService stockOrderDetailService;
@Resource
private ErpBasicClient erpBasicClient;
final Logger logger = LoggerFactory.getLogger(ThrDataService.class);
public ThrProductsEntity getProducts(String code, String thirdSys) {
@ -57,7 +60,8 @@ public class ThrDataService {
filterErpGoodsRequest.setCode(code);
filterErpGoodsRequest.setPage(1);
filterErpGoodsRequest.setLimit(1);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
filterErpGoodsRequest.setThirdSys(thirdSys);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
List<ErpProductsResponse> erpProductsResponses = udiDlDeviceResponse.getData().getList();
if (erpProductsResponses != null) {

@ -41,6 +41,8 @@ public class BasicBackUpdateProductService {
SystemParamConfigService systemParamConfigService;
@Resource
BasicThirdSysService basicThirdSysService;
@Resource
private ErpBasicClient erpBasicClient;
//定时或一键下载更新全部线上产品信息
@Async
@ -60,7 +62,7 @@ public class BasicBackUpdateProductService {
public int getAllProducts(FilterErpGoodsRequest filterErpGoodsRequest, String productUrl, String
onHandUrl, String thirdSysId, Boolean isEnable) {
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl);
List<ErpProductsResponse> invmandocResponses = erpProducts.getData().getList();
SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData_type");
if (isEnable == null || isEnable == false) {

@ -28,6 +28,8 @@ public class BasicUnitImportService {
private BasicUnitMaintainService basicUnitMaintainService;
@Resource
private ThrCorpService thrCorpService;
@Resource
private ErpBasicClient erpBasicClient;
@Async
public void selectAllUnit(BasicThirdSysDetailEntity basicThirdSysDetailEntity, BasicUnitMaintainFilterRequest unitMaintainFilterRequest) {
@ -40,7 +42,7 @@ public class BasicUnitImportService {
unitMaintainFilterRequest.setPage(page);
unitMaintainFilterRequest.setLimit(100);
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> baseResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
erpBasicClient.getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
List<ErpUnitsResponse> temps = baseResponse.getData().getList();
if (temps.size() < 100) {
erpUnitsResponses.addAll(temps);

@ -3,7 +3,6 @@ package com.glxp.sale.admin.thread;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.glxp.sale.admin.constant.ConstantStatus;
import com.glxp.sale.admin.entity.basic.BasicThirdSysDetailEntity;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
@ -16,11 +15,9 @@ import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.ErpProductsResponse;
import com.glxp.sale.admin.service.basic.BasicThirdSysDetailService;
import com.glxp.sale.admin.service.basic.BasicThirdSysService;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.thrsys.ThrProductsService;
import com.glxp.sale.admin.util.CustomUtil;
import com.glxp.sale.admin.util.DateUtil;
@ -51,11 +48,10 @@ public class BasicUpdateProductService {
@Resource
ThrProductsService thrProductsService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
BasicThirdSysDetailService basicThirdSysDetailService;
@Resource
BasicThirdSysService basicThirdSysService;
@Resource
private ErpBasicClient erpBasicClient;
public String addProduct(CombineRequest combineRequest, String url) {
String errMsg = null;
@ -73,7 +69,8 @@ public class BasicUpdateProductService {
filterErpGoodsRequest.setCode(inventoryCode);
filterErpGoodsRequest.setPage(1);
filterErpGoodsRequest.setLimit(1);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, url);
filterErpGoodsRequest.setThirdSys(combineRequest.getThirdSys());
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, url);
List<ErpProductsResponse> erpProductsResponses = erpProducts.getData().getList();
if (erpProductsResponses != null & erpProductsResponses.size() > 0) {
{

@ -2,22 +2,19 @@ package com.glxp.sale.admin.thread;
import com.glxp.sale.admin.entity.basic.ErpStockEntity;
import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
import com.glxp.sale.admin.entity.basic.BasicInstrumentMaintainRelevanceEntity;
import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
import com.glxp.sale.admin.entity.info.SetupEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.entity.inout.ErpOrderEntity;
import com.glxp.sale.admin.entity.inout.WarehouseEntity;
import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
import com.glxp.sale.admin.httpclient.ErpOrderClient;
import com.glxp.sale.admin.req.inout.FilterOrderRequest;
import com.glxp.sale.admin.req.inout.WarehouseQueryRequest;
import com.glxp.sale.admin.req.param.SystemParamConfigRequest;
import com.glxp.sale.admin.service.basic.UdiInfoService;
import com.glxp.sale.admin.service.basic.UdiRelevanceService;
import com.glxp.sale.admin.service.info.SetupService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.service.inout.CodesService;
import com.glxp.sale.admin.service.inventory.InvErpStockService;
import com.glxp.sale.admin.service.param.SystemParamConfigService;
import com.glxp.sale.admin.util.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -31,8 +28,7 @@ import java.util.Map;
@Service
public class InvDlErpStockService {
@Resource
SetupService setupService;
@Resource
InvErpStockService erpStockService;
@Resource
@ -43,6 +39,9 @@ public class InvDlErpStockService {
CodesService warehouseService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
private ErpOrderClient erpOrderClient;
final Logger logger = LoggerFactory.getLogger(InvDlErpStockService.class);
/**
@ -73,10 +72,10 @@ public class InvDlErpStockService {
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setPage(page);
filterOrderRequest.setLimit(limit);
filterOrderRequest.setStartDate((String)date.get("startDate"));
filterOrderRequest.setEndDate((String)date.get("endDate"));
filterOrderRequest.setStartDate((String) date.get("startDate"));
filterOrderRequest.setEndDate((String) date.get("endDate"));
filterOrderRequest.setBillAction("PurchaseWareHouseIn");
List<ErpOrderEntity> erpOrderEntities = new ErpOrderClient(systemParamConfigEntity.getParamValue()).getErpOrder(filterOrderRequest);
List<ErpOrderEntity> erpOrderEntities = erpOrderClient.getErpOrder(systemParamConfigEntity.getParamValue(), filterOrderRequest);
List<ErpStockEntity> erpStockEntities = new ArrayList<>();
if (erpOrderEntities != null && erpOrderEntities.size() > 0) {
page++;

@ -48,6 +48,8 @@ public class ThrCorpsDlService {
ThrCorpExportLogService thrCorpExportLogService;
@Resource
private ThrCorpImportDetailService thrCorpImportDetailService;
@Resource
private ErpBasicClient erpBasicClient;
@Async
@ -242,7 +244,7 @@ public class ThrCorpsDlService {
basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest();
basicUnitMaintainFilterRequest.setPage(page);
basicUnitMaintainFilterRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl);
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> erpCrops = erpBasicClient.getErpCrop(basicUnitMaintainFilterRequest, corpUrl);
if (erpCrops == null || erpCrops.getCode() != 20000) {
thrCorpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL);
@ -305,7 +307,8 @@ public class ThrCorpsDlService {
basicUnitMaintainFilterRequest.setErpId(thrCorpExportRequest.getUnitId());
basicUnitMaintainFilterRequest.setPage(page);
basicUnitMaintainFilterRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl);
basicUnitMaintainFilterRequest.setThirdSys(thrCorpExportRequest.getThirdSys());
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> erpCrops = erpBasicClient.getErpCrop(basicUnitMaintainFilterRequest, corpUrl);
if (erpCrops.getCode() != 20000) {
return null;
}

@ -55,7 +55,8 @@ public class ThrOrdersDlService {
ThrOrderImportService thrOrderImportService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
private ErpOrderClient erpOrderClient;
@Async
public void importOrders(String genKey, String action, FilterThrOrderRequest filterThrProductsRequest) {
@ -281,8 +282,9 @@ public class ThrOrdersDlService {
filterThrOrderRequest.setLimit(limit);
filterThrOrderRequest.setBillAction(action);
FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
BeanUtils.copyProperties(filterThrOrderRequest,filterOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = new ErpOrderClient(orderUrl).getErpOrderResponse(filterOrderRequest);
BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest);
filterOrderRequest.setThirdSys(thirdSys);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(orderUrl, filterOrderRequest);
if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) {
List<ErpOrderResponse> erpOrderResponses = responseBaseResponse.getData().getList();
if (erpOrderResponses != null && erpOrderResponses.size() > 0) {
@ -325,6 +327,7 @@ public class ThrOrdersDlService {
public List<List<String>> exportThrOrders(FilterThrOrderRequest filterThrOrderRequest) {
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", filterThrOrderRequest.getThirdSysFk());
filterThrOrderRequest.setThirdSys(basicThirdSysDetailEntity.getThirdSysFk());
int page = 1;
int limit = 100;
List<ErpOrderResponse> erpOrderResponseList = new ArrayList<>();
@ -389,7 +392,7 @@ public class ThrOrdersDlService {
BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest);
filterOrderRequest.setPage(page);
filterOrderRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = new ErpOrderClient(orderQueryUrl).getErpOrderResponse(filterOrderRequest);
BaseResponse<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = erpOrderClient.getErpOrderResponse(orderQueryUrl, filterOrderRequest);
if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) {
}

@ -52,6 +52,8 @@ public class ThrProductsDlService {
ThrProductsExportLogService thrProductsExportLogService;
@Resource
SystemParamConfigService systemParamConfigService;
@Resource
private ErpBasicClient erpBasicClient;
@Async
public void importSelectProducrs(String genKey, List<ThrProductsEntity> thrProductsEntities, String thirdSys) {
@ -334,7 +336,7 @@ public class ThrProductsDlService {
filterErpGoodsRequest.setPage(page);
filterErpGoodsRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl);
if (erpProducts != null && erpProducts.getCode() == 20000) {
List<ErpProductsResponse> erpProductsResponses = erpProducts.getData().getList();
if (erpProductsResponses != null && erpProductsResponses.size() > 0) {
@ -394,7 +396,7 @@ public class ThrProductsDlService {
BeanUtils.copyProperties(filterThrProductsRequest, filterErpGoodsRequest);
filterErpGoodsRequest.setPage(page);
filterErpGoodsRequest.setLimit(limit);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl);
BaseResponse<PageSimpleResponse<ErpProductsResponse>> erpProducts = erpBasicClient.getErpProducts(filterErpGoodsRequest, productUrl);
if (erpProducts != null && erpProducts.getCode() == 20000) {
List<ErpProductsResponse> erpProductsResponses = erpProducts.getData().getList();
if (erpProductsResponses != null && erpProductsResponses.size() > 0) {

@ -1,6 +1,7 @@
package com.glxp.sale.admin.util;
import com.alibaba.fastjson.JSONObject;
import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
@ -68,6 +69,22 @@ public class HttpClient {
return response;
}
public static String uCloudPost(String url, Object object, BasicThirdSysEntity basicThirdSysEntity) {
RestTemplate restTemplate = new RestTemplate();
String json = JSONObject.toJSON(object).toString();
logger.info(url + "\n" + json);
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
if (null != basicThirdSysEntity) {
headers.add("api_key", basicThirdSysEntity.getApikey());
headers.add("secret_key", basicThirdSysEntity.getSecretkey());
}
HttpEntity<String> httpEntity = new HttpEntity<>(json, headers);
logger.info(httpEntity.toString());
String response = restTemplate.postForObject(url, httpEntity, String.class);
return response;
}
public static String mipsGet(String url) {
RestTemplate restTemplate = new RestTemplate();
@ -130,7 +147,7 @@ public class HttpClient {
RestTemplate restTemplate = new RestTemplate();
String accessTokenRequestUrl = url;//"http://127.0.0.1:9997/mips/druginfo/list";
logger.info(accessTokenRequestUrl);
HttpEntity<JSONObject> httpEntity = new HttpEntity<>( headers);
HttpEntity<JSONObject> httpEntity = new HttpEntity<>(headers);
String response = restTemplate.getForObject(accessTokenRequestUrl, String.class, httpEntity);
return response;
}

Loading…
Cancel
Save