Merge branch 'master' of http://192.168.1.222:3000/zhengbingbing/ZLJ_API_V6.0

代码/System.Model/T_Bus_Order.cs

 		private string _f_stockusername = "";
 		private int _f_senduser = 0;
 		private string _f_sendusername = "";
+		private decimal _f_expressfee = 10;
+
+		/// <summary>
+		/// 快递费
+		/// </summary>
+		public decimal F_ExpressFee
+		{
+			set { _f_expressfee = value; }
+			get { return _f_expressfee; }
+		}
 
 		/// <summary>
 		/// 审核备注

代码/System.Model/T_Sys_Marketing.cs

         private string _f_commodity;
         private string _f_describe;
         private string _f_gift;
-        private int? _f_money;
+        private string _f_money="";
         private DateTime? _f_starttime;
         private DateTime? _f_endtime;
         private string _f_member;
         /// <summary>
         /// 金额
         /// </summary>
-        public int? F_Money
+        public string F_Money
         {
             set { _f_money = value; }
             get { return _f_money; }

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

             modelOrder.F_Address = input.F_Address;
             modelOrder.F_PostalCode = input.F_PostalCode;
             modelOrder.F_Express = input.F_Express;
+            modelOrder.F_ExpressFee= input.F_ExpressFee;
 
             modelOrder.F_PayType = input.F_PayType;
             modelOrder.F_Stock = input.F_Stock;
             modelOrder.F_AddTime = DateTime.Now;
             modelOrder.F_AddUser = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
             modelOrder.F_AddUserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
-
+            modelOrder.F_Belong = 0;
+            modelOrder.F_BelongName = "";
             #endregion
 
             //计算属性  商品计算
             {
                 int n = 1;
                 int n2 = input.OrderDetailList.Count + 1;
+                #region 活动核算
                 if (input.UseActList != null && input.UseActList.Count > 0)
                 {
                     //遍历所有选中的活动
                     }
                     UseActivity = UseActivity.Trim(',');
                 }
+                #endregion
+
+                #region 商品核算
                 foreach (OrderDetailInput m in input.OrderDetailList)
                 {
                     T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId && b.F_IsSale == 1);
 
                     n++;
                 }
+                #endregion
 
+                modelOrder.F_TotlePrice = totle;
+                modelOrder.F_ActivityMoney = ActivityMoney;
+                modelOrder.F_UseActivity = UseActivity;
             }
             else
             {
             }
 
             #endregion
-            //计算结果  积分有规则
-
-
-
-            modelOrder.F_TotlePrice = totle;
-            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - ActivityMoney;
-            modelOrder.F_ActivityMoney = ActivityMoney;
-            modelOrder.F_UseActivity = UseActivity;
-            modelOrder.F_Belong = 0;
-            modelOrder.F_BelongName = "";
-
-
-
-
+            //计算结果  积分有规则            
+            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - ActivityMoney+ modelOrder.F_ExpressFee;
 
             #region 核算是否支付完成
             if ((modelOrder.F_RealPrice + modelOrder.F_UseScore / modelscore.F_GetPercent) >= modelOrder.F_ShouldPrice)
 
                     n++;
                 }
-                modelOrder.F_TotlePrice = totle;
 
                 #endregion
-
+                modelOrder.F_TotlePrice = totle;
                 modelOrder.F_ActivityMoney = ActivityMoney;
                 modelOrder.F_UseActivity = UseActivity;
             }
             #endregion
 
 
-            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - modelOrder.F_ActivityMoney;
+            modelOrder.F_ShouldPrice = modelOrder.F_TotlePrice - modelOrder.F_ActivityMoney + modelOrder.F_ExpressFee;
 
             if ((modelOrder.F_RealPrice + modelOrder.F_UseScore / modelscore.F_GetPercent) >= modelOrder.F_ShouldPrice)
             {
             if (input.Count < 1)
                 return Error("请选择商品/数量");
 
-            //统计活动金额是否符合条件
-            Dictionary<int, decimal> totleact = new Dictionary<int, decimal>();
-
+            //统计活动金额是否符合条件 满减
+            Dictionary<int, decimal> acttype3 = new Dictionary<int, decimal>();
+            //内部计算
+            Dictionary<int, decimal> innerCompute = new Dictionary<int, decimal>();
+            
             //选择活动
             Dictionary<int, string> chooseact = new Dictionary<int, string>();
             List<UseActInput> actlist = new List<UseActInput>();
                     //是否有活动标签
                     if (modelProduct.F_Tag.IndexOf(".") > -1)
                     {
-                        string[] tagarry = m.Tags.Split(',');
+                        string[] tagarry = modelProduct.F_Tag.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 => (","+ b.F_Commodity + "," ).Contains(","+ tag + ",") && b.F_StartTime <= DateTime.Now && b.F_EndTime >= DateTime.Now);
 
                         //此商品参加活动
                         if (modelactive != null)
                                 //判断此人是否有参与活动的资格  默认暂不筛选
                                 if (chooseact.ContainsKey(modelactive.F_ID))
                                     continue;
-                                if (totleact.ContainsKey(modelactive.F_ID))
+                                if (innerCompute.ContainsKey(modelactive.F_ID))
                                 {
-                                    totleact[modelactive.F_ID] = (decimal)modelProduct.F_MemberPrice * m.F_Count + totleact[modelactive.F_ID].ObjToDecimal();
+                                    innerCompute[modelactive.F_ID] = (decimal)modelProduct.F_MemberPrice * m.F_Count + innerCompute[modelactive.F_ID].ObjToDecimal();
                                 }
                                 else
                                 {
-                                    totleact.Add(modelactive.F_ID, (decimal)modelProduct.F_MemberPrice * m.F_Count);
+                                    innerCompute.Add(modelactive.F_ID, (decimal)modelProduct.F_MemberPrice * m.F_Count);
                                 }
-                                if ((decimal)modelactive.F_Money <= (decimal)totleact[modelactive.F_ID])
+                                if (modelactive.F_Money.ObjToDecimal() <= (decimal)innerCompute[modelactive.F_ID])
                                 {
                                     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, actname = modelactive.F_Name, actdes = modelactive.F_PromotionRules });
                             {
                                 //满减
                                 //判断此人是否有参与活动的资格  默认暂不筛选
-                                if (chooseact.ContainsKey(modelactive.F_ID))
-                                    continue;
-                                if (totleact.ContainsKey(modelactive.F_ID))
+
+                                if (innerCompute.ContainsKey(modelactive.F_ID))
                                 {
-                                    totleact[modelactive.F_ID] = (decimal)modelProduct.F_MemberPrice * m.F_Count + totleact[modelactive.F_ID].ObjToDecimal();
+                                    innerCompute[modelactive.F_ID] = (decimal)modelProduct.F_MemberPrice * m.F_Count + innerCompute[modelactive.F_ID];
                                 }
                                 else
                                 {
-                                    totleact.Add(modelactive.F_ID, (decimal)modelProduct.F_MemberPrice * m.F_Count);
+                                    innerCompute.Add(modelactive.F_ID, (decimal)modelProduct.F_MemberPrice * m.F_Count);
                                 }
-                                if ((decimal)modelactive.F_Money <= (decimal)totleact[modelactive.F_ID])
+                                string[] AmountRange = modelactive.F_AmountRange.Split(',');
+                                for (int i=0;i< AmountRange.Length;i++)
                                 {
-                                    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, actname = modelactive.F_Name, actdes = modelactive.F_PromotionRules });
-                                    def = 0.00M;
+                                    //符合满减某个条件
+                                    if (innerCompute[modelactive.F_ID] >= AmountRange[i].ObjToDecimal())
+                                    {
+                                        if (acttype3.ContainsKey(modelactive.F_ID))
+                                        {
+                                            //当前减免金额大于之前发赋值，替换掉
+                                            if (modelactive.F_Money.Split(',')[i].ObjToDecimal() > acttype3[modelactive.F_ID])
+                                            {
+                                                acttype3[modelactive.F_ID] = modelactive.F_Money.Split(',')[i].ObjToDecimal();
+                                                actlist.ForEach(q => { if (q.id == modelactive.F_ID) { q.money = modelactive.F_Money.Split(',')[i].ObjToDecimal(); } });
+                                            }
+                                        }
+                                        else
+                                        {
+                                            //满足条件，赋值满减金额 减的金额
+                                            acttype3.Add(modelactive.F_ID, modelactive.F_Money.Split(',')[i].ObjToDecimal());
+                                            actlist.Add(new UseActInput { id = modelactive.F_ID, type = 3, gift = "", money = modelactive.F_Money.Split(',')[i].ObjToDecimal(), actname = modelactive.F_Name, actdes = modelactive.F_PromotionRules });
+                                        }
+                                    }
                                 }
+                                
                             }
                             else if (modelactive.F_Type == 4)
                             {
                                 if (chooseact.ContainsKey(modelactive.F_ID))
                                 {
                                     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();
+                                    actlist.ForEach(q => { if (q.id == modelactive.F_ID){ q.gift = q.gift + m.F_ProductId.ToString(); } });
                                 }
                                 else
                                 {

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

             {
                 foreach (T_Bus_Tag t in list)
                 {
-                    int count = await bus_MarketingRepository.GetCount(q => string.Format(",{0},", q.F_Commodity).Contains(string.Format(",{0},", t.F_TagName)));
+                    int count = await bus_MarketingRepository.GetCount(q => (","+ q.F_Commodity + ",").Contains("," + t.F_TagName + ",")&&q.F_StartTime<=DateTime.Now&& q.F_EndTime >= DateTime.Now );
                     if (count == 0)
                     {
                         listres.Add(t);

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

         /// <summary>
         /// 金额
         /// </summary>
-        public int? F_Money { get; set; }
+        public string F_Money { get; set; } = "";
         /// <summary>
         /// 开始时间
         /// </summary>

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

         private string _f_stockusername = "";
         private int _f_senduser = 0;
         private string _f_sendusername = "";
+        private decimal _f_expressfee = 10;
+        
+        /// <summary>
+        /// 快递费
+        /// </summary>
+        public decimal F_ExpressFee
+        {
+            set { _f_expressfee = value; }
+            get { return _f_expressfee; }
+        }
 
         /// <summary>
         /// 审核备注