From dae6a480c7cced19733a53b9c3a182f36d9412a6 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 24 四月 2026 15:25:34 +0800
Subject: [PATCH] fix(sales): 修复销售台账合同金额设置逻辑

---
 src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java    |    2 +-
 src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index cb37002..30a0386 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -185,7 +185,7 @@
         salesLedgerService.exportProcessContract(id);
     }
 
-    @GetMapping("/importSalsesLedger")
+    @PostMapping("/importSalsesLedger")
     @ApiOperation("闃冲厜瀵煎叆閿�鍞彴璐︽柊")
     public AjaxResult importSalsesLedger( MultipartFile file) {
         return salesLedgerService.importSalsesLedger(file);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 5d27bf2..fb94028 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -608,7 +608,7 @@
                     }
                     lastDate = date;
                     salesLedger.setEntryDate(date);
-                    salesLedger.setContractAmount(importDto.getAmount());
+
                     salesLedger.setEntryPerson(loginUser.getUserId().toString());
                     salesLedger.setTenantId(matchedCustomer.getTenantId());
                     salesLedgerMapper.insert(salesLedger);
@@ -644,6 +644,8 @@
                         Long productModelId = productModelService.productModelAnticlockwise(productModelAnticlockwiseDto);
                         product.setProductModelId(productModelId);
                     }
+                    salesLedger.setContractAmount(product.getTaxInclusiveTotalPrice());
+                    salesLedgerMapper.updateById(salesLedger);
 
                     salesLedgerProductMapper.insert(product);
                     salesLedgerProductServiceImpl.addProductionData(product);

--
Gitblit v1.9.3