运费 商品品名 款号 更新 修复bug

代码/System.Common/Filter/ActionFilter.cs

             bool islog = false;
             try
             {
-                if (!context.Result.ToJson().Contains("{\"state\":\"success\""))
-                    if (request.Method == "GET")
-                    {
-                        islog = request.Query.ContainsKey("log");
-                    }
-                    else
-                    {
+
+                if (request.Method == "GET")
+                {
+                    islog = request.Query.ContainsKey("log");
+                }
+                else
+                {
+                    if (!context.Result.ToJson().Contains("{\\\"state\\\":\\\"success\\\""))
                         islog = request.Form.ContainsKey("log");
-                    }
+                }
 
 
             }

代码/System.Model/T_Bus_Product.cs

 		#region Model
 		private string _f_productid;
 		private string _f_productnumber="";
+		private string _f_productnumbername = "";
 		private string _f_productname;
 		private string _f_productshortname="";
 		private string _f_classname="";
 			get { return _f_productid; }
 		}
 		/// <summary>
-		/// 产品条形码
+		/// 款号
 		/// </summary>
 		public string F_ProductNumber
 		{
 			get { return _f_productnumber; }
 		}
 		/// <summary>
+		/// 款号名称/品名
+		/// </summary>
+		public string F_ProductNumberName
+		{
+			set { _f_productnumbername = value; }
+			get { return _f_productnumbername; }
+		}
+		/// <summary>
 		/// 产品名称
 		/// </summary>
 		public string F_ProductName

代码/TVShoppingCallCenter_ZLJ/Controllers/Order/OrderMergeController.cs

                             if (modelOrderMerge.F_Money != 0)
                             {
                                 if (n == modelorderlist.Count - 1)
-                                { m.F_MergeMoney = totle - totle2; }
-                                else { m.F_MergeMoney = modelOrderMerge.F_Money * m.F_ShouldPrice / totle;
+                                { 
+                                    m.F_MergeMoney = totle - totle2;
+                                }
+                                else
+                                {
+                                    m.F_MergeMoney = Math.Round( modelOrderMerge.F_Money * m.F_ShouldPrice / totle,2);
                                     totle2 += m.F_MergeMoney;
                                 }
                                 // modelOrderMerge.F_Money *m.F_ShouldPrice/totle
                         {
                             if (await orderController.ChangeStock(setStockModel, modeStocklogs))
                             {
-
+                                //处理库存
                             }
                         }
+                       await bus_OrderRepository.UpdateList(modelorderlist);
                     }
 
                 }

代码/TVShoppingCallCenter_ZLJ/Controllers/Product/ProductController.cs

             {
                 return Error("名称/简称 有重复");
             }
-            if (string.IsNullOrEmpty(input.Tag))
+            if (!string.IsNullOrEmpty(input.Tag))
             {
                 int arrynum = input.Tag.Length- input.Tag.Replace(".","").Length;
                 if (arrynum > 1)

代码/TVShoppingCallCenter_ZLJ/Models/Inputs/ProductInput.cs

         #region Model
         private string _f_productid;
         private string _f_productnumber;
+        private string _f_productnumbername;
         private string _f_productname;
         private string _f_productshortname;
         private string _f_classname;
         }
 
         /// <summary>
-        /// 产品条形码
+        /// 款号
         /// </summary>
         public string ProductNumber
         {
             get { return _f_productnumber; }
         }
         /// <summary>
+        /// 款号名称/品名
+        /// </summary>
+        public string ProductNumberName
+        {
+            set { _f_productnumbername = value; }
+            get { return _f_productnumbername; }
+        }
+        
+        /// <summary>
         /// 产品名称
         /// </summary>
         public string ProductName

代码/TVShoppingCallCenter_ZLJ/appsettings.json

     "stock1": "WLZZ0001"
   },
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=TVCallCenter_ZLJ;"
+    "DefaultConnection": "Data Source=192.168.8.3;User ID=sa;pwd=800100;Initial Catalog=TVCallCenter_ZLJ,MultipleActiveResultSets=true;"
   },
   "Jwt": {
     "Issuer": "HnjySignToken",