From babfb0032090ec99403ed1410b42aa17b78486c3 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 22 十二月 2025 10:10:37 +0800
Subject: [PATCH] 修改生成账单
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 44 ++++++++++++++++++--------------------------
service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableFeeStatisticsVo.java | 5 +++++
service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java | 6 +++---
3 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
index 5e37019..4af3ce9 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
@@ -17,8 +17,8 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.cwgl.domain.ReceivableFeeManagement;
-import com.ruoyi.cwgl.service.IReceivableFeeManagementService;
import com.ruoyi.cwgl.domain.vo.ReceivableBillCreateVo;
+import com.ruoyi.cwgl.service.IReceivableFeeManagementService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -126,7 +126,7 @@
@PostMapping("/createBill")
public AjaxResult createBill(@RequestBody ReceivableBillCreateVo billCreateVo)
{
- Integer billId = receivableFeeManagementService.createReceivableBill(billCreateVo);
- return AjaxResult.success(billId);
+
+ return toAjax(receivableFeeManagementService.createReceivableBill(billCreateVo));
}
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableFeeStatisticsVo.java b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableFeeStatisticsVo.java
index f7c68b6..5c01320 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableFeeStatisticsVo.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/vo/ReceivableFeeStatisticsVo.java
@@ -41,4 +41,9 @@
* 鏄庣粏鍒楄〃
*/
private List<ReceivableFeeDetail> detailList;
+
+ /**
+ * 搴旀敹璐圭敤涓昏〃id闆嗗悎
+ */
+ private Integer[] ids;
}
\ No newline at end of file
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
index 866fc93..a2622ca 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
@@ -2,6 +2,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.util.ArrayList;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
@@ -263,6 +264,7 @@
result.setTotalAmountRmb(totalReceivableAmount);
result.setTotalAmountHkd(totalAmountHkd);
result.setDetailList(detailList);
+ result.setIds(ids);
return result;
}
@@ -300,36 +302,26 @@
}
// 4. 淇濆瓨涓昏处鍗曡褰�
- receivableBillManagementService.insertReceivableBillManagement(billManagement);
- Integer billId = billManagement.getId();
+ int i = receivableBillManagementService.insertReceivableBillManagement(billManagement);
- // 5. 鍒涘缓搴旀敹璐﹀崟缁撶畻鏄庣粏
- List<ReceivableBillSettlementDetail> detailList = new java.util.ArrayList<>();
- for (ReceivableFeeDetail feeDetail : statisticsVo.getDetailList()) {
- ReceivableBillSettlementDetail settlementDetail = new ReceivableBillSettlementDetail();
- settlementDetail.setBillId(billId);
+ // 5. 鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
+ if (statisticsVo.getIds() != null && statisticsVo.getIds().length > 0) {
+ // 鑾峰彇鐢熸垚鐨勮处鍗曠郴缁熺紪鍙�
+ String billSystemNo = billManagement.getSystemNo();
- // 鏍规嵁璐﹀崟绫诲瀷璁剧疆鏄庣粏閲戦
- if (billType == 0) {
- // 浜烘皯甯佽处鍗曚娇鐢ㄥ師閲戦
- settlementDetail.setReceiptAmount(feeDetail.getBillingAmount());
- } else {
- // 娓竵璐﹀崟杞崲閲戦
- settlementDetail.setReceiptAmount(feeDetail.getBillingAmount().divide(statisticsVo.getRate(), 2, RoundingMode.HALF_UP));
+ // 鎵归噺鏇存柊搴旀敹璐圭敤涓昏〃鐨勫叧鑱旇处鍗曠紪鍙�
+ List<ReceivableFeeManagement> feeManagements = new ArrayList<>();
+ for (Integer feeId : statisticsVo.getIds()) {
+ ReceivableFeeManagement feeManagement = new ReceivableFeeManagement();
+ feeManagement.setId(feeId);
+ feeManagement.setRelatedBillNo(billSystemNo);
+ feeManagements.add(feeManagement);
}
- // 璁剧疆鍏朵粬鏄庣粏淇℃伅
- settlementDetail.setSettlementMethod("0"); // 榛樿涓虹┖锛屽悗缁彲浠ユ洿鏂�
- settlementDetail.setCreateTime(DateUtils.getNowDate());
-
- detailList.add(settlementDetail);
+ // 璋冪敤鎵归噺鏇存柊鏂规硶
+ updateReceivableFeeManagementBatch(feeManagements);
}
- // 6. 鎵归噺淇濆瓨鏄庣粏璁板綍
- if (!detailList.isEmpty()) {
- receivableBillSettlementDetailService.insertReceivableBillSettlementDetailBatch(detailList);
- }
-
- return billId;
+ return i;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0