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

代码/System.IRepositories/IBus_AfterSaleRepository.cs

@@ -0,0 +1,10 @@
+using System.Common;
+using System;
+using System.Model;
+
+namespace System.IRepositories
+{
+    public interface IBus_AfterSaleRepository : IRepository<T_Bus_AfterSale>
+    {
+    }
+}

代码/System.Model/T_Bus_AfterSale.cs

@@ -0,0 +1,242 @@
+using System;
+namespace System.Model
+{
+	/// <summary>
+	/// 订单售后表
+	/// </summary>
+	[Serializable]
+	public partial class T_Bus_AfterSale
+	{
+		public T_Bus_AfterSale()
+		{ }
+		#region Model
+		private string _f_id;
+		private string _f_orderid;
+		private DateTime _f_addtime;
+		private int _f_type = 0;
+		private int _f_checkstatexs = 0;
+		private DateTime? _f_checktimexs;
+		private int _f_checkuserxs = 0;
+		private string _f_checkusernamexs = "";
+		private int _f_checkstatesh = 0;
+		private DateTime? _f_checktimesh;
+		private int _f_checkusersh = 0;
+		private string _f_checkusernamesh = "";
+		private string _f_detaillist = "";
+		private string _f_trackingno = "";
+		private string _f_trackdes = "";
+		private string _f_ourtrackingno = "";
+		private string _f_ourtrackdes = "";
+		private decimal _f_money = 0M;
+		private int _f_state = 0;
+		private int _f_checkstatekg;
+		private DateTime? _f_checktimekg;
+		private int _f_checkuserkg = 0;
+		private string _f_checkusernamekg = "";
+		private string _f_remark = "";
+		private string _f_aboutorderid = "";
+		/// <summary>
+		/// 售后编号
+		/// </summary>
+		public string F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 订单ID
+		/// </summary>
+		public string F_OrderId
+		{
+			set { _f_orderid = value; }
+			get { return _f_orderid; }
+		}
+		/// <summary>
+		/// 添加时间
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 售后状态 1调换货 2退货 3部分退货 4对发货
+		/// </summary>
+		public int F_Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
+		/// <summary>
+		/// 0未审核1审核通过2审核不通过
+		/// </summary>
+		public int F_CheckStateXS
+		{
+			set { _f_checkstatexs = value; }
+			get { return _f_checkstatexs; }
+		}
+		/// <summary>
+		/// 销售审核完成时间
+		/// </summary>
+		public DateTime? F_CheckTimeXS
+		{
+			set { _f_checktimexs = value; }
+			get { return _f_checktimexs; }
+		}
+		/// <summary>
+		/// 销售操作人
+		/// </summary>
+		public int F_CheckUserXS
+		{
+			set { _f_checkuserxs = value; }
+			get { return _f_checkuserxs; }
+		}
+		/// <summary>
+		/// 销售姓名
+		/// </summary>
+		public string F_CheckUserNameXS
+		{
+			set { _f_checkusernamexs = value; }
+			get { return _f_checkusernamexs; }
+		}
+		/// <summary>
+		/// 售后审核状态 0未审核1审核通过2审核不通过
+		/// </summary>
+		public int F_CheckStateSH
+		{
+			set { _f_checkstatesh = value; }
+			get { return _f_checkstatesh; }
+		}
+		/// <summary>
+		/// 售后审核完成时间
+		/// </summary>
+		public DateTime? F_CheckTimeSH
+		{
+			set { _f_checktimesh = value; }
+			get { return _f_checktimesh; }
+		}
+		/// <summary>
+		/// 售后操作人
+		/// </summary>
+		public int F_CheckUserSH
+		{
+			set { _f_checkusersh = value; }
+			get { return _f_checkusersh; }
+		}
+		/// <summary>
+		/// 售后姓名
+		/// </summary>
+		public string F_CheckUserNameSH
+		{
+			set { _f_checkusernamesh = value; }
+			get { return _f_checkusernamesh; }
+		}
+		/// <summary>
+		/// 产品列表
+		/// </summary>
+		public string F_DetailList
+		{
+			set { _f_detaillist = value; }
+			get { return _f_detaillist; }
+		}
+		/// <summary>
+		/// 运单号
+		/// </summary>
+		public string F_TrackingNo
+		{
+			set { _f_trackingno = value; }
+			get { return _f_trackingno; }
+		}
+		/// <summary>
+		/// 运单跟踪
+		/// </summary>
+		public string F_TrackDes
+		{
+			set { _f_trackdes = value; }
+			get { return _f_trackdes; }
+		}
+		/// <summary>
+		/// 对发货 我们的运单号
+		/// </summary>
+		public string F_OurTrackingNo
+		{
+			set { _f_ourtrackingno = value; }
+			get { return _f_ourtrackingno; }
+		}
+		/// <summary>
+		/// 我们的运单跟踪
+		/// </summary>
+		public string F_OurTrackDes
+		{
+			set { _f_ourtrackdes = value; }
+			get { return _f_ourtrackdes; }
+		}
+		/// <summary>
+		/// 需要变动金额 正用户需要补交金额  负 需要退给用户金额
+		/// </summary>
+		public decimal F_Money
+		{
+			set { _f_money = value; }
+			get { return _f_money; }
+		}
+		/// <summary>
+		/// 售后状态-1无效0未完成1已完成  主要涉及财务退款（新订单生成）操作
+		/// </summary>
+		public int F_State
+		{
+			set { _f_state = value; }
+			get { return _f_state; }
+		}
+		/// <summary>
+		/// 0未审核
+		/// </summary>
+		public int F_CheckStateKG
+		{
+			set { _f_checkstatekg = value; }
+			get { return _f_checkstatekg; }
+		}
+		/// <summary>
+		/// 库管审核1收到货（根据状态自动创建订单）2货物不符3未收到货
+		/// </summary>
+		public DateTime? F_CheckTimeKG
+		{
+			set { _f_checktimekg = value; }
+			get { return _f_checktimekg; }
+		}
+		/// <summary>
+		/// 库管操作人
+		/// </summary>
+		public int F_CheckUserKG
+		{
+			set { _f_checkuserkg = value; }
+			get { return _f_checkuserkg; }
+		}
+		/// <summary>
+		/// 库管姓名
+		/// </summary>
+		public string F_CheckUserNameKG
+		{
+			set { _f_checkusernamekg = value; }
+			get { return _f_checkusernamekg; }
+		}
+		/// <summary>
+		/// 所有人备注信息综合累加
+		/// </summary>
+		public string F_Remark
+		{
+			set { _f_remark = value; }
+			get { return _f_remark; }
+		}
+		/// <summary>
+		/// 售后发出关联订单
+		/// </summary>
+		public string F_AboutOrderId
+		{
+			set { _f_aboutorderid = value; }
+			get { return _f_aboutorderid; }
+		}
+		#endregion Model
+
+	}
+}
+

代码/System.Model/T_Bus_Order.cs

@@ -62,7 +62,17 @@ namespace System.Model
 		private string _f_sendusername = "";
 		private decimal _f_expressfee = 10.00M;
 		private decimal _f_mrgemoney = 0.00M;
-		
+		private string _f_afterSaleId = "";
+
+
+		/// <summary>
+		/// 审核备注
+		/// </summary>
+		public string F_AfterSaleId
+		{
+			set { _f_afterSaleId = value; }
+			get { return _f_afterSaleId; }
+		}
 		/// <summary>
 		/// 合并订单变动金额
 		/// </summary>
@@ -228,7 +238,7 @@ namespace System.Model
 			get { return _f_usescore; }
 		}
 		/// <summary>
-		///  -1无效 0暂存 1提交  2退回  3通过
+		///  订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4无货 5已分拣 6已发货
 		/// </summary>
 		public int F_State
 		{
@@ -236,7 +246,7 @@ namespace System.Model
 			get { return _f_state; }
 		}
 		/// <summary>
-		/// 0绩效状态
+		/// 物流状态0 未发出 1物流运送中2签收3改代收4拒收
 		/// </summary>
 		public int F_Status
 		{

代码/System.Model/T_Bus_OrderDetail.cs

@@ -24,6 +24,17 @@ namespace System.Model
 		private string _f_addusername;
 		private string _f_remark = "";
 		private int _f_activity;
+		private int _f_state=0;
+
+		/// <summary>
+		/// 0正常1售后
+		/// </summary>
+		public int F_State
+		{
+			set { _f_state = value; }
+			get { return _f_state; }
+		}
+		
 		/// <summary>
 		/// 订单详情Id
 		/// </summary>

代码/System.Model/T_Bus_ProductClass.cs

@@ -11,7 +11,7 @@ namespace System.Model
 		{ }
 		#region Model
 		private int _f_classid;
-		private int? _f_parentid = 0;
+		private int _f_parentid = 0;
 		private string _f_classname = "";
 		private string _f_classshortname = "";
 		private DateTime? _f_addtime = DateTime.Now;
@@ -30,7 +30,7 @@ namespace System.Model
 		/// <summary>
 		/// 上级分类 0顶级
 		/// </summary>
-		public int? F_ParentId
+		public int F_ParentId
 		{
 			set { _f_parentid = value; }
 			get { return _f_parentid; }

代码/System.Repositories/Bus_AfterSaleRepository.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.IRepositories;
+using System.Model;
+using System.Common;
+namespace System.Repositories
+{
+    public class Bus_AfterSaleRepository : BaseRepository<T_Bus_AfterSale>, IBus_AfterSaleRepository
+    {
+    }
+
+}

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

@@ -0,0 +1,539 @@
+/* =============================================
+-- Author:		<Author,,zhangkun>
+-- Create date: <Create Date,,20200713>
+-- Description:	<Description,,订单售后操作）>
+-- ============================================*/
+
+using System;
+using System.Collections.Generic;
+using System.Common;
+using System.Common.Helpers;
+using System.Data;
+using System.IRepositories;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Model;
+using System.Repositories;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using System.Utility.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages.Infrastructure;
+using Microsoft.Extensions.Configuration;
+using SqlSugar;
+using TVShoppingCallCenter_ZLJ.Models.Inputs;
+
+namespace TVShoppingCallCenter_ZLJ.Controllers.Order
+{
+    [Route("api/[controller]")]
+    public class AfterSaleController : BaseController
+    {
+        private readonly IBus_OrderDetailRepository bus_OrderDetailRepository;
+        private readonly IBus_OrderRepository bus_OrderRepository;
+        private readonly OrderController orderController;
+        private readonly IBus_ProductRepository bus_productRepository;
+        private readonly ICus_VipInfoRepository cus_vip_infoRepository;
+        private readonly IBus_OrderMergeRepository busOrderMergeRepository;
+        private readonly ICus_ScoreSetRepository cus_score_setRepository;
+        private readonly IBus_AfterSaleRepository busAfterSaleRepository;
+        public AfterSaleController(ICus_ScoreSetRepository _cus_score_setRepository, IBus_OrderMergeRepository _busOrderMergeRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, OrderController _orderController, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IBus_AfterSaleRepository _busAfterSaleRepository)
+        {
+            bus_OrderDetailRepository = _bus_OrderDetailRepository;
+            bus_OrderRepository = _bus_OrderRepository;
+            orderController = _orderController;
+            bus_productRepository = _productRepository;
+            cus_vip_infoRepository = _cus_vip_infoRepository;
+            busOrderMergeRepository = _busOrderMergeRepository;
+            cus_score_setRepository = _cus_score_setRepository;
+            busAfterSaleRepository = _busAfterSaleRepository;
+        }
+
+        #region 销售操作
+
+        /// <summary>
+        /// 销售申请售后
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("addaftersalexs")]
+        public async Task<IActionResult> AddAfterSaleXS(AfterSaleInput input)
+        {
+            try
+            {
+                #region 验证参数 必填项  
+
+                if (string.IsNullOrEmpty(input.F_OrderId))
+                    return Error("请选择订单");
+              
+                if (input.F_Type <=0)
+                    return Error("申请类型不符合售后");
+
+                #endregion
+
+                #region 验证逻辑
+                if (input.F_Type == 1)
+                { }
+                else if (input.F_Type == 2)
+                { }
+                else if (input.F_Type == 3)
+                { }
+                else if (input.F_Type == 4)
+                { }
+                #endregion
+                T_Bus_Order modeOrder = await bus_OrderRepository.GetSingle(q => q.F_Id == input.F_OrderId);
+                if (modeOrder == null)
+                {
+                    return Error("订单不存在");
+                }
+                else if (modeOrder.F_Status == -1)
+                {
+                    //物流状态0 未发出 1物流运送中2签收3改代收4拒收
+                    return Error("状态不符合售后");
+                }
+                T_Bus_AfterSale modelAfterSale = new T_Bus_AfterSale();
+                modelAfterSale.F_AddTime = DateTime.Now;
+                modelAfterSale.F_CheckTimeXS = DateTime.Now;
+                modelAfterSale.F_CheckStateXS = input.F_CheckStateXS;
+                modelAfterSale.F_CheckUserXS = UserLogin.UserId.ObjToInt();
+                modelAfterSale.F_CheckUserNameXS = UserLogin.UserName;
+
+                modelAfterSale.F_DetailList = input.F_DetailList;
+                modelAfterSale.F_Type = input.F_Type;
+                modelAfterSale.F_Money = input.F_Money;
+                modelAfterSale.F_OrderId = input.F_OrderId;
+                modelAfterSale.F_AboutOrderId = "";
+                modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
+                //modelAfterSale.F_OurTrackingNo = input.F_OurTrackingNo;
+                //modelAfterSale.F_OurTrackDes = input.F_OurTrackDes;
+                //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
+                //modelAfterSale.F_TrackDes = input.F_TrackDes;
+                if(!string.IsNullOrEmpty(input.F_Remark))
+                    modelAfterSale.F_Remark =" 销售："+ input.F_Remark;
+
+
+                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
+                //modelAfterSale.F_AddUserName = UserLogin.UserName;
+                //modelAfterSale.F_State = input.F_State;
+                //modelAfterSale.F_Money = input.F_Money;
+                //modelAfterSale.F_Gift = input.F_Gift;
+                //modelAfterSale.F_Type = input.F_Type;
+                //modelAfterSale.F_OrderList = input.F_OrderList;
+                //modelAfterSale.F_Remark = input.F_Remark;
+                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
+                if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
+                {
+                    if (input.F_State == 0)
+                        return Success("售后申请已保存");
+                    else if (input.F_State == 1)
+                    { return Success("售后申请已提交审核"); }
+                }
+                return Error("申请失败,请重试！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+
+
+        }
+
+        /// <summary>
+        /// 销售编辑售后
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("editaftersalexs")]
+        public async Task<IActionResult> EditAfterSaleXS(AfterSaleInput input)
+        {
+            try
+            {
+                #region 验证参数 必填项  
+
+                if (string.IsNullOrEmpty(input.F_Id))
+                    return Error("参数缺失Id");
+
+                if (string.IsNullOrEmpty(input.F_OrderId))
+                    return Error("请选择订单");
+
+                if (input.F_Type <= 0)
+                    return Error("申请类型不符合售后");
+
+                #endregion
+
+                #region 验证逻辑
+                if (input.F_Type == 1)
+                { }
+                else if (input.F_Type == 2)
+                { }
+                else if (input.F_Type == 3)
+                { }
+                else if (input.F_Type == 4)
+                { }
+                #endregion
+
+                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q=>q.F_Id==input.F_Id);
+
+                if (modelAfterSale.F_CheckStateSH == 1 && modelAfterSale.F_CheckStateXS == 1)
+                {
+                    return Error("双审核通过不能编辑");                    
+                }
+                modelAfterSale.F_CheckTimeXS = DateTime.Now;
+                modelAfterSale.F_CheckStateXS = input.F_CheckStateXS;
+                modelAfterSale.F_CheckUserXS = UserLogin.UserId.ObjToInt();
+                modelAfterSale.F_CheckUserNameXS = UserLogin.UserName;
+
+                modelAfterSale.F_DetailList = input.F_DetailList;
+                modelAfterSale.F_Type = input.F_Type;
+                modelAfterSale.F_Money = input.F_Money;
+
+                modelAfterSale.F_CheckStateSH = 0;//需要售后重新审核
+                //modelAfterSale.F_OurTrackingNo = input.F_OurTrackingNo;
+                //modelAfterSale.F_OurTrackDes = input.F_OurTrackDes;
+                //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
+                //modelAfterSale.F_TrackDes = input.F_TrackDes;
+                if (!string.IsNullOrEmpty(input.F_Remark))
+                    modelAfterSale.F_Remark = modelAfterSale.F_Remark+"\\r\\n 销售："+input.F_Remark;
+
+
+                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
+                //modelAfterSale.F_AddUserName = UserLogin.UserName;
+                //modelAfterSale.F_State = input.F_State;
+                //modelAfterSale.F_Money = input.F_Money;
+                //modelAfterSale.F_Gift = input.F_Gift;
+                //modelAfterSale.F_Type = input.F_Type;
+                //modelAfterSale.F_OrderList = input.F_OrderList;
+                //modelAfterSale.F_Remark = input.F_Remark;
+                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
+                if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
+                {
+                    if (input.F_State == 0)
+                        return Success("售后申请已保存");
+                    else if (input.F_State == 1)
+                    { return Success("售后申请已提交审核"); }
+                }
+                return Error("申请失败,请重试！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+
+
+        }
+
+        /// <summary>
+        /// 销售删除
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("deleteaftersalexs")]
+        public async Task<IActionResult> DeleteAfterSaleXS(string ids)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(ids))
+                {
+                    return Error("参数缺失：" + ids);
+                }
+                string[] idlist = ids.Split(',');
+
+                if (await busAfterSaleRepository.Delete(q => idlist.Contains(q.F_Id) && new[] { 0, 2 }.Contains(q.F_CheckStateXS)))
+                {
+                    return Success("删除成功/已审核通过不能删除");
+                }
+                return Error("删除失败,请重试！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+        }
+
+        /// <summary>
+        /// 根据分页获取列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getaftersalebypagexs")]
+        public async Task<IActionResult> GetAfterSaleByPageXS(AfterSaleInput input)
+        {
+
+            #region  拼接条件
+
+            Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_CheckUserXS == UserLogin.UserId.ObjToInt();
+
+
+            if (input.F_CheckStateXS>-1)
+            {
+                eq = eq.And(a => a.F_CheckStateXS == input.F_CheckStateXS);
+            }
+            if (input.F_CheckStateSH > -1)
+            {
+                eq = eq.And(a => a.F_CheckStateSH == input.F_CheckStateSH);
+            }
+            if (input.F_Type > -1)
+            {
+                eq = eq.And(a => a.F_Type == input.F_Type);
+            }
+            if (!string.IsNullOrEmpty(input.F_Id))
+            {
+                eq = eq.And(a => a.F_Id == input.F_Id);
+            }
+            if (input.F_State >= -1)
+            {
+                eq = eq.And(a => a.F_State == input.F_State);
+            }
+
+            #endregion
+            RefAsync<int> count = 0;
+            PageData<T_Bus_AfterSale> list = await busAfterSaleRepository.GetListByPage(eq, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = count }, " F_AddTime DESC");
+
+            return Success("成功", list);
+
+        }
+
+        #endregion
+
+        #region 售后操作
+
+        /// <summary>
+        /// 销售申请售后
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("addaftersalesh")]
+        public async Task<IActionResult> AddAfterSaleSH(AfterSaleInput input)
+        {
+            try
+            {
+                #region 验证参数 必填项  
+
+                if (string.IsNullOrEmpty(input.F_OrderId))
+                    return Error("请选择订单");
+
+                if (input.F_Type <= 0)
+                    return Error("申请类型不符合售后");
+
+                #endregion
+
+                #region 验证逻辑
+                if (input.F_Type == 1)
+                { }
+                else if (input.F_Type == 2)
+                { }
+                else if (input.F_Type == 3)
+                { }
+                else if (input.F_Type == 4)
+                { }
+                #endregion
+                T_Bus_Order modeOrder =await bus_OrderRepository.GetSingle(q=>q.F_Id== input.F_OrderId);
+                if (modeOrder == null)
+                {
+                    return Error("订单不存在");
+                }
+                else if (modeOrder.F_Status==-1)
+                {
+                    //物流状态0 未发出 1物流运送中2签收3改代收4拒收
+                    return Error("状态不符合售后");
+                }
+                T_Bus_AfterSale modelAfterSale = new T_Bus_AfterSale();
+                modelAfterSale.F_AddTime = DateTime.Now;
+                modelAfterSale.F_CheckTimeSH = DateTime.Now;
+                modelAfterSale.F_CheckStateSH = input.F_CheckStateXS;
+                modelAfterSale.F_CheckUserSH = UserLogin.UserId.ObjToInt();
+                modelAfterSale.F_CheckUserNameSH = UserLogin.UserName;
+
+                modelAfterSale.F_CheckUserXS = modeOrder.F_AddUser;
+
+                modelAfterSale.F_DetailList = input.F_DetailList;
+                modelAfterSale.F_Type = input.F_Type;
+                modelAfterSale.F_Money = input.F_Money;
+                modelAfterSale.F_OrderId = input.F_OrderId;
+                modelAfterSale.F_AboutOrderId = "";
+                modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
+                //modelAfterSale.F_OurTrackingNo = input.F_OurTrackingNo;
+                //modelAfterSale.F_OurTrackDes = input.F_OurTrackDes;
+                //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
+                //modelAfterSale.F_TrackDes = input.F_TrackDes;
+                if (!string.IsNullOrEmpty(input.F_Remark))
+                    modelAfterSale.F_Remark = " 售后：" + input.F_Remark;
+
+
+                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
+                //modelAfterSale.F_AddUserName = UserLogin.UserName;
+                //modelAfterSale.F_State = input.F_State;
+                //modelAfterSale.F_Money = input.F_Money;
+                //modelAfterSale.F_Gift = input.F_Gift;
+                //modelAfterSale.F_Type = input.F_Type;
+                //modelAfterSale.F_OrderList = input.F_OrderList;
+                //modelAfterSale.F_Remark = input.F_Remark;
+                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
+                if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
+                {
+                    if (input.F_State == 0)
+                        return Success("售后申请已保存");
+                    else if (input.F_State == 1)
+                    { return Success("售后申请已提交审核"); }
+                }
+                return Error("申请失败,请重试！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+
+
+        }
+
+        /// <summary>
+        /// 销售编辑售后
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("editaftersalesh")]
+        public async Task<IActionResult> EditAfterSaleSH(AfterSaleInput input)
+        {
+            try
+            {
+                #region 验证参数 必填项  
+
+                if (string.IsNullOrEmpty(input.F_Id))
+                    return Error("参数缺失Id");
+
+                if (string.IsNullOrEmpty(input.F_OrderId))
+                    return Error("请选择订单");
+
+                if (input.F_Type <= 0)
+                    return Error("申请类型不符合售后");
+
+                #endregion
+
+                #region 验证逻辑
+                if (input.F_Type == 1)
+                { }
+                else if (input.F_Type == 2)
+                { }
+                else if (input.F_Type == 3)
+                { }
+                else if (input.F_Type == 4)
+                { }
+                #endregion
+
+                T_Bus_AfterSale modelAfterSale = await busAfterSaleRepository.GetSingle(q => q.F_Id == input.F_Id);
+
+                if (modelAfterSale.F_CheckStateSH == 1 && modelAfterSale.F_CheckStateXS == 1)
+                {
+                    return Error("双审核通过不能编辑");
+                }
+                modelAfterSale.F_CheckTimeXS = DateTime.Now;
+                modelAfterSale.F_CheckStateXS = input.F_CheckStateXS;
+                modelAfterSale.F_CheckUserXS = UserLogin.UserId.ObjToInt();
+                modelAfterSale.F_CheckUserNameXS = UserLogin.UserName;
+
+                modelAfterSale.F_DetailList = input.F_DetailList;
+                modelAfterSale.F_Type = input.F_Type;
+                modelAfterSale.F_Money = input.F_Money;
+
+                modelAfterSale.F_CheckStateSH = 0;//需要售后重新审核
+                //modelAfterSale.F_OurTrackingNo = input.F_OurTrackingNo;
+                //modelAfterSale.F_OurTrackDes = input.F_OurTrackDes;
+                //modelAfterSale.F_TrackingNo = input.F_TrackingNo;
+                //modelAfterSale.F_TrackDes = input.F_TrackDes;
+                if (!string.IsNullOrEmpty(input.F_Remark))
+                    modelAfterSale.F_Remark = modelAfterSale.F_Remark + "\\r\\n 售后：" + input.F_Remark;
+
+
+                //modelAfterSale.F_AddUser = UserLogin.UserId.ObjToInt();
+                //modelAfterSale.F_AddUserName = UserLogin.UserName;
+                //modelAfterSale.F_State = input.F_State;
+                //modelAfterSale.F_Money = input.F_Money;
+                //modelAfterSale.F_Gift = input.F_Gift;
+                //modelAfterSale.F_Type = input.F_Type;
+                //modelAfterSale.F_OrderList = input.F_OrderList;
+                //modelAfterSale.F_Remark = input.F_Remark;
+                //modelAfterSale.F_Id = Guid.NewGuid().ToString().Replace("-", "");
+                if (await busAfterSaleRepository.AddReturnCount(modelAfterSale))
+                {
+                    if (input.F_State == 0)
+                        return Success("售后申请已保存");
+                    else if (input.F_State == 1)
+                    { return Success("售后申请已提交审核"); }
+                }
+                return Error("申请失败,请重试！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+
+
+        }
+
+        /// <summary>
+        /// 销售删除
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("deleteaftersalesh")]
+        public async Task<IActionResult> DeleteAfterSaleSH(string ids)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(ids))
+                {
+                    return Error("参数缺失：" + ids);
+                }
+                string[] idlist = ids.Split(',');
+
+                if (await busAfterSaleRepository.Delete(q => idlist.Contains(q.F_Id) && new[] { 0, 2 }.Contains(q.F_CheckStateXS)))
+                {
+                    return Success("删除成功/已审核通过不能删除");
+                }
+                return Error("删除失败,请重试！");
+            }
+            catch (Exception ex)
+            { return Error(ex.Message); }
+        }
+
+        /// <summary>
+        /// 根据分页获取列表
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("getaftersalebypagesh")]
+        public async Task<IActionResult> GetAfterSaleByPageSH(AfterSaleInput input)
+        {
+
+            #region  拼接条件
+
+            Expression<Func<T_Bus_AfterSale, bool>> eq = a => a.F_CheckUserXS == UserLogin.UserId.ObjToInt();
+
+
+            if (input.F_CheckStateXS > -1)
+            {
+                eq = eq.And(a => a.F_CheckStateXS == input.F_CheckStateXS);
+            }
+            if (input.F_CheckStateSH > -1)
+            {
+                eq = eq.And(a => a.F_CheckStateSH == input.F_CheckStateSH);
+            }
+            if (input.F_Type > -1)
+            {
+                eq = eq.And(a => a.F_Type == input.F_Type);
+            }
+            if (!string.IsNullOrEmpty(input.F_Id))
+            {
+                eq = eq.And(a => a.F_Id == input.F_Id);
+            }
+            if (input.F_State >= -1)
+            {
+                eq = eq.And(a => a.F_State == input.F_State);
+            }
+
+            #endregion
+            RefAsync<int> count = 0;
+            PageData<T_Bus_AfterSale> list = await busAfterSaleRepository.GetListByPage(eq, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = count }, " F_AddTime DESC");
+
+            return Success("成功", list);
+
+        }
+
+        #endregion
+
+
+
+
+
+
+    }
+}

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

@@ -35,8 +35,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
         private readonly ICus_VipInfoRepository cus_vip_infoRepository;
         private readonly IBus_OrderMergeRepository busOrderMergeRepository;
         private readonly ICus_ScoreSetRepository cus_score_setRepository;
-        private readonly IConfiguration config;
-        public OrderMergeController(ICus_ScoreSetRepository _cus_score_setRepository, IBus_OrderMergeRepository _busOrderMergeRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, OrderController _orderController, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository, IConfiguration _configuration)
+
+        public OrderMergeController(ICus_ScoreSetRepository _cus_score_setRepository, IBus_OrderMergeRepository _busOrderMergeRepository, IBus_OrderRepository _bus_OrderRepository, IBus_OrderDetailRepository _bus_OrderDetailRepository, OrderController _orderController, IBus_ProductRepository _productRepository, ICus_VipInfoRepository _cus_vip_infoRepository)
         {
             bus_OrderDetailRepository = _bus_OrderDetailRepository;
             bus_OrderRepository = _bus_OrderRepository;
@@ -45,7 +45,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             cus_vip_infoRepository = _cus_vip_infoRepository;
             busOrderMergeRepository = _busOrderMergeRepository;
             cus_score_setRepository = _cus_score_setRepository;
-            config = _configuration;
+
         }
 
 
@@ -109,7 +109,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelOrderMerge.F_Gift = input.F_Gift;
                 modelOrderMerge.F_Type = input.F_Type;
                 modelOrderMerge.F_OrderList = input.F_OrderList;
-                modelOrderMerge.F_Remark = input.F_Remark;
+                if(!string.IsNullOrEmpty(input.F_Remark))
+                  modelOrderMerge.F_Remark = input.F_Remark;
                 modelOrderMerge.F_Id = Guid.NewGuid().ToString().Replace("-", "");
                 if (await busOrderMergeRepository.AddReturnCount(modelOrderMerge))
                 {
@@ -184,8 +185,8 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
                 modelOrderMerge.F_Gift = input.F_Gift;
                 modelOrderMerge.F_Type = input.F_Type;
                 modelOrderMerge.F_OrderList = input.F_OrderList;
-                modelOrderMerge.F_Remark = input.F_Remark;
-                if (await busOrderMergeRepository.AddReturnCount(modelOrderMerge))
+                modelOrderMerge.F_Remark = input.F_Remark == null ? "" : input.F_Remark;
+                if (await busOrderMergeRepository.Update(modelOrderMerge))
                 {
                     if (input.F_State == 0)
                         return Success("订单合并已保存");
@@ -249,6 +250,10 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Order
             {
                 eq = eq.And(a => a.F_Type == input.F_Type);
             }
+            if (!string.IsNullOrEmpty(input.F_Id))
+            {
+                eq = eq.And(a => a.F_Id == input.F_Id);
+            }
             if (input.F_State >= 0)
             {
                 eq = eq.And(a => a.F_State == input.F_State);

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

@@ -76,7 +76,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
             T_Bus_ProductClassModel.F_ClassShortName = input.ClassShortName;
             T_Bus_ProductClassModel.F_ParentId = input.ParentId;
-            T_Bus_ProductClassModel.F_Sort = 10000;
+            T_Bus_ProductClassModel.F_Sort = input.Sort;
             T_Bus_ProductClassModel.F_ClassName = input.ClassName;
             T_Bus_ProductClassModel.F_UserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
             T_Bus_ProductClassModel.F_UserId = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
@@ -116,7 +116,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
 
             T_Bus_ProductClassModel.F_ClassName = input.ClassName;
             T_Bus_ProductClassModel.F_ClassShortName = input.ClassShortName;
-
+            T_Bus_ProductClassModel.F_Sort = input.Sort;
 
             T_Bus_ProductClassModel.F_UserName = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name).Value;
             T_Bus_ProductClassModel.F_UserId = int.Parse(User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.PrimarySid).Value, 0);
@@ -187,12 +187,19 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.Product
             }
 
             #endregion
-            RefAsync<int> count = 0;
-            PageData<T_Bus_ProductClass> list = await _productClassRepository.GetListByPage(eq, new MyPageModel() { PageIndex = input.pageindex, PageSize = input.pagesize, PageCount = count }, " F_Sort ASC");
-           // List<T_Bus_ProductClass> list = await _productClassRepository.GetListALL(eq);
-
-            return Success("成功", list);
 
+            List<T_Bus_ProductClass> productClasselist = await _productClassRepository.GetListALL(eq, o => o.F_Sort, SqlSugar.OrderByType.Asc);
+            var treeList = new List<TreeModel>();
+            foreach (T_Bus_ProductClass item in productClasselist)
+            {
+                TreeModel treeModel = new TreeModel();
+                treeModel.id = item.F_ClassId;
+                treeModel.iconcls = "";
+                treeModel.text = item.F_ClassName;
+                treeModel.parentid = item.F_ParentId;
+                treeList.Add(treeModel);
+            }
+            return Success("获取产品分类树成功", treeList.TreeRecursion(0));
         }
 
 

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

@@ -0,0 +1,242 @@
+using System;
+namespace TVShoppingCallCenter_ZLJ.Models.Inputs
+{
+	/// <summary>
+	/// 订单售后表
+	/// </summary>
+	[Serializable]
+	public partial class AfterSaleInput:BaseInput
+	{
+		public AfterSaleInput()
+		{ }
+		#region Model
+		private string _f_id;
+		private string _f_orderid;
+		private DateTime _f_addtime;
+		private int _f_type = 0;
+		private int _f_checkstatexs = 0;
+		private DateTime? _f_checktimexs;
+		private int _f_checkuserxs = 0;
+		private string _f_checkusernamexs = "";
+		private int _f_checkstatesh = 0;
+		private DateTime? _f_checktimesh;
+		private int _f_checkusersh = 0;
+		private string _f_checkusernamesh = "";
+		private string _f_detaillist = "";
+		private string _f_trackingno = "";
+		private string _f_trackdes = "";
+		private string _f_ourtrackingno = "";
+		private string _f_ourtrackdes = "";
+		private decimal _f_money = 0M;
+		private int _f_state = 0;
+		private int _f_checkstatekg;
+		private DateTime? _f_checktimekg;
+		private int _f_checkuserkg = 0;
+		private string _f_checkusernamekg = "";
+		private string _f_remark = "";
+		private string _f_aboutorderid = "";
+		/// <summary>
+		/// 售后编号
+		/// </summary>
+		public string F_Id
+		{
+			set { _f_id = value; }
+			get { return _f_id; }
+		}
+		/// <summary>
+		/// 订单ID
+		/// </summary>
+		public string F_OrderId
+		{
+			set { _f_orderid = value; }
+			get { return _f_orderid; }
+		}
+		/// <summary>
+		/// 添加时间
+		/// </summary>
+		public DateTime F_AddTime
+		{
+			set { _f_addtime = value; }
+			get { return _f_addtime; }
+		}
+		/// <summary>
+		/// 售后状态 1调换货 2退货 3部分退货 4对发货
+		/// </summary>
+		public int F_Type
+		{
+			set { _f_type = value; }
+			get { return _f_type; }
+		}
+		/// <summary>
+		/// 0未审核1审核通过2审核不通过
+		/// </summary>
+		public int F_CheckStateXS
+		{
+			set { _f_checkstatexs = value; }
+			get { return _f_checkstatexs; }
+		}
+		/// <summary>
+		/// 销售审核完成时间
+		/// </summary>
+		public DateTime? F_CheckTimeXS
+		{
+			set { _f_checktimexs = value; }
+			get { return _f_checktimexs; }
+		}
+		/// <summary>
+		/// 销售操作人
+		/// </summary>
+		public int F_CheckUserXS
+		{
+			set { _f_checkuserxs = value; }
+			get { return _f_checkuserxs; }
+		}
+		/// <summary>
+		/// 销售姓名
+		/// </summary>
+		public string F_CheckUserNameXS
+		{
+			set { _f_checkusernamexs = value; }
+			get { return _f_checkusernamexs; }
+		}
+		/// <summary>
+		/// 售后审核状态 0未审核1审核通过2审核不通过
+		/// </summary>
+		public int F_CheckStateSH
+		{
+			set { _f_checkstatesh = value; }
+			get { return _f_checkstatesh; }
+		}
+		/// <summary>
+		/// 售后审核完成时间
+		/// </summary>
+		public DateTime? F_CheckTimeSH
+		{
+			set { _f_checktimesh = value; }
+			get { return _f_checktimesh; }
+		}
+		/// <summary>
+		/// 售后操作人
+		/// </summary>
+		public int F_CheckUserSH
+		{
+			set { _f_checkusersh = value; }
+			get { return _f_checkusersh; }
+		}
+		/// <summary>
+		/// 售后姓名
+		/// </summary>
+		public string F_CheckUserNameSH
+		{
+			set { _f_checkusernamesh = value; }
+			get { return _f_checkusernamesh; }
+		}
+		/// <summary>
+		/// 产品列表
+		/// </summary>
+		public string F_DetailList
+		{
+			set { _f_detaillist = value; }
+			get { return _f_detaillist; }
+		}
+		/// <summary>
+		/// 运单号
+		/// </summary>
+		public string F_TrackingNo
+		{
+			set { _f_trackingno = value; }
+			get { return _f_trackingno; }
+		}
+		/// <summary>
+		/// 运单跟踪
+		/// </summary>
+		public string F_TrackDes
+		{
+			set { _f_trackdes = value; }
+			get { return _f_trackdes; }
+		}
+		/// <summary>
+		/// 对发货 我们的运单号
+		/// </summary>
+		public string F_OurTrackingNo
+		{
+			set { _f_ourtrackingno = value; }
+			get { return _f_ourtrackingno; }
+		}
+		/// <summary>
+		/// 我们的运单跟踪
+		/// </summary>
+		public string F_OurTrackDes
+		{
+			set { _f_ourtrackdes = value; }
+			get { return _f_ourtrackdes; }
+		}
+		/// <summary>
+		/// 需要变动金额 正用户需要补交金额  负 需要退给用户金额
+		/// </summary>
+		public decimal F_Money
+		{
+			set { _f_money = value; }
+			get { return _f_money; }
+		}
+		/// <summary>
+		/// 售后状态-1无效0未完成1已完成  主要涉及财务退款（新订单生成）操作
+		/// </summary>
+		public int F_State
+		{
+			set { _f_state = value; }
+			get { return _f_state; }
+		}
+		/// <summary>
+		/// 0未审核
+		/// </summary>
+		public int F_CheckStateKG
+		{
+			set { _f_checkstatekg = value; }
+			get { return _f_checkstatekg; }
+		}
+		/// <summary>
+		/// 库管审核1收到货（根据状态自动创建订单）2货物不符3未收到货
+		/// </summary>
+		public DateTime? F_CheckTimeKG
+		{
+			set { _f_checktimekg = value; }
+			get { return _f_checktimekg; }
+		}
+		/// <summary>
+		/// 库管操作人
+		/// </summary>
+		public int F_CheckUserKG
+		{
+			set { _f_checkuserkg = value; }
+			get { return _f_checkuserkg; }
+		}
+		/// <summary>
+		/// 库管姓名
+		/// </summary>
+		public string F_CheckUserNameKG
+		{
+			set { _f_checkusernamekg = value; }
+			get { return _f_checkusernamekg; }
+		}
+		/// <summary>
+		/// 所有人备注信息综合累加
+		/// </summary>
+		public string F_Remark
+		{
+			set { _f_remark = value; }
+			get { return _f_remark; }
+		}
+		/// <summary>
+		/// 售后发出关联订单
+		/// </summary>
+		public string F_AboutOrderId
+		{
+			set { _f_aboutorderid = value; }
+			get { return _f_aboutorderid; }
+		}
+		#endregion Model
+
+	}
+}
+

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

@@ -24,17 +24,22 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		private string _f_addusername;
 		private string _f_remark = "";
 		private int _f_activity;
-		private string _tags;
+		private int _f_state = 0;
+
+		/// <summary>
+		/// 0正常1售后
+		/// </summary>
+		public int F_State
+		{
+			set { _f_state = value; }
+			get { return _f_state; }
+		}
 		public int F_Activity
 		{
 			set { _f_activity = value; }
 			get { return _f_activity; }
 		}
-		public string Tags
-		{
-			set { _tags = value; }
-			get { return _tags; }
-		}
+
 		/// <summary>
 		/// 订单详情Id
 		/// </summary>

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

@@ -62,7 +62,18 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
         private int _f_senduser = 0;
         private string _f_sendusername = "";
         private decimal _f_expressfee = 10;
-        
+        private string _f_afterSaleId = "";
+
+
+        /// <summary>
+        /// 审核备注
+        /// </summary>
+        public string F_AfterSaleId
+        {
+            set { _f_afterSaleId = value; }
+            get { return _f_afterSaleId; }
+        }
+
         /// <summary>
         /// 快递费
         /// </summary>
@@ -227,7 +238,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
             get { return _f_paystate; }
         }
         /// <summary>
-        /// 订单状态 -1无效 0暂存 其他待定
+        /// 订单状态 -1无效 0暂存 1提交  2KF退回  3通过 4无货 5已分拣 6已发货
         /// </summary>
         public int F_State
         {

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

@@ -10,7 +10,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 
 		#region Model
 		private int _f_classid;
-		private int? _f_parentid=0;
+		private int _f_parentid=0;
 		private string _f_classname="";
 		private string _f_classshortname="";
 		private DateTime? _f_addtime=DateTime.Now;
@@ -29,7 +29,7 @@ namespace TVShoppingCallCenter_ZLJ.Models.Inputs
 		/// <summary>
 		/// 上级分类 0顶级
 		/// </summary>
-		public int? ParentId
+		public int ParentId
 		{
 			set { _f_parentid = value; }
 			get { return _f_parentid; }