Merge branch 'feature/bind_flow_relate_left_trans' into 'master'

feat:流水列表增加可退余额

See merge request !4

service/src/main/java/com/jiejing/fitness/finance/service/cashier/convert/CashierConvert.java

@@ -71,7 +71,8 @@ public class CashierConvert {
     return result;
   }
 
-  public static PageVO<StudioCashierRecordVO> convertPageVO(Page<StudioCashierRecord> page) {
+  public static PageVO<StudioCashierRecordVO> convertPageVO(Page<StudioCashierRecord> page,
+      List<StudioCashierRecordVO> list) {
     return PageVO.convert(page, convertList(page.getContent()));
   }
 

service/src/main/java/com/jiejing/fitness/finance/service/cashier/impl/StudioCashierServiceImpl.java

@@ -127,7 +127,13 @@ public class StudioCashierServiceImpl implements StudioCashierService {
     PageBrandCashierRecordQuery query = JSON.parseObject(JSON.toJSONString(params),
         PageBrandCashierRecordQuery.class);
     Page<StudioCashierRecord> page = studioCashierRecordRpService.page(query);
-    return CashierConvert.convertPageVO(page);
+    List<String> payNos = page.getContent().stream()
+        .filter(e -> BrandCashierTransTypeEnum.PAY.getCode().equals(e.getTransType()))
+        .map(StudioCashierRecord::getTransNo)
+        .collect(Collectors.toList());
+    Map<String, List<StudioCashierRecord>> payNoRefundMap = studioCashierRecordRpService.mapByRelatedTransNos(
+        payNos);
+    return PageVO.convert(page, CashierConvert.convertList(page.getContent(), payNoRefundMap));
   }
 
   @Override