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-03-03 17:10:26 +08:00
parent b582519281 3adeeba2bf
commit a47cc8f1d4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -173,7 +173,7 @@ public class HaokaUpdateOrderSchedule {
}
for (SuperiorApiDO superiorApiDO : list) {
if (superiorApiDO.getApiFrom() != 1) {
break;
continue;
}
// if (superiorApiDO.getId() < 100) {
// break;
@ -233,7 +233,7 @@ public class HaokaUpdateOrderSchedule {
logForOrder.setSuccess(false);
logForOrder.setErrorInfo("OrdersDO 本地不存在该订单");
log.debug("OrdersDO 本地不存在该订单");
break;
continue;
}
/**

9
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealServiceImpl.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.haoka.service.api;
import cn.iocoder.yudao.module.haoka.api.ApiFrom;
import cn.iocoder.yudao.module.haoka.api.liantong.util.StringUtils;
import cn.iocoder.yudao.module.haoka.controller.admin.onsaleproduct.vo.OnSaleProductPreOrderRespVO;
import cn.iocoder.yudao.module.haoka.controller.admin.superiorapi.vo.SuperiorApiRespVO;
import cn.iocoder.yudao.module.haoka.controller.admin.superiorapilog.vo.SuperiorApiLogSaveReqVO;
import cn.iocoder.yudao.module.haoka.dal.dataobject.orders.OrdersDO;
import cn.iocoder.yudao.module.haoka.dal.dataobject.superiorapi.SuperiorApiDO;
@ -108,8 +109,14 @@ public class ApiDealServiceImpl implements ApiDealStrategyService {
logVO.setErrorInfo(msg);
return ApiDealResp.failed(msg);
}
if (onSaleProductPreOrder.getSuperiorApiRespVO() == null) {
String msg = "关联上游接口不存在--onSaleProductPreOrder.getSuperiorApiRespVO";
logVO.setSuccess(false);
logVO.setErrorInfo(msg);
return ApiDealResp.failed(msg);
}
SuperiorApiDO superiorApi = superiorApiService.getSuperiorApi(param.getSuperiorApiId());
SuperiorApiDO superiorApi = superiorApiService.getSuperiorApi(onSaleProductPreOrder.getSuperiorApiRespVO().getId());
if (superiorApi == null) {
String msg = "关联上游接口不存在";
logVO.setSuccess(false);