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

代码/System.Model/T_Bus_Order.cs

@@ -27,7 +27,7 @@ namespace System.Model
 		private decimal _f_score = 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;
@@ -46,6 +46,10 @@ namespace System.Model
 		private string _f_stock = "";
 		private string _f_express = "";
 		private string _f_remark = "";
+		private string _f_adfrom = "";
+		private string _f_type = "";
+
+
 		/// <summary>
 		/// 订单编号 BJ员工工号+T+时间
 		/// </summary>
@@ -334,6 +338,24 @@ namespace System.Model
 			set { _f_remark = value; }
 			get { return _f_remark; }
 		}
+
+		/// <summary>
+		/// 广告来源
+		/// </summary>
+		public string F_ADFrom
+		{
+			set { _f_adfrom = value; }
+			get { return _f_adfrom; }
+		}
+
+		/// <summary>
+		/// 订单类型
+		/// </summary>
+		public string F_Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
 		#endregion Model
 
 	}

代码/System.Model/T_Cus_VipInfo.cs

@@ -226,6 +226,27 @@ namespace System.Model
         /// 会员类型
         /// </summary>				
         public string F_Type { get; set; }
+        //备用地址
+        /// <summary>
+		/// 备用省份
+        /// </summary>				
+        public string F_Province1 { get; set; }
+        /// <summary>
+        /// 备用城市
+        /// </summary>				
+        public string F_City1 { get; set; }
+        /// <summary>
+        /// 备用县区
+        /// </summary>				
+        public string F_Area1 { get; set; }
+        /// <summary>
+        /// 备用乡镇
+        /// </summary>				
+        public string F_Town1 { get; set; }
+        /// <summary>
+        /// 备用邮编
+        /// </summary>				
+        public string F_Postcode1 { get; set; }
         #endregion Model
     }
 }

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

@@ -9,8 +9,11 @@ using System.Collections.Generic;
 using System.Common;
 using System.IRepositories;
 using System.Linq;
+using System.Model;
+using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
+using TVShoppingCallCenter_ZLJ.Models.Inputs;
 
 namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 {
@@ -19,40 +22,114 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
     {
         IBus_OrderDetailRepository bus_OrderDetailRepository;
         IBus_OrderRepository bus_OrderRepository;
-        public OrderController(IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository)
+        ISys_MarketingRepository bus_MarketingRepository;
+        public OrderController(IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, ISys_MarketingRepository _bus_MarketingRepository)
         {
             bus_OrderDetailRepository = _bus_OrderDetailRepository;
             bus_OrderRepository = _bus_OrderRepository;
+            bus_MarketingRepository = _bus_MarketingRepository;
         }
 
 
         [HttpPost("addorder")]
-        public async Task<IActionResult> AddOrder()
+        public async Task<IActionResult> AddOrder(OrderInput input)
         {
 
-            //#region 验证 参数
-
-            //if (input.ClassId == 0)
-            //    return Error("请选择分类名称");
-            //if (string.IsNullOrEmpty(input.ProductName))
-            //    return Error("请输入产品名称");
-            //if (string.IsNullOrEmpty(input.ProductShortName))
-            //    return Error("请输入产品简写");
-            //if (string.IsNullOrEmpty(input.ProductNumber))
-            //    return Error("请输入产品条形码");
-            //if (string.IsNullOrEmpty(input.ClassName))
-            //    return Error("请选择分类名称");
-            //if (input.MarketPrice <= 0)
-            //    return Error("请输入正确市场价");
-            //if (input.MemberPrice <= 0)
-            //    return Error("请输入正确会员价");
-            //if (input.SpecialPrice <= 0)
-            //    return Error("请输入正确特惠价");
-            //if (input.ProductId <= 0)
-            //    return Error("请输入正确产品编码");
-            //if (string.IsNullOrEmpty(input.PinyinShort))
-            //    return Error("请输入正确拼音简码");
-            //#endregion
+            #region 验证参数 必填项  
+
+            if (string.IsNullOrEmpty(input.F_ADFrom))
+                return Error("请输入选择广告来源");
+            if (string.IsNullOrEmpty(input.F_Type))
+                return Error("请输入选择订单类型");
+            if (string.IsNullOrEmpty(input.F_Id))
+                return Error("请输入订单编号");
+            if (string.IsNullOrEmpty(input.F_Customer))
+                return Error("请输入客户姓名");
+            if (string.IsNullOrEmpty(input.F_CustomerPhone))
+                return Error("请输入客户电话");
+            #endregion
+
+            T_Bus_Order modelOrder = new T_Bus_Order();
+            //必填
+            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;
+            //选填 快递属性
+            modelOrder.F_TrackingNo = input.F_TrackingNo;
+            modelOrder.F_Addressee = input.F_Addressee;
+            modelOrder.F_AddPhone = input.F_AddPhone;
+            modelOrder.F_AddProvince = input.F_AddProvince;
+            modelOrder.F_AddCity = input.F_AddCity;
+            modelOrder.F_AddArea = input.F_AddArea;
+            modelOrder.F_AddTown = input.F_AddTown;
+            modelOrder.F_AddDes = input.F_AddDes;
+            modelOrder.F_Address = input.F_Address;
+            modelOrder.F_PostalCode = input.F_PostalCode;
+            modelOrder.F_Express = input.F_Express;
+
+            modelOrder.F_PayType = input.F_PayType;
+            modelOrder.F_Stock = input.F_Stock;
+            modelOrder.F_Remark = input.F_Remark;
+
+            //选填 关联属性
+            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);
+            modelOrder.F_AddUserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
+
+            //计算属性  商品计算
+            decimal F_Score = 0;
+            decimal totle = 0.00M;
+            decimal F_ShouldPrice = 0.00M; ;
+            decimal F_RealPrice = 0.00M;
+            List<T_Bus_OrderDetail> modelDetailList = new List<T_Bus_OrderDetail>();
+            if (input.OrderDetail != null && input.OrderDetail.Count > 0)
+            {
+                int n = 1;
+                foreach (OrderDetailInput m in input.OrderDetail)
+                {
+                    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 = m.F_Count;
+                    modelDetail.F_Price = m.F_Price;
+                    modelDetail.F_DealPrice = m.F_DealPrice;                   
+                    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;
+
+                    totle += modelDetail.F_TotlePrice;
+
+                    n++;
+                }
+
+
+            }
+            F_ShouldPrice = totle;
+            //计算活动  单独写个方法
+            if (modelOrder.F_UseActivity > 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);
@@ -64,16 +141,22 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
 
             //List<ProductInput> inputlist = new List<ProductInput>();
             //inputlist.Add(input);
-            //if (await AddProductFun(inputlist))
-            //{
-            //    return Success("新增商品成功");
-            //}
-            //else
-            //{
-            //    return Error("新增商品失败,请重试！");
-            //}
+            if (await bus_OrderRepository.Add(modelOrder) > 0)
+            {
+                return Success("订单保存成功");
+            }
+            else
+            {
+                return Error("订单保存失败,请重试！");
+            }
 
-            return Success("订单保存成功");
+        }
+        private async void UserActivity(int VipId,int ActivityId,decimal TotlePrice)
+        {
+            T_Sys_Marketing modelAct= await  bus_MarketingRepository.GetSingle(q=>q.F_ID== ActivityId);
+            // 查看活动具体细则， 把所有活动细则实现   此活动是针对订单的活动   
+            //活动如果针对商品的话  1.一个订单只能选一个活动还是针对商品选择活动   这种需要循环订单详情判断
+            TotlePrice = 0;
         }
     }
 }

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

@@ -0,0 +1,134 @@
+using System;
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
+{
+	/// <summary>
+	/// 订单详情表
+	/// </summary>
+	[Serializable]
+	public partial class OrderDetailInput
+	{
+		public OrderDetailInput()
+		{ }
+		#region Model
+		private string _f_id;
+		private int _f_sort = 1;
+		private string _f_orderid;
+		private int _f_productid;
+		private string _f_productname = "";
+		private decimal _f_price;
+		private decimal _f_dealprice;
+		private int _f_count = 1;
+		private decimal _f_totleprice;
+		private DateTime _f_addtime;
+		private int _f_adduser;
+		private string _f_addusername;
+		private string _f_remark = "";
+		/// <summary>
+		/// 订单详情Id
+		/// </summary>
+		public string F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 排序，单个订单商品的排序
+		/// </summary>
+		public int F_Sort
+		{
+			set { _f_sort = value; }
+			get { return _f_sort; }
+		}
+		/// <summary>
+		/// 订单Id
+		/// </summary>
+		public string F_OrderId
+		{
+			set { _f_orderid = value; }
+			get { return _f_orderid; }
+		}
+		/// <summary>
+		/// 产品编号
+		/// </summary>
+		public int F_ProductId
+		{
+			set { _f_productid = value; }
+			get { return _f_productid; }
+		}
+		/// <summary>
+		/// 产品名称
+		/// </summary>
+		public string F_ProductName
+		{
+			set { _f_productname = value; }
+			get { return _f_productname; }
+		}
+		/// <summary>
+		/// 单价，优先显示可用最低价会员价
+		/// </summary>
+		public decimal F_Price
+		{
+			set { _f_price = value; }
+			get { return _f_price; }
+		}
+		/// <summary>
+		/// 成交单价（一般在会员价和特惠价中间）
+		/// </summary>
+		public decimal F_DealPrice
+		{
+			set { _f_dealprice = value; }
+			get { return _f_dealprice; }
+		}
+		/// <summary>
+		/// 数量
+		/// </summary>
+		public int F_Count
+		{
+			set { _f_count = value; }
+			get { return _f_count; }
+		}
+		/// <summary>
+		/// 小计总计
+		/// </summary>
+		public decimal F_TotlePrice
+		{
+			set { _f_totleprice = value; }
+			get { return _f_totleprice; }
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 
+		/// </summary>
+		public int F_AddUser
+		{
+			set { _f_adduser = value; }
+			get { return _f_adduser; }
+		}
+		/// <summary>
+		/// 添加人姓名
+		/// </summary>
+		public string F_AddUserName
+		{
+			set { _f_addusername = value; }
+			get { return _f_addusername; }
+		}
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string F_Remark
+		{
+			set { _f_remark = value; }
+			get { return _f_remark; }
+		}
+		#endregion Model
+
+	}
+}
+

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

@@ -0,0 +1,366 @@
+using System;
+using System.Collections.Generic;
+
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
+{
+	/// <summary>
+	///  订单表
+	/// </summary>
+	[Serializable]
+	public partial class OrderInput
+	{
+		public OrderInput()
+		{ }
+		#region Model
+		private string _f_id;
+		private string _f_trackingno = "";
+		private string _f_addressee = "";
+		private string _f_addphone = "";
+		private string _f_addprovince = "";
+		private string _f_addcity = "";
+		private string _f_addarea = "";
+		private string _f_addtown = "";
+		private string _f_adddes = "";
+		private string _f_address = "";
+		private string _f_postalcode = "";
+		private string _f_customer;
+		private string _f_customerphone = "";
+		private int _f_vipid;
+		private decimal _f_score = 0.00M;
+		private int _f_state = 0;
+		private int _f_status = 0;
+		private DateTime _f_addtime=DateTime.Now;
+		private DateTime? _f_submittime;
+		private DateTime? _f_checktime;
+		private DateTime? _f_stocktime;
+		private DateTime? _f_sendtime;
+		private DateTime? _f_paytime;
+		private DateTime? _f_finishtime;
+		private int _f_adduser;
+		private string _f_addusername;
+		private int _f_belong;
+		private string _f_belongname;
+		private decimal? _f_totleprice;
+		private int _f_useactivity = 0;
+		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 = "";
+		public List<OrderDetailInput> OrderDetail { get; set; }
+
+	
+		/// <summary>
+		/// 订单编号 BJ员工工号+T+时间
+		/// </summary>
+		public string F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 运单号 发货后输入
+		/// </summary>
+		public string F_TrackingNo
+		{
+			set { _f_trackingno = value; }
+			get { return _f_trackingno; }
+		}
+		/// <summary>
+		/// 收件人
+		/// </summary>
+		public string F_Addressee
+		{
+			set { _f_addressee = value; }
+			get { return _f_addressee; }
+		}
+		/// <summary>
+		/// 收件人电话
+		/// </summary>
+		public string F_AddPhone
+		{
+			set { _f_addphone = value; }
+			get { return _f_addphone; }
+		}
+		/// <summary>
+		/// 收件人省
+		/// </summary>
+		public string F_AddProvince
+		{
+			set { _f_addprovince = value; }
+			get { return _f_addprovince; }
+		}
+		/// <summary>
+		/// 收件人  市
+		/// </summary>
+		public string F_AddCity
+		{
+			set { _f_addcity = value; }
+			get { return _f_addcity; }
+		}
+		/// <summary>
+		/// 收件人 区/县
+		/// </summary>
+		public string F_AddArea
+		{
+			set { _f_addarea = value; }
+			get { return _f_addarea; }
+		}
+		/// <summary>
+		/// 乡镇 街道（看情况启用）
+		/// </summary>
+		public string F_AddTown
+		{
+			set { _f_addtown = value; }
+			get { return _f_addtown; }
+		}
+		/// <summary>
+		/// 送货说明
+		/// </summary>
+		public string F_AddDes
+		{
+			set { _f_adddes = value; }
+			get { return _f_adddes; }
+		}
+		/// <summary>
+		/// 收件人详细地址 区 县 下面详细地址
+		/// </summary>
+		public string F_Address
+		{
+			set { _f_address = value; }
+			get { return _f_address; }
+		}
+		/// <summary>
+		/// 邮政编码
+		/// </summary>
+		public string F_PostalCode
+		{
+			set { _f_postalcode = value; }
+			get { return _f_postalcode; }
+		}
+		/// <summary>
+		/// 客户姓名
+		/// </summary>
+		public string F_Customer
+		{
+			set { _f_customer = value; }
+			get { return _f_customer; }
+		}
+		/// <summary>
+		/// 客户电话/进线电话
+		/// </summary>
+		public string F_CustomerPhone
+		{
+			set { _f_customerphone = value; }
+			get { return _f_customerphone; }
+		}
+		/// <summary>
+		/// 关联会员表Id
+		/// </summary>
+		public int F_VipId
+		{
+			set { _f_vipid = value; }
+			get { return _f_vipid; }
+		}
+		/// <summary>
+		/// 此单积分
+		/// </summary>
+		public decimal F_Score
+		{
+			set { _f_score = value; }
+			get { return _f_score; }
+		}
+		/// <summary>
+		/// 订单状态 -1无效 0暂存 其他待定
+		/// </summary>
+		public int F_State
+		{
+			set { _f_state = value; }
+			get { return _f_state; }
+		}
+		/// <summary>
+		/// 0绩效状态
+		/// </summary>
+		public int F_Status
+		{
+			set { _f_status = value; }
+			get { return _f_status; }
+		}
+		/// <summary>
+		/// 订单添加时间
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 订单提交审核时间
+		/// </summary>
+		public DateTime? F_SubmitTime
+		{
+			set { _f_submittime = value; }
+			get { return _f_submittime; }
+		}
+		/// <summary>
+		/// 客服审核时间
+		/// </summary>
+		public DateTime? F_CheckTime
+		{
+			set { _f_checktime = value; }
+			get { return _f_checktime; }
+		}
+		/// <summary>
+		/// 仓库分拣时间/仓库退回时间
+		/// </summary>
+		public DateTime? F_StockTime
+		{
+			set { _f_stocktime = value; }
+			get { return _f_stocktime; }
+		}
+		/// <summary>
+		/// 出库发货时间
+		/// </summary>
+		public DateTime? F_SendTime
+		{
+			set { _f_sendtime = value; }
+			get { return _f_sendtime; }
+		}
+		/// <summary>
+		/// 支付完成时间 不一定时效准确，因为是操作员操作，状态准确
+		/// </summary>
+		public DateTime? F_PayTime
+		{
+			set { _f_paytime = value; }
+			get { return _f_paytime; }
+		}
+		/// <summary>
+		/// 订单完成时间  需有标准，完成之后原则上状态不变
+		/// </summary>
+		public DateTime? F_FinishTime
+		{
+			set { _f_finishtime = value; }
+			get { return _f_finishtime; }
+		}
+		/// <summary>
+		/// 订单添加人
+		/// </summary>
+		public int F_AddUser
+		{
+			set { _f_adduser = value; }
+			get { return _f_adduser; }
+		}
+		/// <summary>
+		/// 订单添加人
+		/// </summary>
+		public string F_AddUserName
+		{
+			set { _f_addusername = value; }
+			get { return _f_addusername; }
+		}
+		/// <summary>
+		/// 订单所属人 算绩效
+		/// </summary>
+		public int F_Belong
+		{
+			set { _f_belong = value; }
+			get { return _f_belong; }
+		}
+		/// <summary>
+		/// 订单所属人  算绩效
+		/// </summary>
+		public string F_BelongName
+		{
+			set { _f_belongname = value; }
+			get { return _f_belongname; }
+		}
+		/// <summary>
+		/// 订单总额
+		/// </summary>
+		public decimal? F_TotlePrice
+		{
+			set { _f_totleprice = value; }
+			get { return _f_totleprice; }
+		}
+		/// <summary>
+		/// 使用营销活动
+		/// </summary>
+		public int F_UseActivity
+		{
+			set { _f_useactivity = value; }
+			get { return _f_useactivity; }
+		}
+		/// <summary>
+		/// 应收金额 交易金额
+		/// </summary>
+		public decimal? F_ShouldPrice
+		{
+			set { _f_shouldprice = value; }
+			get { return _f_shouldprice; }
+		}
+		/// <summary>
+		/// 实收金额
+		/// </summary>
+		public decimal? F_RealPrice
+		{
+			set { _f_realprice = value; }
+			get { return _f_realprice; }
+		}
+		/// <summary>
+		/// 付款方式：货到付款
+		/// </summary>
+		public string F_PayType
+		{
+			set { _f_paytype = value; }
+			get { return _f_paytype; }
+		}
+		/// <summary>
+		/// 出货仓库
+		/// </summary>
+		public string F_Stock
+		{
+			set { _f_stock = value; }
+			get { return _f_stock; }
+		}
+		/// <summary>
+		/// 选择快递
+		/// </summary>
+		public string F_Express
+		{
+			set { _f_express = value; }
+			get { return _f_express; }
+		}
+		/// <summary>
+		/// 备注
+		/// </summary>
+		public string F_Remark
+		{
+			set { _f_remark = value; }
+			get { return _f_remark; }
+		}
+
+		/// <summary>
+		/// 广告来源
+		/// </summary>
+		public string F_ADFrom
+		{
+			set { _f_adfrom = value; }
+			get { return _f_adfrom; }
+		}
+
+		/// <summary>
+		/// 订单类型
+		/// </summary>
+		public string F_Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
+		#endregion Model
+
+	}
+}
+