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 ea6f14236..678ae5f95 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 @@ -19,6 +19,8 @@ public class HardOrderSumAndCountDto { private LocalDateTime[] createTimeList; + private LocalDateTime[] refundTimeList; + private Long walletTypeId; private List mchIds; 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 dc63dd2d7..016a0ee26 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 @@ -397,7 +397,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { refundDto.setUserDeptIds(deptIds); refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPayErrorCodes()); if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { - refundDto.setCreateTimeList(dto.getCreateTimeList()); + refundDto.setRefundTimeList(dto.getCreateTimeList()); } if (ObjectUtil.isNotEmpty(dto.getWalletTypeId())) { refundDto.setWalletTypeId(dto.getWalletTypeId()); 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 c4e7db046..330836035 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 @@ -368,6 +368,9 @@ and a.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]} + + and r.audit_time between #{dto.refundTimeList[0]} and #{dto.refundTimeList[1]} + and a.merchant_id in