From 62239d4decec1cc944816f1c5b194a3061267b3c Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Fri, 28 Nov 2025 11:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=80=9D=E8=BF=85=E6=80=BB=E9=A2=9D=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/small/client/dao/SxDataDao.java  |  6 +++++-
 .../com/small/client/service/imp/SxDataServiceImp.java | 10 +++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/src/main/java/com/small/client/dao/SxDataDao.java b/client/src/main/java/com/small/client/dao/SxDataDao.java
index 67727c77..f7ba6a94 100644
--- a/client/src/main/java/com/small/client/dao/SxDataDao.java
+++ b/client/src/main/java/com/small/client/dao/SxDataDao.java
@@ -625,7 +625,11 @@ public class SxDataDao extends BaseDao{
         rmSaleflow.setItemNo(itemNo);
         rmSaleflow.setSalePrice(unitPrice);
         rmSaleflow.setSaleQnty(stock_qty);
-        rmSaleflow.setSaleMoney(productQuantityConsumptionDto.getSaleAmount());
+        BigDecimal saleMoney = unitPrice.multiply(stock_qty).setScale(2, RoundingMode.HALF_UP);
+        if(saleMoney.compareTo(BigDecimal.ZERO)<0){
+            saleMoney=saleMoney.multiply(new BigDecimal(-1));
+        }
+        rmSaleflow.setSaleMoney(saleMoney);
         // rmSaleflow.setSourcePrice(unitPrice);
         rmSaleflow.setFlownoRand(productQuantityConsumptionDto.getOrderId());//随机子单号 设置网上订单号
         if(null!=productQuantityConsumptionDto.getSaleTime()){
diff --git a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java
index 361f22f9..fefa2910 100644
--- a/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java
+++ b/client/src/main/java/com/small/client/service/imp/SxDataServiceImp.java
@@ -815,7 +815,15 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
                 Map<String,ProductQuantityConsumptionDto> productQuantityConsumptionDtoMap=new HashMap<>();
 
                 productQuantityConsumptionDtoList.forEach(productQuantityConsumptionDto -> {
-                    productQuantityConsumptionDtoMap.put(productQuantityConsumptionDto.getOrderId()+"-"+productQuantityConsumptionDto.getProductNumber(),productQuantityConsumptionDto);
+                    String key=productQuantityConsumptionDto.getOrderId()+"-"+productQuantityConsumptionDto.getProductNumber();
+                    if(null!=productQuantityConsumptionDtoMap.get(key)){
+                        ProductQuantityConsumptionDto oldProductQuantityConsumptionDto=productQuantityConsumptionDtoMap.get(key);
+                        if(productQuantityConsumptionDto.getSaleTime()<oldProductQuantityConsumptionDto.getSaleTime()){
+                            productQuantityConsumptionDtoMap.put(key,productQuantityConsumptionDto);
+                        }
+                    }else {
+                        productQuantityConsumptionDtoMap.put(key,productQuantityConsumptionDto);
+                    }
                 });
                 sxDataDao.updateStoreData(dataBaseInfo,map,productQuantityConsumptionDtoMap,productQuantityConsumptionDtoList,commentModel);
             }else {