收费出入库明细区分收费与退费

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java

@@ -131,10 +131,10 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
         if (baseResponse.getCode() == 20000) {
             List<ThrInvResultResponse> list = baseResponse.getData().getList();
             if (CollectionUtil.isNotEmpty(list)) {
-
                 Map<String, List<ThrInvResultResponse>> groupedByInv = list.stream()
-                        .collect(Collectors.groupingBy(ThrInvResultResponse::getInvCode));
-
+                        .collect(Collectors.groupingBy(
+                                item -> item.getInvCode() + "-" + item.getBillType()
+                        ));
                 groupedByInv.forEach((invCode, invResultResponses) -> {
                     String billNo = generateBillNo(filterInvProductRequest);//单据号
                     //处理 返回实体 转换成 单据 和 单据明细