diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java index dc1e2aec6..ef4e7bcca 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java @@ -87,7 +87,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { DataScope refundDataScope = DataScope.of().func(DataScopeFuncEnum.ALL); refundDataScope.setScopeDeptName("merchant_dept_id"); List refundList = hardOrderMapper.listSb(refundDto, refundDataScope); - // 盈利 + // 消费净次数 HardOrderDto profitDto = BeanUtil.toBean(dto, HardOrderDto.class); profitDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); DataScope profitDataScope = DataScope.of().func(DataScopeFuncEnum.ALL); @@ -102,7 +102,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { v.setTotalRefundCount(i.getTotalPayCount()); }); } - // 盈利 + // 消费净次数 if (ObjectUtil.isNotEmpty(profitList)) { profitList.stream().filter(i -> ObjectUtil.equals(i.getHardId(), v.getHardId())).findFirst().ifPresent(i -> { v.setTotalProfitPrice(i.getTotalPayPrice()); @@ -153,7 +153,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { DataScope refundDataScope = DataScope.of(); refundDataScope.setScopeDeptName("merchant_dept_id"); List refundList = hardOrderMapper.listCs(refundDto, refundDataScope); - // 盈利 + // 消费净次数 HardOrderDto profitDto = BeanUtil.toBean(dto, HardOrderDto.class); profitDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); DataScope profitDataScope = DataScope.of(); @@ -167,7 +167,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { v.setTotalRefundCount(i.getTotalPayCount()); }); } - // 盈利 + // 消费净次数 if (ObjectUtil.isNotEmpty(profitList)) { profitList.stream().filter(i -> ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> { v.setTotalProfitPrice(i.getTotalPayPrice()); @@ -222,7 +222,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { v.setTotalRefundCount(i.getTotalPayCount()); }); } - // 盈利 + // 消费净次数 if (ObjectUtil.isNotEmpty(profitList)) { profitList.stream().filter(i -> ObjectUtil.equals(i.getDay(), v.getDay()) && ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> { v.setTotalProfitPrice(i.getTotalPayPrice()); @@ -408,7 +408,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { } return hardOrderMapper.sumAndCount(refundDto); }); - // 查看盈利流水 + // 消费净次数 CompletableFuture> profitFuture = CompletableFuture.supplyAsync(() -> { HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto(); refundDto.setUserDeptIds(deptIds); diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/商户交易金额汇总.xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/商户交易金额汇总.xlsx index 831e78567..557541e5c 100644 Binary files a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/商户交易金额汇总.xlsx and b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/商户交易金额汇总.xlsx differ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx index 4509264c9..95ad4b2bd 100644 Binary files a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx and b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/支付方式交易汇总.xlsx differ diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx index 26441d9e0..923260b8f 100644 Binary files a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx and b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx differ