From 03a475d1c90c44de0e76a582cde1c8f5ca955bce Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Tue, 4 Nov 2025 11:42:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8B=E5=8A=A1=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E4=BF=AE=E5=A4=8D=E6=8E=89=E7=BA=BF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=87=8D=E5=A4=8D=E6=B6=88=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/small/client/dao/SxDataDao.java  | 37 +++++++------------
 .../client/service/imp/SxDataServiceImp.java  |  2 +-
 2 files changed, 15 insertions(+), 24 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 2a7a6e3d..2eab7769 100644
--- a/client/src/main/java/com/small/client/dao/SxDataDao.java
+++ b/client/src/main/java/com/small/client/dao/SxDataDao.java
@@ -550,7 +550,7 @@ public class SxDataDao extends BaseDao{
                 int[] remainingCounts = ps.executeBatch();
 
                 //todo 新增流水
-                updateStoreSaleFlow(dataBaseInfo,rmSaleflowList,tRmPayflowList);
+                updateStoreSaleFlow(conn,rmSaleflowList,tRmPayflowList);
 
                 List<String> consumIds=productQuantityConsumptionDtoList
                         .stream()
@@ -566,7 +566,7 @@ public class SxDataDao extends BaseDao{
                 if (!HttpUtils.SUCCESSCODE.equals(code)) {
                     throw new Exception("服务器异常");
                 }
-                log.info("剩余批次更新数: {}", Arrays.toString(remainingCounts));
+                log.info("库存更新剩余批次更新数: {}", Arrays.toString(remainingCounts));
                 conn.commit(); // 最终提交事务
                 log.info("批量更新完成，总记录数: {}" , count);
                 //baseUpdateImBrancStock(dataBaseInfo);
@@ -754,18 +754,18 @@ public class SxDataDao extends BaseDao{
 
     /**
      * 批量新增销售流水
-     * @param dataBaseInfo
+     * @param conn
      * @param rmSaleflowList
      */
-    public void updateStoreSaleFlow(DataBaseInfo dataBaseInfo,List<RmSaleflow> rmSaleflowList,List<TRmPayflow> payflowList){
+    public void updateStoreSaleFlow(Connection conn,List<RmSaleflow> rmSaleflowList,List<TRmPayflow> payflowList){
         if(CollectionUtil.isEmpty(rmSaleflowList)){
             log.info("销售流水记录为空");
             return;
         }
-        Connection conn =getConnection(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),
-                dataBaseInfo.getPassword(), dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName());
-        try {
-            conn.setAutoCommit(false); // 关闭自动提交，开启事务
+//        Connection conn =getConnection(dataBaseInfo.getIp(),dataBaseInfo.getUserName(),
+//                dataBaseInfo.getPassword(), dataBaseInfo.getDbPort(),dataBaseInfo.getDataBaseName());
+       //try {
+            //conn.setAutoCommit(false); // 关闭自动提交，开启事务
             String sql = "INSERT INTO t_rm_saleflow (" +
                     "flow_id, flow_no, branch_no, item_no, source_price, sale_price, " +
                     "sale_qnty, sale_money, sell_way, oper_id, sale_man, counter_no, " +
@@ -892,27 +892,18 @@ public class SxDataDao extends BaseDao{
                 int[] remainingCounts2 = ps2.executeBatch();
                 log.info("销售流水记录剩余批次更新数: {}", Arrays.toString(remainingCounts));
                 log.info("支付流水记录剩余批次更新数: {}", Arrays.toString(remainingCounts2));
-                conn.commit(); // 最终提交事务
+                //conn.commit(); // 最终提交事务
                 log.info("销售-支付-流水记录批量更新完成，总记录数: {}" , count);
                 //baseUpdateImBrancStock(dataBaseInfo);
             } catch (Exception e) {
-                conn.rollback(); // 出错时回滚整个事务
+               // conn.rollback(); // 出错时回滚整个事务
                 log.info("销售支付流水记录业务失败：: {}", e.getMessage());
                 throw new RuntimeException("销售支付流水记录业务失败：: {}"+e.getMessage());
             }
-        } catch (SQLException e) {
-            log.info("sql失败：: {}", e.getMessage());
-            throw new RuntimeException("sql失败：: {}"+e.getMessage());
-        }finally {
-            if(conn!=null){
-                try {
-                    conn.close();
-                } catch (SQLException e) {
-                    log.info("最后sql失败：: {}", e.getMessage());
-                    throw new RuntimeException("sql关闭失败：: {}"+e.getMessage());
-                }
-            }
-        }
+//        } catch (SQLException e) {
+//            log.info("sql失败：: {}", e.getMessage());
+//            throw new RuntimeException("sql失败：: {}"+e.getMessage());
+//        }
     }
 
     /**
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 5a0c1735..5189b4f9 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
@@ -397,7 +397,7 @@ public class SxDataServiceImp extends SxDataAbstService implements SxDataService
                         +"&syncType="+DicEnum.MUAL_1.getCode()
                         +"&refreshDateStr="+refreshDate,
                         JSONUtil.parseArray(folders));
-        log.info("商品分类总共有{}条数据,同步完成{}条",total,syncCount);
+        log.info("商品总共有{}条数据,同步完成{}条",total,syncCount);
         String code= HttpUtils.postData(restTemplate,remoteIp+HttpUtils.URL_SYNC_GOODS_READ
                     +"?appKey="+commentModel.getAppKey()
                     +"&sign="+commentModel.getAppId()