fix:消费净流水

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<Long> mchIds;
 
+    /**
+     * 退款成功
+     */
+    private Boolean isRefundSuccess;
+
 }

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<List<HardOrderSumAndCountVo>> profitFuture = CompletableFuture.supplyAsync(() -> {
             HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto();
             refundDto.setUserDeptIds(deptIds);
-            refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+            refundDto.setIsRefundSuccess(true);
+            List<String> paySuccessCodes = HardOrderStatusEnum.getPaySuccessCodes();
+            paySuccessCodes.add(HardOrderStatusEnum.REFUND.getType());
+            refundDto.setOrderStatusCodes(paySuccessCodes);
             if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) {
                 refundDto.setCreateTimeList(dto.getCreateTimeList());
             }

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml

@@ -314,7 +314,8 @@
         from hard_order a
         <where>
             a.del_flag = 0
-            <if test="dto.walletTypeId != null">
+            <if test="dto.isRefundSuccess != null and dto.isRefundSuccess == true ">
+                and (a.refund_status is null or a.refund_status not in ('20'))
             </if>
             <if test="dto.orderStatusCodes != null and dto.orderStatusCodes.size() != 0">
                 and a.order_status in