feat:商户统计没有流水只有退款的bug

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java

@@ -165,7 +165,21 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
         refundDto.setRefundStatusCodes(List.of(HardSaleStatusEnum.COMPLETE.getStatus()));
         DataScope refundDataScope = DataScope.of();
         refundDataScope.setScopeDeptName("merchant_dept_id");
+
         List<HardOrderCsVo> refundList = hardOrderMapper.listRefundCs(refundDto, refundDataScope);
+        // 有退款没有流水的情况
+        if (ObjectUtil.isAllNotEmpty(totalList, refundList)) {
+            for (HardOrderCsVo refund : refundList) {
+                for (HardOrderCsVo total : totalList) {
+                    if (ObjectUtil.equals(refund.getMerchantId(), total.getMerchantId())) {
+                        HardOrderCsVo entity = BeanUtils.toBean(refund, HardOrderCsVo.class);
+                        entity.setTotalPayPrice(BigDecimal.ZERO);
+                        entity.setTotalPayCount(BigDecimal.ZERO);
+                        totalList.add(entity);
+                    }
+                }
+            }
+        }
         for (HardOrderCsVo v : totalList) {
             // 退款
             if (ObjectUtil.isNotEmpty(refundList)) {