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

生成运营商日报表

Browse Source
This commit is contained in:
Guoqs
2025-02-20 15:44:46 +08:00
parent a64f8ad2a5
commit c2644b8c3a
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -340,6 +340,7 @@ public class TempController extends BaseController {
/** /**
* 运营商分账手动接口 * 运营商分账手动接口
* 2025年2月20日15点37分 此接口改为手动计算运营商日报
* 前提条件是已经计算好订单日报了 * 前提条件是已经计算好订单日报了
* http://localhost:8080/temp/orderSplittingOperations * http://localhost:8080/temp/orderSplittingOperations
* *
@@ -355,7 +356,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.orderSplittingOperations(dto.getMerchantId(), tradeDate); // orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate);
orderBasicInfoService.generateMerchantBill(dto.getMerchantId(), tradeDate);
} }
response = new RestApiResponse<>(); response = new RestApiResponse<>();
} catch (BusinessException e) { } catch (BusinessException e) {

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

@@ -1509,9 +1509,15 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder()
.clearingBillCode(clearingBillCode) .clearingBillCode(clearingBillCode)
.orderCode(orderCode) .orderCode(orderCode)
.adapayMemberId(orderSplitRecord.getAdapayMemberId())
.paymentId(orderSplitRecord.getPaymentId())
.confirmId(orderSplitRecord.getPaymentConfirmId())
.confirmAmt(orderSplitRecord.getElectricitySplitAmount().add(orderSplitRecord.getServiceSplitAmount()))
.feeAmt(orderSplitRecord.getFeeAmount())
.createTime(DateUtils.getNowDate()) .createTime(DateUtils.getNowDate())
.delFlag(DelFlagEnum.NORMAL.getValue()) .delFlag(DelFlagEnum.NORMAL.getValue())
.build(); .build();
billDetailList.add(clearingBillDetail);
} }
} }
clearingBillInfo.setSettleAmount(settleAmount); clearingBillInfo.setSettleAmount(settleAmount);

3
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -154,9 +154,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
return Maps.newHashMap(); return Maps.newHashMap();
} }
// 根据orderCode分组 // 根据orderCode分组
Map<String, List<OrderSplitRecord>> resultMap = orderSplitRecords.stream() return orderSplitRecords.stream()
.collect(Collectors.groupingBy(OrderSplitRecord::getOrderCode)); .collect(Collectors.groupingBy(OrderSplitRecord::getOrderCode));
return resultMap;
} }
/** /**