From 22976afc564c4b5b911026c6540ad48db43e2166 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 14 八月 2025 10:07:11 +0800
Subject: [PATCH] 新增结算接口
---
service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java | 2 ++
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java | 10 ++++++++++
service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml | 4 ++++
3 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java b/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java
index c2ed53c..526b6c7 100644
--- a/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java
+++ b/service/src/main/java/com/ruoyi/cwgl/mapper/PendingSettlementBusinessMapper.java
@@ -101,4 +101,6 @@
int updatePendingSettlementBusinessIsCreate(@Param("list") List<String> list,@Param("id")Integer id,@Param("billName")String billName);
List<String> selectCustomName();
+
+ List<String> selectPendingSettlementBusinessDispatchNos(Integer id);
}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
index b220a9a..516d3e3 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableBillServiceImpl.java
@@ -8,6 +8,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.cwgl.domain.EstimatedReceivableBillLog;
+import com.ruoyi.cwgl.domain.PendingSettlementBusiness;
+import com.ruoyi.cwgl.mapper.EstimatedReceivableMapper;
+import com.ruoyi.cwgl.mapper.PendingSettlementBusinessMapper;
import com.ruoyi.cwgl.service.IEstimatedReceivableBillLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +44,10 @@
private EstimatedReceivableBillMapper estimatedReceivableBillMapper;
@Autowired
private IEstimatedReceivableBillLogService logService;
+ @Resource
+ private PendingSettlementBusinessMapper pendingSettlementBusinessMapper;
+ @Resource
+ private EstimatedReceivableMapper estimatedReceivableMapper;
/**
@@ -207,12 +214,15 @@
estimatedReceivableBillLog.setOperation("鏈鎻愪氦閲戦"+ settlementAmount);
logService.insertEstimatedReceivableBillLog(estimatedReceivableBillLog);
settledAmount = settledAmount+settlementAmount;
+ List<String>dispatchNos =pendingSettlementBusinessMapper.selectPendingSettlementBusinessDispatchNos(estimatedReceivableBill.getId());
if (settledAmount>totalAmount){
//宸茬粨绠楀ぇ浜庡簲璁＄畻閲戦涓哄凡缁撶畻
estimatedReceivableBill.setStatus(2);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,3);
}else {
//鍚﹀垯閮ㄥ垎缁撶畻
estimatedReceivableBill.setStatus(1);
+ estimatedReceivableMapper.updateEstimatedReceivableBillStatus(dispatchNos,2);
}
return estimatedReceivableBillMapper.updateEstimatedReceivableBill(estimatedReceivableBill);
}
diff --git a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
index 704608f..6a690e7 100644
--- a/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
+++ b/service/src/main/resources/mapper/cwgl/PendingSettlementBusinessMapper.xml
@@ -274,6 +274,10 @@
SELECT customer_name from pending_settlement_business group by customer_name
</select>
+ <select id="selectPendingSettlementBusinessDispatchNos" resultType="java.lang.String">
+ SELECT dispatch_no from pending_settlement_business where bill_id = #{id}
+
+ </select>
<!-- 鏂板 -->
<insert id="insertPendingSettlementBusiness" parameterType="com.ruoyi.cwgl.domain.PendingSettlementBusiness" useGeneratedKeys="true" keyProperty="id">
--
Gitblit v1.8.0