会员工单

代码/System.IRepositories/Cus/ICus_MembershipRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.Model.Cus;
+using System.Text;
+
+namespace System.IRepositories.Cus
+{
+   
+    public interface ICus_MembershipRepository : IRepository<T_Cus_Membership>
+    {
+    }
+}

代码/System.Model/Bus/T_Bus_Order.cs

@@ -70,7 +70,7 @@ namespace System.Model
 		private string _f_tag = "";
         private int _f_ispayment = 0;
 
-       
+        private string _f_membernotes = "";
         private string _f_recommendName = "";
       
 
@@ -560,8 +560,16 @@ namespace System.Model
             set { _f_ispayment = value; }
             get { return _f_ispayment; }
         }
-    
-      
+
+        /// <summary>
+        /// 会员备注
+        /// </summary>
+        public string F_MemberNotes
+        {
+            set { _f_membernotes = value; }
+            get { return _f_membernotes; }
+
+        }
         #endregion Model
 
     }

代码/System.Model/Cus/T_Cus_Membership.cs

@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace System.Model.Cus
+{
+    [Serializable]
+    public partial class T_Cus_Membership
+    {
+        public T_Cus_Membership()
+        { }
+        #region Model
+        private int _f_id;
+        private string _f_name;
+        private int? _f_minmoney=0;
+        private int? _f_maxmoney=0;
+        private string _f_adduser;
+        private DateTime? _f_addtime;
+        private DateTime? _f_modifyon;
+        private string _f_modifyby;
+        private int? _f_state;
+        /// <summary>
+        /// auto_increment
+        /// </summary>
+        public int F_ID
+        {
+            set { _f_id = value; }
+            get { return _f_id; }
+        }
+        /// <summary>
+        /// 会员等级名称
+        /// </summary>
+        public string F_Name
+        {
+            set { _f_name = value; }
+            get { return _f_name; }
+        }
+        /// <summary>
+        /// 最低金额
+        /// </summary>
+        public int? F_MinMoney
+        {
+            set { _f_minmoney = value; }
+            get { return _f_minmoney; }
+        }
+        /// <summary>
+        /// 最大金额
+        /// </summary>
+        public int? F_MaxMoney
+        {
+            set { _f_maxmoney = value; }
+            get { return _f_maxmoney; }
+        }
+        /// <summary>
+        /// 添加人
+        /// </summary>
+        public string F_AddUser
+        {
+            set { _f_adduser = value; }
+            get { return _f_adduser; }
+        }
+        /// <summary>
+        /// 添加时间
+        /// </summary>
+        public DateTime? F_AddTime
+        {
+            set { _f_addtime = value; }
+            get { return _f_addtime; }
+        }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? F_ModifyOn
+        {
+            set { _f_modifyon = value; }
+            get { return _f_modifyon; }
+        }
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string F_ModifyBy
+        {
+            set { _f_modifyby = value; }
+            get { return _f_modifyby; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? F_State
+        {
+            set { _f_state = value; }
+            get { return _f_state; }
+        }
+        #endregion Model
+
+    }
+}

代码/System.Repositories/Cus/Cus_MembershipRepository.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+
+using System.Model.Cus;
+using System.IRepositories.Cus;
+
+namespace System.Repositories.Cus
+{
+   
+    public class Cus_MembershipRepository : BaseRepository<T_Cus_Membership>, ICus_MembershipRepository
+    {
+    }
+}

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/MembershipController.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.IRepositories.Cus;
+using System.Linq;
+using System.Model.Cus;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+
+namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
+{
+    [Produces("application/json")]
+    [Route("api/[controller]")]
+    public class MembershipController : BaseController
+    {
+        private readonly ICus_MembershipRepository _cus_membershiprepository;
+       
+        public MembershipController(ICus_MembershipRepository cus_membershiprepository)
+        {
+            _cus_membershiprepository = cus_membershiprepository;
+           
+        }
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("add")]
+        public async Task<IActionResult> AddAsync(T_Cus_Membership input)
+        {
+            if (string.IsNullOrEmpty(input.F_Name))
+                return Error("请输入会员类型");
+            //  input.F_CreateUser = "8000";
+            input.F_AddTime  = DateTime.Now;
+            input.F_State  = 1;
+            input.F_AddUser  = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            var res = await _cus_membershiprepository.Add(input);
+            if (res > 0)
+            {
+                return Success("添加成功");
+            }
+            else
+            {
+                return Error("添加失败");
+            }
+        }
+        /// <summary>
+        /// 修改
+        /// </summary>
+        [HttpPost("update")]
+        public async Task<IActionResult> UpdateAsync(T_Cus_Membership input)
+        {
+            if (input.F_ID <= 0)
+                return Error("请选择正确的会员类型xz");
+            if (string.IsNullOrEmpty(input.F_Name))
+                return Error("请输入会员类型");
+            var model = await _cus_membershiprepository.GetSingle(x => x.F_ID == input.F_ID);
+            if (model == null)
+                return Error("操作失败");
+            input.F_State  = model .F_State ;
+            input.F_AddUser  = model.F_AddUser ;
+            input.F_AddTime  = model.F_AddTime ;
+            model = input;
+            model.F_ModifyOn  = DateTime.Now;
+            // model.F_UpdateUser = "8000";
+            model.F_ModifyBy  = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            var b = await _cus_membershiprepository.Update(model);
+            if (b)
+                return Success("修改成功");
+            return Error("修改失败");
+        }
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        [HttpPost("delete")]
+        public async Task<IActionResult> Remove(int[] ids,int  state=1)
+        {
+            var res = 0;
+            if (ids != null && ids.Length > 0)
+            {
+                foreach (var item in ids)
+                {
+                    var model = await _cus_membershiprepository.GetSingle(x => x.F_ID == item);
+                    model.F_State  = state;
+                    if (_cus_membershiprepository.Update(model).Result)
+                        res += 1;
+                }
+                if (res == ids.Length)
+                    return Success("操作成功");
+                else if (res > 0 && res < ids.Length)
+                    return Error("部分删除失败，请查看后重新操作");
+                else
+                    return Error("删除失败，请查看后重新操作");
+            }
+            else
+                return Error("请选择要删除的记录");
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="keyword"></param>
+        /// <param name="pageindex"></param>
+        /// <param name="pagesize"></param>
+        /// <returns></returns>
+        [HttpGet("getlist")]
+        public async Task<IActionResult> GetLisAsync(string name, string province, string city, string county, string region, int pageindex = 1, int pagesize = 20)
+        {
+            List<IConditionalModel> conModels = new List<IConditionalModel>();
+            #region 条件筛选
+            conModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.NoEqual, FieldValue = ((int)EnumDelState.Delete).ToString() });
+            if (!string.IsNullOrEmpty(name))
+            {
+                conModels.Add(new ConditionalModel() { FieldName = "F_Name", ConditionalType = ConditionalType.Like, FieldValue = name });
+            }
+            #endregion
+            int recordCount = 0;
+            var list = await _cus_membershiprepository.GetListByPage(conModels, new MyPageModel() { PageIndex = pageindex, PageSize = pagesize, PageCount = recordCount });
+
+
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = list,
+                total = list.Totals,
+            };
+
+            return Content(obj.ToJson());
+        }
+
+        /// <summary>
+        /// 获取详情
+        /// </summary>
+        /// <param name="id">id</param>
+        /// <returns></returns>
+        [HttpGet("getdetails")]
+        public async Task<IActionResult> GetDetailsAsync(int id)
+        {
+            if (id <= 0)
+                return Error("参数错误");
+
+            var model = await _cus_membershiprepository.GetSingle(x => x.F_ID == id);
+            if (model == null)
+            {
+                return Error("获取失败");
+            }
+
+            return Success("获取成功！", model);
+        }
+    }
+}

代码/TVShoppingCallCenter_ZLJ/Controllers/Customer/VIPInfoController.cs

@@ -17,6 +17,7 @@ using System.Reflection;
 using System.Text.RegularExpressions;
 using System.IRepositories.Call;
 using System.Model.Call;
+using System.Utility.Encrypt;
 
 namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
 {
@@ -156,10 +157,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             if (model != null)
             {
                 var modellist = await _cus_msgRepository.GetListALL(x => x.F_VipInfoID == model.F_ID);
+                var viplist = await _cus_vip_infoRepository.GetListALL(x => x.F_State == 1&& x.F_Recommender == model.F_Name&&(x .F_RecommenderTel ==model .F_Phone || x.F_RecommenderTel == model.F_Mobile &&x.F_RecommenderTel == model.F_Mobile1));
                 var obj =new 
                 {
                     model,
-                    modellist
+                    modellist,
+                    viplist
                 };
              return   Content(obj.ToJson());
 
@@ -168,6 +171,61 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
            
         }
         /// <summary>
+        /// 号码加密
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        [HttpGet("encryptphone")]
+        public async Task<IActionResult> GetEncrypt(int id,int type=0)
+        {
+            var model = await _cus_vip_infoRepository.GetSingleV(x => x.F_ID == id && x.F_State == (int)EnumDelState.Enabled);
+            if (model == null)
+                return Error("获取失败");
+            string date = "";
+            if (type == 0)
+                date = model.F_Phone;
+            else if (type == 1)
+                date = model.F_Mobile;
+            else if (type == 2)
+                date = model.F_Mobile1;
+            if (string.IsNullOrEmpty(date))
+                return Error("请输入要加密的内容!");
+            var aes = EncryptHelper.EncryptAES(date);
+            if (!string.IsNullOrEmpty(aes))
+            {
+                var des = EncryptHelper.EncryptDES(aes);
+                if (!string.IsNullOrEmpty(des))
+                    return Success("加密成功!", des);
+            }
+            return Error("加密失败!");
+
+        }
+        /// <summary>
+        /// 号码解密
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        [HttpGet("decryptphone")]
+        public async Task<IActionResult> Decrypt(string  date)
+        {
+         
+           if (!string.IsNullOrEmpty(date))
+                {
+                    var des = EncryptHelper.DecryptDES(date.Trim());
+                    if (!string.IsNullOrEmpty(des))
+                    {
+                        var aes = EncryptHelper.DecryptAES(des);
+                    return Success("获取成功", aes);
+                       
+                    }
+                }
+            
+            return Error("获取失败");
+
+        }
+        /// <summary>
         /// 根据电话号码获取会员详情
         /// </summary>
         /// <param name="id">id</param>
@@ -207,7 +265,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             if (string.IsNullOrEmpty(input.phone))
                 return Error("请输入联系方式");
 
-            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone&&q.F_State== (int)EnumDelState.Enabled) >0)
+            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone   == input.phone  && q.F_State== (int)EnumDelState.Enabled) >0)
             {
                 return Error("手机号已存在");
             }
@@ -215,6 +273,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             var model = new T_Cus_VipInfo();
             //model.F_VIPCode = input.vipcode;//会员卡号
             model.F_Name = input.name;
+            if (input.birthday!=null)
+            {
+                DateTime time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
+                if (input.birthday > time)
+                    return Error("会员生日必须小于今天");
+            }
             model.F_Birthday = input.birthday;
             if(!valtel(input.phone))
                 return Error("手机号必须为11位数字");
@@ -352,7 +416,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
             if (string.IsNullOrEmpty(input.phone))
                 return Error("请输入联系方式");
 
-            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone&&q.F_ID!= input.id && q.F_State == (int)EnumDelState.Enabled) > 0)
+            if (await _cus_vip_infoRepository.GetCount(q => q.F_Phone == input.phone && q.F_ID!= input.id && q.F_State == (int)EnumDelState.Enabled) > 0)
             {
                 return Error("手机号已存在");
             }
@@ -362,6 +426,12 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Customer
                 return Error("操作失败");
             //model.F_VIPCode = input.vipcode;//会员卡号
             model.F_Name = input.name;
+            if (input.birthday != null)
+            {
+                DateTime time = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd"));
+                if (input.birthday > time)
+                    return Error("会员生日必须小于今天");
+            }
             model.F_Birthday = input.birthday;
             if (!valtel(input.phone))
                 return Error("手机号必须为11位数字");

代码/TVShoppingCallCenter_ZLJ/Controllers/ManagementCenter/ManagementCenterController.cs

@@ -172,6 +172,29 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             return conModels;
         }
         /// <summary>
+        /// 会员生日
+        /// </summary>
+        /// <param name="time"></param>
+        /// <returns></returns>
+        [HttpGet("realtimesales")]
+        public async Task<IActionResult > Birthday(string time)
+        {
+            string user = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Sid).Value;
+            DateTime dateTime = DateTime.Now;
+            if (!string.IsNullOrEmpty(time))
+                dateTime = DateTime.Parse(time);
+            List<IConditionalModel> cosModels = new List<IConditionalModel>();
+            int days = Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(dateTime.Year, dateTime.Month);
+            cosModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.Equal, FieldValue = ((int)EnumDelState.Enabled).ToString() });
+            cosModels.Add(new ConditionalModel() { FieldName = "F_Birthday", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = dateTime.ToString("yyyy-MM")+"-01" + " 00:00:00" });
+            cosModels.Add(new ConditionalModel() { FieldName = "F_Birthday", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = dateTime.ToString("yyyy-MM") + "-"+ days + " 23:59:59" });
+            cosModels.Add(new ConditionalModel() { FieldName = "F_Saleperson", ConditionalType = ConditionalType.Equal, FieldValue = user });
+            var todaycustomer = _cus_vip_infoRepository.GetListALL(cosModels, "F_CreateOn asc").Result;
+            return Success("获取成功", todaycustomer);
+           
+        }
+
+        /// <summary>
         /// 当月任务总量
         /// </summary>
         /// <param name="time"></param>
@@ -231,7 +254,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             if (!string.IsNullOrEmpty(time))
                 dateTime = DateTime.Parse (time);
             List<IConditionalModel> orderModels = new List<IConditionalModel>();
-            int days = Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(dateTime.Year, dateTime.Month - 1);//获取天数
+            int days = Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(dateTime.Year, dateTime.Month);//获取天数
             orderModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue = dateTime.ToString("yyyy-MM-01") });
             orderModels.Add(new ConditionalModel() { FieldName = "F_AddTime", ConditionalType = ConditionalType.LessThanOrEqual, FieldValue = dateTime.ToString("yyyy-MM") + "-" + days + " 23:59:59" });
             orderModels.Add(new ConditionalModel() { FieldName = "F_State", ConditionalType = ConditionalType.GreaterThanOrEqual, FieldValue ="0" });
@@ -471,7 +494,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.ManagementCenter
             if (!string.IsNullOrEmpty(month))
                 time = DateTime.Parse (month);
            
-            int   days = Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month - 1);//获取天数
+            int   days = Thread.CurrentThread.CurrentUICulture.Calendar.GetDaysInMonth(time.Year, time.Month );//获取天数
             if (time.Month == DateTime.Now.Month)
             {
                 days = DateTime.Now.Day;

代码/TVShoppingCallCenter_ZLJ/Controllers/MediaCente/MediaManagementController.cs

@@ -158,7 +158,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.MediaCente
         }
 
         /// <summary>
-        /// 获取营销政策详情
+        /// 获取详情
         /// </summary>
         /// <param name="id">id</param>
         /// <returns></returns>

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

@@ -206,7 +206,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             return Success("导入成功");
         }
         /// <summary>
-        /// 分仓
+        /// 批量退回
         /// </summary>
         /// <param name="orderids"></param>
         /// <param name="stock"></param>
@@ -254,7 +254,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         /// 订单二审 审完 走发货
         /// </summary>
         /// <param name="orderid">订单号</param>
-        /// <param name="state">订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4KG退回 5已分拣 6已发货</param>
+        /// <param name="state">订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4KG退回 5已分拣 6已发货7，8分仓</param>
         /// <param name="remark">客服备注</param>
         /// <returns></returns>
         [HttpPost("/api/order/checkorderbykf")]
@@ -806,7 +806,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 }
                else
                 {
-                    modelOrder.F_State = 3;
+                    modelOrder.F_State = 8;
                 }
                 orderLIst.Add(modelOrder);
             }

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

@@ -417,7 +417,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 T_Cus_VipInfo modelvip = new T_Cus_VipInfo();
                 #region 验证参数 必填项  
-
                 if (string.IsNullOrEmpty(input.F_ADFrom))
                     return Error("请输入选择广告来源");
                 if (string.IsNullOrEmpty(input.F_Type))
@@ -431,24 +430,19 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 if (input.F_Type == "售后订单")
                     return Error("售后订单只能根据售后单自动创建");
                 #endregion
-
-
                 int exist = await bus_OrderRepository.GetCount(q => q.F_Id == input.F_Id);
                 if (exist > 0)
                 {
                     return Error("此订单号已存在");
                 }
-
                 T_Bus_Order modelOrder = new T_Bus_Order();
                 #region 订单属性
                 //必填
                 modelOrder.F_ADFrom = input.F_ADFrom;
                 modelOrder.F_Type = input.F_Type;
                 modelOrder.F_Id = input.F_Id;
-
                 modelOrder.F_Customer = input.F_Customer;
                 modelOrder.F_CustomerPhone = input.F_CustomerPhone;
-
                 if (input.F_RecommendId > 0)
                 {
                     modelOrder.F_RecommendId = input.F_RecommendId;
@@ -473,7 +467,6 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 { modelOrder.F_AddArea = input.F_AddArea; }
                 if (!string.IsNullOrEmpty(input.F_AddTown))
                 { modelOrder.F_AddTown = input.F_AddTown; }
-
                 if (!string.IsNullOrEmpty(input.F_AddDes))
                 { modelOrder.F_AddDes = input.F_AddDes; }
                 if (!string.IsNullOrEmpty(input.F_Address))
@@ -509,14 +502,11 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                     modelOrder.F_Belong = UserLogin.UserId.ObjToInt();
                     modelOrder.F_BelongName = UserLogin.UserName;
                 }
-
-
                 modelOrder.F_ExpressFee = input.F_ExpressFee;
                 //  modelOrder.F_Stock = input.F_Stock;
-
                 modelOrder.F_IsExpress = 0;
-              
                 modelOrder.F_RealPrice = input.F_RealPrice;
+                modelOrder.F_MemberNotes = input.F_MemberNotes;//会员备注
                 modelOrder.F_UseScore = input.F_UseScore;
                 if (input.F_IsPayment > 0)
                 {
@@ -528,14 +518,14 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                             return Error("请输入订单号");
                         if (string.IsNullOrEmpty(input.OrderMoney.F_PayUser))
                             return Error("请输入打款人");
-                        if (string.IsNullOrEmpty(input.OrderMoney.F_PayType))
-                            return Error("请输入打款方式");
+                        if (string.IsNullOrEmpty(input.F_PayType))
+                            return Error("请选择付款方式");
                         if (string.IsNullOrEmpty(input.OrderMoney.F_RemarkKF))
                             input.OrderMoney.F_RemarkKF = "";
                         if (string.IsNullOrEmpty(input.OrderMoney.F_RemarkXS))
                             input.OrderMoney.F_RemarkXS = "";
                         if (input.OrderMoney.F_PayTime == null)
-                            return Error("请输入打款时间");
+                            return Error("请选择打款时间");
                         if (input.OrderMoney.F_Money <= 0)
                             return Error("请输入金额");
 
@@ -559,9 +549,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 //选填 关联属性
                
                 modelOrder.F_Status = 0;
-
+               
                 modelOrder.F_IsPayment = input.F_IsPayment;
-           
+               
                 //必须属性 系统生成
                 modelOrder.F_AddTime = DateTime.Now;
                 modelOrder.F_AddUser = UserLogin.UserId.ObjToInt();
@@ -727,9 +717,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 #endregion
 
                 //订单完成后也不计算积分
-              
 
 
+                modelOrder.F_TotlePrice += input.F_ExpressFee;//订单总额（包括快递费）
 
                 modelOrder.F_PayState = 0;
 
@@ -755,6 +745,83 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             { return Error(ex.Message); }
         }
         /// <summary>
+        /// 获取总金额
+        /// </summary>
+        /// <param name="OrderDetailList"></param>
+        /// <param name="UseActList"></param>
+        /// <returns></returns>
+        [HttpPost("getPrice")]
+        public async Task<IActionResult> GetPrice(List<OrderDetailInput> OrderDetailList
+            , List<UseActInput> UseActList,int F_ExpressFee=0)
+        {
+            decimal totle = 0.00M;
+            decimal ActivityMoney = 0.00M;
+            string UseActivity = "";
+            string UseActivity4 = ",";
+            string UseActivity2 = ",";
+            if (OrderDetailList != null && OrderDetailList.Count > 0)
+            {
+                int n = 1;
+                int n2 = OrderDetailList.Count + 1;
+                #region 活动核算
+                if (UseActList != null && UseActList.Count > 0)
+                {
+                    //遍历所有选中的活动
+                    foreach (UseActInput act in UseActList)
+                    {
+                        UseActivity += act.id + ",";
+                        
+                        if (act.type == 2)
+                        {
+                            UseActivity2 += act.gift + ",";
+                        }
+                        //满减
+                        else if (act.type == 3)
+                        {
+                            ActivityMoney += act.money;
+                        }
+                        else if (act.type == 4)
+                        {
+                            UseActivity4 += act.gift + ",";
+                        }
+                    }
+                    UseActivity = UseActivity.Trim(',');
+                }
+                #endregion
+
+                #region 商品核算
+                foreach (OrderDetailInput m in OrderDetailList)
+                {
+                    T_Bus_Product modelProduct = await bus_productRepository.GetSingle(b => b.F_ProductId == m.F_ProductId);
+                    if (modelProduct == null)
+                        return Error("商品不存在:" + m.F_ProductId);
+                    T_Bus_OrderDetail modelDetail = new T_Bus_OrderDetail();
+                    //参加活动特价
+                    if (UseActivity4.Contains("," + modelProduct.F_ProductId + ","))
+                        modelDetail.F_DealPrice = modelProduct.F_SpecialPrice;
+                    else
+                        modelDetail.F_DealPrice = modelProduct.F_MemberPrice;
+                    //参加生日
+                    if (UseActivity2.Contains("," + modelProduct.F_ProductId + ","))
+                    {
+                        modelDetail.F_DealPrice = 0.00M;
+                        modelDetail.F_Remark = "生日赠品-活动：";
+                    }
+                    modelDetail.F_TotlePrice = modelDetail.F_DealPrice * modelDetail.F_Count;
+                    totle += modelDetail.F_TotlePrice;
+                    n++;
+                }
+                #endregion
+               
+            }
+            else
+            {
+                //不改变订单
+            }
+            totle += F_ExpressFee;
+            return Success("获取成功", totle);
+        }
+        /// <summary>
         /// 提交订单 Audit payment
         /// </summary>
         /// <param name="input"></param>
@@ -990,7 +1057,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
 
         }
-    
+
         #region 
         /// <summary>
         /// 修改订单 
@@ -1109,7 +1176,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             modelOrder.F_IsPayment = input.F_IsPayment;
             if (input.F_IsPayment > 0 && input.F_PaymentMoney <= 0)
                 return Error("付款金额不能小于0");
-
+           
             //必须属性 系统生成
             modelOrder.F_AddTime = DateTime.Now;
             modelOrder.F_AddUser = UserLogin.UserId.ObjToInt();
@@ -1456,7 +1523,9 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             modelOrder.F_ExpressFee = input.F_ExpressFee;
             //    modelOrder.F_Stock = input.F_Stock;//仓库
             modelOrder.F_IsExpress = 0;
-       
+            modelOrder.F_MemberNotes = input.F_MemberNotes;//会员备注
+
+
             modelOrder.F_RealPrice = input.F_RealPrice;
             modelOrder.F_UseScore = input.F_UseScore;
             //选填 关联属性

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

@@ -40,7 +40,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         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;
@@ -71,8 +71,8 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private string _f_recommendName = "";
         private int _f_isExpress = -1;
         private int _f_ispayment = -1;
-       
-       
+        private string _f_membernotes;
+
         /// <summary>
         /// 客服是否选择快递 1已分配 0未分配
         /// </summary>
@@ -407,7 +407,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         /// <summary>
         /// 订单总额
         /// </summary>
-        public decimal? F_TotlePrice
+        public decimal F_TotlePrice
         {
             set { _f_totleprice = value; }
             get { return _f_totleprice; }
@@ -550,7 +550,15 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             get { return _f_ispayment; }
             
         }
-      
+        /// <summary>
+        /// 会员备注
+        /// </summary>
+      public string  F_MemberNotes
+        {
+            set { _f_membernotes = value; }
+            get { return _f_membernotes; }
+
+        }
         public OrderMoneyInput OrderMoney { get; set; }
         #endregion Model
 

代码/TVShoppingCallCenter_ZLJ/Startup.cs

@@ -34,6 +34,8 @@ using System.Repositories.Sys;
 using System.IRepositories.Sys;
 using System.IRepositories.Call;
 using System.Repositories.Call;
+using System.IRepositories.Cus;
+using System.Repositories.Cus;
 
 namespace TVShoppingCallCenter_ZLJ
 {
@@ -210,6 +212,7 @@ namespace TVShoppingCallCenter_ZLJ
             services.AddTransient<ICall_CallOutboundRepository, Call_CallOutboundRepository>();
             services.AddTransient<Ipoint_agentRepository, point_agentRepository>();
             services.AddTransient<ISys_BottomNumberRepository, Sys_BottomNumberRepository>();
+            services.AddTransient<ICus_MembershipRepository, Cus_MembershipRepository>();
             
             #endregion