szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Damonny 2025-01-11 21:13:17 +08:00
parent 9e2582e7af ce51488359
commit 7eac0a3518
3 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java
View File

@ -92,7 +92,7 @@ public class HaokaUpdateOrderSchedule {
//18 开卡失败 -460 //18 开卡失败 -460
//19 证件不合格待重传 -200 //19 证件不合格待重传 -200
//20 订单终止 0 //20 订单终止 0
pageReqVO.setStatus(Lists.newArrayList(450L,460L,470L,500L,550L)); // 已经完成/取消/删除的订单，不需要再从上游同步，这里过滤掉 pageReqVO.setStatus(Lists.newArrayList(460L,470L,500L,550L)); // 已经完成/取消/删除的订单，不需要再从上游同步，这里过滤掉
while ((long) pageNo * pageSize < total) { while ((long) pageNo * pageSize < total) {
pageNo += 1; pageNo += 1;

32
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/GuangZhouDxApiDealStrategy.java
View File

@ -101,15 +101,27 @@ public class GuangZhouDxApiDealStrategy implements ApiDealStrategy {
} }
String supplierOrderId = apiGuangZhouDXService.createOrder(logVO, haokaSuperiorApiId,createParam); String supplierOrderId = apiGuangZhouDXService.createOrder(logVO, haokaSuperiorApiId,createParam);
OrderApiCreateResp superApiResponse = new OrderApiCreateResp();
if (StringUtils.isEmpty(supplierOrderId)){ if (StringUtils.isEmpty(supplierOrderId)){
return ApiDealResp.failed("广州电信同步订单接口：没有返回订单信息"); // return ApiDealResp.failed("广州电信同步订单接口：没有返回订单信息");
superApiResponse.setOrderStatusCode("470");
superApiResponse.setSupplierOrderStatusDesc("广州电信同步订单接口：没有返回订单信息");
return ApiDealResp.ok(superApiResponse);
} }
OrderApiCreateResp orderApiCreateResp = new OrderApiCreateResp(); // OrderApiCreateResp orderApiCreateResp = new OrderApiCreateResp();
orderApiCreateResp.setSupplierOrderId(supplierOrderId); // orderApiCreateResp.setSupplierOrderId(supplierOrderId);
orderApiCreateResp.setOrderCreateResponse(supplierOrderId); // orderApiCreateResp.setOrderCreateResponse(supplierOrderId);
//
// return ApiDealResp.ok(orderApiCreateResp);
//
return ApiDealResp.ok(orderApiCreateResp); superApiResponse.setOrderStatusCode("470");
superApiResponse.setSupplierOrderId(supplierOrderId);
// superApiResponse.setSupplierOrderStatusDesc(data.getCodeMessage());
superApiResponse.setOrderCreateResponse(supplierOrderId);
return ApiDealResp.ok(superApiResponse);
} }
@Override @Override
@ -168,14 +180,12 @@ public class GuangZhouDxApiDealStrategy implements ApiDealStrategy {
if (StringUtils.isNotEmpty(string)) { if (StringUtils.isNotEmpty(string)) {
orderApiQueryResp.setSupplierOrderStatusDesc(string); orderApiQueryResp.setSupplierOrderStatusDesc(string);
} }
String dataOrderInfoStatusID = dataOrderInfoStatus.getString("单状态ID"); String dataOrderInfoStatusID = dataOrderInfoStatus.getString("订单状态ID");
// todo 转换本地订单状态 orderApiQueryResp.setSupplierOrderStatusDesc(dataOrderInfoStatusID);
// if (StringUtils.isNotEmpty(string)){
// orderApiQueryResp.setSupplierOrderStatusDesc(string);
// }
} }
} }
orderApiQueryResp.setOrderStatusCode("470");
//- 物流信息--配送公司 //- 物流信息--配送公司
{ {
JSONObject jsonObject = dataOrderInfo.getJSONObject("订单配送方式"); JSONObject jsonObject = dataOrderInfo.getJSONObject("订单配送方式");
@ -185,6 +195,7 @@ public class GuangZhouDxApiDealStrategy implements ApiDealStrategy {
{ {
String string = jsonObject.getString("配送公司"); String string = jsonObject.getString("配送公司");
if (StringUtils.isNotEmpty(string)) { if (StringUtils.isNotEmpty(string)) {
orderApiQueryResp.setOrderStatusCode("550");
orderApiQueryResp.setTrackingCompany(string); orderApiQueryResp.setTrackingCompany(string);
} }
} }
@ -203,6 +214,7 @@ public class GuangZhouDxApiDealStrategy implements ApiDealStrategy {
{ {
String string = jsonObject.getString("运单号"); String string = jsonObject.getString("运单号");
if (StringUtils.isNotEmpty(string)) { if (StringUtils.isNotEmpty(string)) {
orderApiQueryResp.setOrderStatusCode("550");
orderApiQueryResp.setTrackingNumber(string); orderApiQueryResp.setTrackingNumber(string);
} }
} }

37
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/HaiNanDxApiDealStrategy.java
View File

@ -109,19 +109,33 @@ public class HaiNanDxApiDealStrategy implements ApiDealStrategy {
// 2、提交预订单 得到token lianTongPreOrderSync // 2、提交预订单 得到token lianTongPreOrderSync
// 3、用 token提交正式订单 lianTongOrderSyncV2 // 3、用 token提交正式订单 lianTongOrderSyncV2
OrderApiCreateResp superApiResponse = new OrderApiCreateResp();
try { try {
logVO.setParam(JSON.toJSONString(createParam)); logVO.setParam(JSON.toJSONString(createParam));
HaiNanDianXinApi.HaiNanResponseInfo<HaiNanDianXinApi.SynOrderInfoResponse> responseInfo HaiNanDianXinApi.HaiNanResponseInfo<HaiNanDianXinApi.SynOrderInfoResponse> responseInfo
= apiHaiNanDXService.synOrderInfo(logVO, haokaSuperiorApiId,createParam); = apiHaiNanDXService.synOrderInfo(logVO, haokaSuperiorApiId,createParam);
HaiNanDianXinApi.SynOrderInfoResponse data = responseInfo.getData(); HaiNanDianXinApi.SynOrderInfoResponse data = responseInfo.getData();
if (data == null) { if (data == null) {
return ApiDealResp.failed(responseInfo.getErrMsg()); // return ApiDealResp.failed(responseInfo.getErrMsg());
superApiResponse.setOrderStatusCode("0");
superApiResponse.setSupplierOrderStatusDesc("上游接口返回信息为空");
return ApiDealResp.ok(superApiResponse);
}
if (!"1000".equals(data.getResultCode()) ) {
// return ApiDealResp.failed(responseInfo.getErrMsg());
superApiResponse.setOrderStatusCode("0");
superApiResponse.setSupplierOrderStatusDesc(data.getCodeMessage());
return ApiDealResp.ok(superApiResponse);
} }
OrderApiCreateResp orderApiCreateResp = new OrderApiCreateResp();
orderApiCreateResp.setOrderCreateResponse(JSON.toJSONString(responseInfo)); superApiResponse.setOrderStatusCode("470");
return ApiDealResp.ok(orderApiCreateResp); superApiResponse.setSupplierOrderId(data.getOrderCode());
superApiResponse.setSupplierOrderStatusDesc(data.getCodeMessage());
superApiResponse.setOrderCreateResponse(JSON.toJSONString(responseInfo));
return ApiDealResp.ok(superApiResponse);
} catch (UnirestException e) { } catch (UnirestException e) {
return ApiDealResp.failed(e.getMessage()); return ApiDealResp.failed(e.getMessage());
} }
@ -156,7 +170,6 @@ public class HaiNanDxApiDealStrategy implements ApiDealStrategy {
JSONArray jsonArray = JSON.parseArray(data); JSONArray jsonArray = JSON.parseArray(data);
OrderApiCreateResp superApiResponse = new OrderApiCreateResp();
if (null==jsonArray){ if (null==jsonArray){
// return ApiDealResp.failed("上游接口返回信息为空"); // return ApiDealResp.failed("上游接口返回信息为空");
@ -167,17 +180,20 @@ public class HaiNanDxApiDealStrategy implements ApiDealStrategy {
JSONObject jsonObject = jsonArray.getJSONObject(0); JSONObject jsonObject = jsonArray.getJSONObject(0);
if (null==jsonObject){ if (null==jsonObject){
return ApiDealResp.failed("上游接口返回信息为空"); // return ApiDealResp.failed("上游接口返回信息为空");
orderApiQueryResp.setOrderStatusCode("0");
orderApiQueryResp.setSupplierOrderStatusDesc("上游接口返回信息为空");
return ApiDealResp.ok(orderApiQueryResp);
} }
// todo 转换本地订单状态
// orderApiQueryResp.setOrderStatusCode(); // orderApiQueryResp.setOrderStatusCode();
String statusCd = jsonObject.getString("statusCd"); String statusCd = jsonObject.getString("statusCd");
String statusName = jsonObject.getString("statusName"); String statusName = jsonObject.getString("statusName");
orderApiQueryResp.setSupplierOrderStatusDesc(statusName); orderApiQueryResp.setSupplierOrderStatusDesc(statusName);
orderApiQueryResp.setOrderStatusCode("470");
JSONObject orderLogisticInfo = jsonObject.getJSONObject("orderLogisticInfo"); JSONObject orderLogisticInfo = jsonObject.getJSONObject("orderLogisticInfo");
if (orderLogisticInfo!=null){ if (orderLogisticInfo!=null){
// 物流编号 logisticNbr // 物流编号 logisticNbr
@ -186,6 +202,7 @@ public class HaiNanDxApiDealStrategy implements ApiDealStrategy {
// 物流公司 // 物流公司
String logisticCompany = orderLogisticInfo.getString("logisticCompany"); String logisticCompany = orderLogisticInfo.getString("logisticCompany");
orderApiQueryResp.setTrackingCompany(logisticCompany); orderApiQueryResp.setTrackingCompany(logisticCompany);
orderApiQueryResp.setOrderStatusCode("550");
} }
orderApiQueryResp.setData(responseInfo); orderApiQueryResp.setData(responseInfo);