提交订单活动的计算

代码/System.Model/T_Bus_Order.cs

@@ -25,9 +25,10 @@ namespace System.Model
 		private string _f_customerphone = "";
 		private int _f_vipid;
 		private decimal _f_score = 0.00M;
+		private decimal _f_usescore = 0.00M;
 		private int _f_state = 0;
 		private int _f_status = 0;
-		private DateTime _f_addtime = DateTime.Now;
+		private DateTime _f_addtime=DateTime.Now;
 		private DateTime? _f_submittime;
 		private DateTime? _f_checktime;
 		private DateTime? _f_stocktime;
@@ -38,18 +39,18 @@ namespace System.Model
 		private string _f_addusername;
 		private int _f_belong;
 		private string _f_belongname;
-		private decimal? _f_totleprice;
+		private decimal _f_totleprice;
 		private string _f_useactivity = "";
-		private decimal? _f_shouldprice;
-		private decimal? _f_realprice;
+		private string _f_useactivitydes = "";
+		private decimal _f_activitymoney;
+		private decimal _f_shouldprice;
+		private decimal _f_realprice;
 		private string _f_paytype = "";
 		private string _f_stock = "";
 		private string _f_express = "";
 		private string _f_remark = "";
 		private string _f_adfrom = "";
 		private string _f_type = "";
-
-
 		/// <summary>
 		/// 订单编号 BJ员工工号+T+时间
 		/// </summary>
@@ -171,6 +172,14 @@ namespace System.Model
 			get { return _f_score; }
 		}
 		/// <summary>
+		/// 使用积分
+		/// </summary>
+		public decimal F_UseScore
+		{
+			set { _f_usescore = value; }
+			get { return _f_usescore; }
+		}
+		/// <summary>
 		/// 订单状态 -1无效 0暂存 其他待定
 		/// </summary>
 		public int F_State
@@ -277,7 +286,7 @@ namespace System.Model
 		/// <summary>
 		/// 订单总额
 		/// </summary>
-		public decimal? F_TotlePrice
+		public decimal F_TotlePrice
 		{
 			set { _f_totleprice = value; }
 			get { return _f_totleprice; }
@@ -291,9 +300,25 @@ namespace System.Model
 			get { return _f_useactivity; }
 		}
 		/// <summary>
+		/// 使用活动描述
+		/// </summary>
+		public string F_UseActivityDes
+		{
+			set { _f_useactivitydes = value; }
+			get { return _f_useactivitydes; }
+		}
+		/// <summary>
+		/// 活动优惠金额    一般指满减
+		/// </summary>
+		public decimal F_ActivityMoney
+		{
+			set { _f_activitymoney = value; }
+			get { return _f_activitymoney; }
+		}
+		/// <summary>
 		/// 应收金额 交易金额
 		/// </summary>
-		public decimal? F_ShouldPrice
+		public decimal F_ShouldPrice
 		{
 			set { _f_shouldprice = value; }
 			get { return _f_shouldprice; }
@@ -301,7 +326,7 @@ namespace System.Model
 		/// <summary>
 		/// 实收金额
 		/// </summary>
-		public decimal? F_RealPrice
+		public decimal F_RealPrice
 		{
 			set { _f_realprice = value; }
 			get { return _f_realprice; }
@@ -338,7 +363,6 @@ namespace System.Model
 			set { _f_remark = value; }
 			get { return _f_remark; }
 		}
-
 		/// <summary>
 		/// 广告来源
 		/// </summary>
@@ -347,9 +371,8 @@ namespace System.Model
 			set { _f_adfrom = value; }
 			get { return _f_adfrom; }
 		}
-
 		/// <summary>
-		/// 订单类型
+		/// 订单类型  回访订单，热线订单==
 		/// </summary>
 		public string F_Type
 		{

代码/System.Model/T_Bus_Product.cs

@@ -23,10 +23,10 @@ namespace System.Model
 		private string _f_factory="";
 		private string _f_address="";
 		private string _f_supplier="";
-		private decimal? _f_score=0.00M;
-		private decimal? _f_marketprice=0.00M;
-		private decimal? _f_memberprice = 0.00M;
-		private decimal? _f_specialprice = 0.00M;
+		private decimal _f_score=0.00M;
+		private decimal _f_marketprice=0.00M;
+		private decimal _f_memberprice = 0.00M;
+		private decimal _f_specialprice = 0.00M;
 		private int? _f_isdelete=0;
 		private string _f_des="";
 		private string _f_attribute;
@@ -154,7 +154,7 @@ namespace System.Model
 		/// <summary>
 		/// 兑换积分
 		/// </summary>
-		public decimal? F_Score
+		public decimal F_Score
 		{
 			set { _f_score = value; }
 			get { return _f_score; }
@@ -162,7 +162,7 @@ namespace System.Model
 		/// <summary>
 		/// 市场价
 		/// </summary>
-		public decimal? F_MarketPrice
+		public decimal F_MarketPrice
 		{
 			set { _f_marketprice = value; }
 			get { return _f_marketprice; }
@@ -170,7 +170,7 @@ namespace System.Model
 		/// <summary>
 		/// 会员价
 		/// </summary>
-		public decimal? F_MemberPrice
+		public decimal F_MemberPrice
 		{
 			set { _f_memberprice = value; }
 			get { return _f_memberprice; }
@@ -178,7 +178,7 @@ namespace System.Model
 		/// <summary>
 		/// 特价/优惠价
 		/// </summary>
-		public decimal? F_SpecialPrice
+		public decimal F_SpecialPrice
 		{
 			set { _f_specialprice = value; }
 			get { return _f_specialprice; }

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

@@ -80,13 +80,15 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             modelOrder.F_Stock = input.F_Stock;
             modelOrder.F_Remark = input.F_Remark;
 
+            modelOrder.F_RealPrice = input.F_RealPrice;
+
             //选填 关联属性
             modelOrder.F_VipId = input.F_VipId;
 
             modelOrder.F_Type = input.F_Type;
             modelOrder.F_State = input.F_State;
             modelOrder.F_Status = input.F_Status;
-            modelOrder.F_UseActivity = input.F_UseActivity;
+
             //必须属性 系统生成
             modelOrder.F_AddTime = DateTime.Now;
             modelOrder.F_AddUser = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
@@ -95,35 +97,87 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             //计算属性  商品计算
             decimal F_Score = 0.00M;
             decimal totle = 0.00M;
-            decimal F_ShouldPrice = 0.00M; 
-            decimal F_RealPrice = 0.00M;
+            decimal ActivityMoney = 0.00M;
+            string UseActivity = "";
+            string UseActivity4 = ",";
             List<T_Bus_OrderDetail> modelDetailList = new List<T_Bus_OrderDetail>();
-            if (input.OrderDetail != null && input.OrderDetail.Count > 0)
+
+
+            modelOrder.F_UseActivity = input.F_UseActivity;
+
+            if (input.OrderDetailList != null && input.OrderDetailList.Count > 0)
             {
                 int n = 1;
-                foreach (OrderDetailInput m in input.OrderDetail)
+                int n2 = input.OrderDetailList.Count + 1;
+                if (input.UseActList != null && input.UseActList.Count > 0)
+                {
+                    //遍历所有选中的活动
+                    foreach (UseActInput act in input.UseActList)
+                    {
+                        UseActivity += act + ",";
+                        //满赠，生日赠
+                        if (act.type == 1 || act.type == 2)
+                        {
+                            T_Bus_Product m = await bus_productRepository.GetSingle(b => b.F_ProductId == act.gift.ObjToInt()); ;
+
+                            T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
+                            modelDetail.F_ProductName = m.F_ProductName;
+                            modelDetail.F_ProductId = m.F_ProductId;
+                            modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
+                            modelDetail.F_OrderId = input.F_Id;
+                            modelDetail.F_Count = 1;
+                            modelDetail.F_Price = 0.00M;
+                            modelDetail.F_DealPrice = 0.00M;
+                            modelDetail.F_Sort = n2;
+                            modelDetail.F_Remark = "赠品-活动：" + act.id;
+                            modelDetail.F_AddUser = modelOrder.F_AddUser;
+                            modelDetail.F_AddUserName = modelOrder.F_AddUserName;
+                            modelDetail.F_TotlePrice = 0.00M;
+                            modelDetail.F_Activity = act.id;
+
+                            modelDetailList.Add(modelDetail);
+
+                            n2++;
+                        }
+                        //满减
+                        else if (act.type == 3)
+                        {
+                            ActivityMoney += act.money;
+                        }
+                        else if (act.type == 4)
+                        {
+                            UseActivity4 += act.gift + ",";
+                        }
+                    }
+                    UseActivity = UseActivity.Trim(',');
+                }
+                foreach (OrderDetailInput m in input.OrderDetailList)
                 {
-                    T_Bus_Product modelProduct=await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
+                    T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
 
                     T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
-                    modelDetail.F_ProductName = m.F_ProductName;
-                    modelDetail.F_ProductId = m.F_ProductId;
+                    modelDetail.F_ProductName = modelProduct.F_ProductName;
+                    modelDetail.F_ProductId = modelProduct.F_ProductId;
                     modelDetail.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                     modelDetail.F_OrderId = input.F_Id;
                     modelDetail.F_Count = m.F_Count;
-                    modelDetail.F_Price = m.F_Price;
-                    modelDetail.F_DealPrice = m.F_DealPrice;                   
+                    modelDetail.F_Price = modelProduct.F_MemberPrice;
+                    //参加活动特价
+                    if (UseActivity4.Contains("," + modelProduct.F_ProductId + ","))
+                        modelDetail.F_DealPrice = modelProduct.F_SpecialPrice;
+                    else
+                        modelDetail.F_DealPrice = modelProduct.F_MemberPrice;
                     modelDetail.F_Sort = n;
                     modelDetail.F_Remark = m.F_Remark;
                     modelDetail.F_AddUser = modelOrder.F_AddUser;
                     modelDetail.F_AddUserName = modelOrder.F_AddUserName;
                     modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
-                    modelDetail.F_Activity = 0; 
+                    modelDetail.F_Activity = 0;
                     //是否有活动标签
                     if (m.Tags.IndexOf(".") > -1)
                     {
                         string[] tagarry = m.Tags.Split(',');
-                        string tag=tagarry.First(a => a.StartsWith(".")).ToString();
+                        string tag = tagarry.First(a => a.StartsWith(".")).ToString();
                         T_Sys_Marketing modelactive = await bus_MarketingRepository.GetSingle(b => string.Format(",{0},", b.F_Commodity).Contains(string.Format(",{0},", tag)));
 
                         //此商品参加活动
@@ -132,44 +186,35 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             modelDetail.F_Activity = modelactive.F_ID;
                         }
                     }
-                   
+
                     totle += modelDetail.F_TotlePrice;
+                    modelDetailList.Add(modelDetail);
 
                     n++;
                 }
 
 
             }
-            F_ShouldPrice = totle;
-            //计算活动  单独写个方法
-            if (modelOrder.F_UseActivity.Length>0)
-            {
-                //详细活动规则
-            }
+
 
             //计算结果
             modelOrder.F_Score = F_Score;
             modelOrder.F_TotlePrice = totle;
-            modelOrder.F_ShouldPrice = F_ShouldPrice;
-            modelOrder.F_RealPrice = F_RealPrice;
-            //Expression<Func<T_Bus_Product, bool>> eq = a => a.F_ProductName == input.ProductName;
-            //eq = eq.Or(b => b.F_PinyinShort == input.PinyinShort);
-            //eq = eq.Or(b => b.F_ProductId == input.ProductId);
-            //eq = eq.Or(b => b.F_ProductShortName == input.ProductShortName);
-            //if (await _productRepository.GetCount(eq) > 0)
-            //{
-            //    return Error("名称/条形码/简称 有重复");
-            //}
-
-            //List<ProductInput> inputlist = new List<ProductInput>();
-            //inputlist.Add(input);
+            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice- ActivityMoney;
+            modelOrder.F_ActivityMoney = ActivityMoney;
+            modelOrder.F_UseActivity = UseActivity;
+
+
             if (await bus_OrderRepository.Add(modelOrder) > 0)
             {
-                return Success("订单保存成功");
+                if (await bus_OrderDetailRepository.AddMany(modelDetailList))
+                   return Success("订单添加成功");
+                else
+                    return Error("订单添加失败,请重试！");
             }
             else
             {
-                return Error("订单保存失败,请重试！");
+                return Error("订单添加失败,请重试！");
             }
 
         }
@@ -182,7 +227,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         [HttpPost("getact")]
         public async Task<IActionResult> GetAct([FromBody]List<OrderDetailInput> input)
         {
-            if(input.Count<1)
+            decimal def = 0.00M;
+            if (input.Count < 1)
                 return Error("请选择商品/数量");
 
             //统计活动金额是否符合条件
@@ -190,6 +236,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
             //选择活动
             Dictionary<int, string> chooseact = new Dictionary<int, string>();
+            List<UseActInput> actlist = new List<UseActInput>();
             foreach (OrderDetailInput m in input)
             {
                 T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
@@ -200,7 +247,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     string[] tagarry = m.Tags.Split(',');
                     string tag = tagarry.First(a => a.StartsWith(".")).ToString();
                     //标签内有效期
-                    T_Sys_Marketing modelactive = await bus_MarketingRepository.GetSingle(b => string.Format(",{0},", b.F_Commodity).Contains(string.Format(",{0},", tag))&&b.F_StartTime<=DateTime.Now&&b.F_EndTime>=DateTime.Now);
+                    T_Sys_Marketing modelactive = await bus_MarketingRepository.GetSingle(b => string.Format(",{0},", b.F_Commodity).Contains(string.Format(",{0},", tag)) && b.F_StartTime <= DateTime.Now && b.F_EndTime >= DateTime.Now);
 
                     //此商品参加活动
                     if (modelactive != null)
@@ -209,16 +256,21 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                         {
                             //满赠
                             //判断此人是否有参与活动的资格  默认暂不筛选
+                            if (chooseact.ContainsKey(modelactive.F_ID))
+                                continue;
                             if (totleact.ContainsKey(modelactive.F_ID))
                             {
                                 totleact[modelactive.F_ID] = (decimal)modelProduct.F_MemberPrice * m.F_Count + totleact[modelactive.F_ID].ObjToDecimal();
                             }
                             else
                             {
-                                totleact.Add(modelactive.F_ID, (decimal)modelProduct.F_MemberPrice * m.F_Count);                               
+                                totleact.Add(modelactive.F_ID, (decimal)modelProduct.F_MemberPrice * m.F_Count);
                             }
                             if ((decimal)modelactive.F_Money <= (decimal)totleact[modelactive.F_ID])
-                                chooseact.Add(modelactive.F_ID, modelactive.F_Gift);
+                            {
+                                chooseact.Add(modelactive.F_ID, "1_" + modelactive.F_Gift);
+                                actlist.Add(new UseActInput { id = modelactive.F_ID, type = 1, gift = modelactive.F_Gift, money = def });
+                            }
                         }
                         else if (modelactive.F_Type == 2)
                         {
@@ -226,7 +278,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             //TODO 判断此人是否有参与活动的资格  默认暂不筛选  
                             if (chooseact.ContainsKey(modelactive.F_ID))
                                 continue;
-                            chooseact.Add(modelactive.F_ID, modelactive.F_Commodity);                           
+                            chooseact.Add(modelactive.F_ID, "2_" + modelactive.F_Commodity);
+                            actlist.Add(new UseActInput { id = modelactive.F_ID, type = 2, gift = modelactive.F_Gift, money = def });
                         }
                         else if (modelactive.F_Type == 3)
                         {
@@ -243,7 +296,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                                 totleact.Add(modelactive.F_ID, (decimal)modelProduct.F_MemberPrice * m.F_Count);
                             }
                             if ((decimal)modelactive.F_Money <= (decimal)totleact[modelactive.F_ID])
-                                chooseact.Add(modelactive.F_ID, modelactive.F_AmountRange.ToString());
+                            {
+                                chooseact.Add(modelactive.F_ID, "3_" + modelactive.F_AmountRange.ToString());
+
+                                decimal.TryParse(modelactive.F_AmountRange, out def);
+                                actlist.Add(new UseActInput { id = modelactive.F_ID, type = 3, gift = "", money = def });
+                                def = 0.00M;
+                            }
                         }
                         else if (modelactive.F_Type == 4)
                         {
@@ -251,24 +310,23 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             //判断此人是否有参与活动的资格  默认暂不筛选
                             if (chooseact.ContainsKey(modelactive.F_ID))
                             {
-                                chooseact[modelactive.F_ID]= chooseact[modelactive.F_ID]+","+ m.F_ProductId.ToString();
+                                chooseact[modelactive.F_ID] = chooseact[modelactive.F_ID] + "," + m.F_ProductId.ToString();
+                                actlist.First(cc => cc.id == modelactive.F_ID).gift += "," + m.F_ProductId.ToString();
                             }
                             else
                             {
-                                chooseact.Add(modelactive.F_ID, m.F_ProductId.ToString());
+                                chooseact.Add(modelactive.F_ID, "4_" + m.F_ProductId.ToString());
+                                actlist.Add(new UseActInput { id = modelactive.F_ID, type = 4, gift = m.F_ProductId.ToString(), money = def });
                             }
-                            
-                        }
-
 
 
+                        }
                     }
                 }
 
             }
 
-
-                return Success("订单保存成功", chooseact);
+            return Success("参与活动", actlist);
 
 
         }

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

@@ -28,7 +28,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
 
         private readonly IBus_TagRepository _tagRepository;
-        public TagController( IBus_TagRepository tagRepository)
+        public TagController(IBus_TagRepository tagRepository)
         {
 
             _tagRepository = tagRepository;
@@ -50,7 +50,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
             if (string.IsNullOrEmpty(input.TagName))
                 return Error("请输入分类名称");
-            if (input.CLass<1)
+            if (input.CLass < 1)
                 return Error("请输入标签分类");
             if (input.Type < 0)
                 input.Type = 1;
@@ -101,14 +101,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
                 return Error("请输入标签名称");
             if (input.Type < 0)
                 input.Type = 1;
-            if (input.Sort <1)
+            if (input.Sort < 1)
                 return Error("请输入标签排序序号");
 
             #endregion
 
             Expression<Func<T_Bus_Tag, bool>> eq = a => a.F_TagName == input.TagName;
 
-            T_Bus_Tag T_Bus_TagModel = await _tagRepository.GetSingle(eq.And(b=>b.F_Type== input.Type));
+            T_Bus_Tag T_Bus_TagModel = await _tagRepository.GetSingle(eq.And(b => b.F_Type == input.Type));
             //除非某固定权限 定之后再加
             if (T_Bus_TagModel.F_CLass == 1)
             {
@@ -122,14 +122,20 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             T_Bus_TagModel.F_UserId = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
             T_Bus_TagModel.F_UpdateTime = DateTime.Now;
 
-            if (await _tagRepository.Update(T_Bus_TagModel))
+            
+            if (await _tagRepository.Delete(eq))
             {
-                return Success("更新标签成功");
-            }
-            else
-            {
-                return Error("标签重复或失败,请重试！");
+                if (await _tagRepository.Add(T_Bus_TagModel) > 0)
+                {
+                    return Success("更新标签成功");
+                }
+                else
+                {
+                    return Success("更新标签成功。");
+                }
             }
+            return Error("更新标签失败");
+
         }
 
         /// <summary>
@@ -144,13 +150,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
             if (string.IsNullOrEmpty(input.TagName))
                 return Error("请选择标签");
-            if (input.CLass<2)
+            if (input.CLass < 2)
                 return Error("系统标签不能删除");
 
 
             Expression<Func<T_Bus_Tag, bool>> eq = a => a.F_TagName == input.TagName;
             //非系统标签可以随意删除，与商品没有关联
-            if (await _tagRepository.Delete(eq.And(b=>b.F_Type==input.Type)))
+            if (await _tagRepository.Delete(eq.And(b => b.F_Type == input.Type)))
             {
                 return Success("删除标签成功");
             }
@@ -169,7 +175,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
         public async Task<IActionResult> GetTagAll(TagInput input)
         {
 
-
             #region  拼接条件
 
             Expression<Func<T_Bus_Tag, bool>> eq = a => a.F_Type == 1;
@@ -180,7 +185,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             {
                 eq = eq.And(a => a.F_CLass == input.CLass);
             }
-            if (! string.IsNullOrEmpty(input.TagName))
+            if (!string.IsNullOrEmpty(input.TagName))
             {
                 eq = eq.And(a => a.F_TagName.Contains(input.TagName));
             }
@@ -189,13 +194,13 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             #endregion
 
 
-            List<T_Bus_Tag> list = await _tagRepository.GetListALL(eq,c=>c.F_Sort,OrderByType.Asc);
+            List<T_Bus_Tag> list = await _tagRepository.GetListALL(eq, c => c.F_Sort, OrderByType.Asc);
 
             return Success("成功", list);
 
         }
 
         #endregion
- 
+
     }
 }

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

@@ -5,7 +5,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 	/// 订单详情表
 	/// </summary>
 	[Serializable]
-	public partial class OrderDetailInput:BaseInput
+	public partial class OrderDetailInput : BaseInput
 	{
 		public OrderDetailInput()
 		{ }
@@ -142,5 +142,16 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		#endregion Model
 
 	}
+	[Serializable]
+	public class UseActInput
+	{
+		public int id { get; set; }
+
+		public decimal money { get; set; }
+
+		public int type { get; set; }
+
+		public string gift { get; set; }
+	}
 }
 

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

@@ -43,16 +43,16 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		private decimal? _f_totleprice;
 		private string _f_useactivity = "";
 		private decimal? _f_shouldprice;
-		private decimal? _f_realprice;
+		private decimal _f_realprice;
 		private string _f_paytype = "";
 		private string _f_stock = "";
 		private string _f_express = "";
 		private string _f_remark = "";
 		private string _f_adfrom = "";
 		private string _f_type = "";
-		public List<OrderDetailInput> OrderDetail { get; set; }
+		public List<OrderDetailInput> OrderDetailList { get; set; }
+		public List<UseActInput> UseActList { get; set; }
 
-	
 		/// <summary>
 		/// 订单编号 BJ员工工号+T+时间
 		/// </summary>
@@ -304,7 +304,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 实收金额
 		/// </summary>
-		public decimal? F_RealPrice
+		public decimal F_RealPrice
 		{
 			set { _f_realprice = value; }
 			get { return _f_realprice; }

代码/TVShoppingCallCenter_ZLJ/Properties/PublishProfiles/FolderProfile.pubxml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-此文件由 Web 项目的发布/打包过程使用。可以通过编辑此 MSBuild 文件
-自定义此过程的行为。为了解与此相关的更多内容，请访问 https://go.microsoft.com/fwlink/?LinkID=208121。 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>FileSystem</WebPublishMethod>
-    <PublishProvider>FileSystem</PublishProvider>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <ProjectGuid>5227bf8a-c03f-40d4-b5b6-18a891c1e474</ProjectGuid>
-    <publishUrl>E:\项目-6.0\ZLJ足力健\发布\WebSite</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <SelfContained>false</SelfContained>
-    <_IsPortable>true</_IsPortable>
-  </PropertyGroup>
-</Project>