feature 返回缴费记录ID

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwBillingRecordServiceImpl.java

@@ -76,6 +76,7 @@ public class SwBillingRecordServiceImpl extends ServiceImpl<SwBillingRecordDao,
     @Override
     @Transactional
     public R windowPayment(PaymentRequestDTO paymentRequestDTO)  {
+        String billRecordId="";
         try {
             log.info("窗口缴费开始");
             if (paymentRequestDTO.getIds() != null && !paymentRequestDTO.getIds().isEmpty()) {
@@ -84,12 +85,12 @@ public class SwBillingRecordServiceImpl extends ServiceImpl<SwBillingRecordDao,
                 List<SwBillManagementUnpaidDo> unpaidBills = queryUnpaidBills(paymentRequestDTO.getIds());
 
                 //生成缴费记录
-                addNewBillRecord(paymentRequestDTO, unpaidBills);
+                billRecordId=  addNewBillRecord(paymentRequestDTO, unpaidBills);
 
             } else {
 
                 //生成缴费记录
-                addNewBillRecord(paymentRequestDTO, new ArrayList<>());
+                billRecordId=  addNewBillRecord(paymentRequestDTO, new ArrayList<>());
             }
 
             log.info("窗口缴费结束");
@@ -99,7 +100,7 @@ public class SwBillingRecordServiceImpl extends ServiceImpl<SwBillingRecordDao,
             return R.error("窗口缴费失败");
         }
 
-        return R.ok();
+        return R.ok(billRecordId);
     }
 
     /**
@@ -170,8 +171,9 @@ public class SwBillingRecordServiceImpl extends ServiceImpl<SwBillingRecordDao,
     /**
      * 生成新的缴费账单
      *
+     * @return
      */
-    private void addNewBillRecord(PaymentRequestDTO paymentRequestDTO, List<SwBillManagementUnpaidDo> list)
+    private String addNewBillRecord(PaymentRequestDTO paymentRequestDTO, List<SwBillManagementUnpaidDo> list)
     {
 
         SysUserVo currentUser = ZHSWCommonUtils.getCurrentUser();
@@ -203,7 +205,7 @@ public class SwBillingRecordServiceImpl extends ServiceImpl<SwBillingRecordDao,
         // 保存处理结果
         saveProcessedData(billingRecordDo, user, bills, paymentRequestDTO.getIds());
 
-
+        return billingRecordDo.getId();
     }
 
     /**