autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-21 07:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-03 18:59:26 +08:00
parent 57f34e5836
commit cbd8da535b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -201,7 +201,8 @@ public class TempController extends BaseController {
List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
for (String tradeDate : dateList) { for (String tradeDate : dateList) {
orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate); // orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate);
orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate);
} }
response = new RestApiResponse<>(); response = new RestApiResponse<>();

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -878,10 +878,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 运营商有没有开通结算账户 // 运营商有没有开通结算账户
if (adapayMemberAccount == null) { if (adapayMemberAccount == null) {
logger.error("订单分账逻辑error-运营商有没有开通结算账户");
return; return;
} }
if (CollectionUtils.isEmpty(stationReportList)) { if (CollectionUtils.isEmpty(stationReportList)) {
logger.error("订单分账逻辑error-stationReportList为空");
return; return;
} }