From 3642bd3728480cb7549d6f47d85e6a12bf88d151 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Mon, 8 May 2023 20:23:53 +0800
Subject: [PATCH] 1

---
 .../ViewModels/PackTask/PackServiceViewModel.cs      |  9 +--------
 .../ViewModels/PackTask/PackTaskTotalViewModel.cs    |  1 -
 .../Controllers/BatchPurchaseController.cs           | 12 +-----------
 BBWY.Server.API/Startup.cs                           |  3 +--
 BBWY.Server.Business/FreeSqlMultiDBManager.cs        |  2 +-
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
index 7ea3e58c..50dd1e93 100644
--- a/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackServiceViewModel.cs
@@ -247,7 +247,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
                     LoadList.AddRange(IncreateList);
                     LoadList.AddRange(PackList);
-                    Discount = res.Data.Discount.ToString();
+                    Discount =res.Data.Discount.ToString();
                 }
 
             });
@@ -538,7 +538,6 @@ namespace BBWY.Client.ViewModels.PackTask
             uploadService.PackFees = Convert.ToDecimal((PackFees).ToString("0.00"));
             uploadService.ConsumableFees = Convert.ToDecimal((ConsumableFees).ToString("0.00"));
             uploadService.DiscountPrice = Convert.ToDecimal((AllFees * upDisCount).ToString("0.00"));
-
             var res = packDetailService.UploadService(uploadService);
             if (res != null && res.Success)
             {
@@ -550,15 +549,9 @@ namespace BBWY.Client.ViewModels.PackTask
                 feesItem.DisCount = upDisCount;
                 if (SetAllFees != null)
                     SetAllFees(feesItem, packUsers);
-                if (!string.IsNullOrEmpty( OrderId))
-
-                    batchPurchaseService.UpdatePackMoney(OrderId, uploadService.DiscountPrice.Value);
-
                 win.Close();
             }
-
         }
-        
         /// <summary>
         /// 更新 打包员 和费用数据
         /// </summary>
diff --git a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
index b45ff5b6..6b5c21b7 100644
--- a/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
+++ b/BBWY.Client/ViewModels/PackTask/PackTaskTotalViewModel.cs
@@ -78,7 +78,6 @@ namespace BBWY.Client.ViewModels.PackTask
         {
             this.packTaskService = packTaskService;
 
-
             SearchTaskTotalCommand = new RelayCommand(SearchTaskTotal);
 
 
diff --git a/BBWY.Server.API/Controllers/BatchPurchaseController.cs b/BBWY.Server.API/Controllers/BatchPurchaseController.cs
index 215e8b06..a1414b55 100644
--- a/BBWY.Server.API/Controllers/BatchPurchaseController.cs
+++ b/BBWY.Server.API/Controllers/BatchPurchaseController.cs
@@ -80,17 +80,7 @@ namespace BBWY.Server.API.Controllers
         {
             return batchPurchaseBusiness.CancelPurchaseOrder(request);
         }
-        /// <summary>
-        /// 修改打包金额
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public UpdatePackStateResponse UpdatePackMoney([FromBody] UpdatePackMoneyRequest request)
-        {
-            return batchPurchaseBusiness.UpdatePackMoney(request);
-        }
-
+  
         /// <summary>
         /// 修改采购单状态
         /// </summary>
diff --git a/BBWY.Server.API/Startup.cs b/BBWY.Server.API/Startup.cs
index 6199fcac..d136e508 100644
--- a/BBWY.Server.API/Startup.cs
+++ b/BBWY.Server.API/Startup.cs
@@ -46,14 +46,13 @@ namespace BBWY.Server.API
 
             var fsql2 = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("MDSDB")).Build();
             var fsql3 = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("JDXX")).Build();
-            var fsql4 = new FreeSql.FreeSqlBuilder().UseConnectionString(FreeSql.DataType.MySql, Configuration.GetConnectionString("QK")).Build();
+           
 
             services.AddSingleton(new FreeSqlMultiDBManager()
             {
                 BBWYfsql = fsql,
                 MDSfsql = fsql2,
                 JDXXfsql = fsql3,
-                QKfsql = fsql4
             });
             services.AddSingleton<NLogManager>();
             services.AddSingleton(typeof(NLog.ILogger), NLog.LogManager.GetCurrentClassLogger());
diff --git a/BBWY.Server.Business/FreeSqlMultiDBManager.cs b/BBWY.Server.Business/FreeSqlMultiDBManager.cs
index badde61f..d5e96c88 100644
--- a/BBWY.Server.Business/FreeSqlMultiDBManager.cs
+++ b/BBWY.Server.Business/FreeSqlMultiDBManager.cs
@@ -11,6 +11,6 @@ namespace BBWY.Server.Business
 
         public IFreeSql JDXXfsql { get; set; }
 
-        public IFreeSql QKfsql { get; set; }
+       
     }
 }