diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java index 778a1fa9c..ea6f14236 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java @@ -23,4 +23,9 @@ public class HardOrderSumAndCountDto { private List mchIds; + /** + * 退款成功 + */ + private Boolean isRefundSuccess; + } 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 a4ce93a99..007597cfd 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 @@ -408,7 +408,10 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { CompletableFuture> profitFuture = CompletableFuture.supplyAsync(() -> { HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto(); refundDto.setUserDeptIds(deptIds); - refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); + refundDto.setIsRefundSuccess(true); + List paySuccessCodes = HardOrderStatusEnum.getPaySuccessCodes(); + paySuccessCodes.add(HardOrderStatusEnum.REFUND.getType()); + refundDto.setOrderStatusCodes(paySuccessCodes); if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { refundDto.setCreateTimeList(dto.getCreateTimeList()); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index b741c4e5d..c4e7db046 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -314,7 +314,8 @@ from hard_order a a.del_flag = 0 - + + and (a.refund_status is null or a.refund_status not in ('20')) and a.order_status in