From 63ecbc48b33f6eee0f19037e694160af06e04aab Mon Sep 17 00:00:00 2001
From: zhaoxinyu <89237069@qq.com>
Date: Thu, 25 Jan 2024 10:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BQ/Syncs/MakeCanSettlementService.cs      | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs
index f2bd8ee8..d60c15c7 100644
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/MakeCanSettlementService.cs
@@ -288,7 +288,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                     }
                     _dbcontext.BulkUpdate(flaglist);//插入可结明细
                 }
-
                 var jis1 = p_list.Where(p => p.Site == "104T").ToList();
                 if (jis1.Count > 0)
                 {
@@ -333,7 +332,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                         entity.State = SettleBillState.未结状态;
                         entity.SettleBillNum = string.Empty;
                         entity.Site = "104T";
-                        
                         entity.BusinessType =(businesstype== "JisHBPO")?EnumBusinessType.JisHBPO:EnumBusinessType.MaiDanJianHBPO ;
                         billList.Add(entity);
                         notlist.AddRange(hbpo_not_list);
@@ -372,18 +370,15 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                             _dbcontext.BulkDelete(p_list);//删除不可结数据
                             _dbcontext.BulkInsert(billDetails);//插入可结明细
                             _dbcontext.BulkInsert(billList);//插入可结主表
-                       
-                            var flaglist = _dbcontext.Set<BBAC_NOT_SA_DETAIL>().Where(p => p.IsReturn == true).ToList();
-                            foreach (var flag in flaglist)
-                            {
-                                flag.IsReturn = false;
-                            }
-                            _dbcontext.BulkUpdate(flaglist);//插入可结明细
-
-                            transaction.Commit();
+                           
                         }
-                        
-                       
+                        var flaglist = _dbcontext.Set<BBAC_NOT_SA_DETAIL>().Where(p => p.IsReturn == true).ToList();
+                        foreach (var flag in flaglist)
+                        {
+                            flag.IsReturn = false;
+                        }
+                        _dbcontext.BulkUpdate(flaglist);//插入可结明细
+                        transaction.Commit();
                     }
                     catch (Exception)
                     {
@@ -394,9 +389,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                 }
                 if (issucess == true)
                 {
-
-
-
                     var result = from a in _dbcontext.Set<BBAC_SA_DETAIL>()
                                  join b in _dbcontext.Set<BBAC_CAN_SA_DETAIL>() on new { a.KeyCode, a.BusinessType } equals new { b.KeyCode, b.BusinessType }
                                  where a.Price == 0
@@ -413,13 +405,6 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Syncs
                     _dbcontext.BulkUpdate(salist);//更新结算数据
                 }
             }
-
-
-
-
-
-
-
             return id.ToString();
 
         }