接口修改

Edu.Common/Enum/Sale/CustomerStatusEnum.cs

@@ -3,7 +3,7 @@
 namespace Edu.Common.Enum.Sale
 {
     /// <summary>
-    /// 客户确认状态
+    /// 报价单状态
     /// </summary>
     public enum CustomerStatusEnum
     {
@@ -30,5 +30,17 @@ namespace Edu.Common.Enum.Sale
         /// </summary>
         [EnumField("已转订单")]
         TransOrder = 4,
+
+        /// <summary>
+        /// 申请改价
+        /// </summary>
+        [EnumField("申请改价")]
+        ApplyModifyPrice = 5,
+
+        /// <summary>
+        /// 已改价
+        /// </summary>
+        [EnumField("已改价")]
+        FinishModifyPrice = 6,
     }
 }
\ No newline at end of file

Edu.Model/Entity/Course/RB_Course_Offer.cs

@@ -63,7 +63,7 @@ namespace Edu.Model.Entity.Course
 		public decimal TotalDiscountPrice { get; set; }
 
 		/// <summary>
-		/// 客户确认状态(1-待确认,2-已确认)
+		/// 报价单状态(见枚举)
 		/// </summary>
 		public CustomerStatusEnum CustomerStatus { get; set; }
 
@@ -126,5 +126,10 @@ namespace Edu.Model.Entity.Course
 		/// 订单编号
 		/// </summary>
 		public string OrderId { get; set; }
+
+		/// <summary>
+		/// 申请改价原因
+		/// </summary>
+		public string ApplyReason { get; set; }
 	}
 }

Edu.Module.Course/CourseOfferModule.cs

 using Edu.AOP.CustomerAttribute;
+using Edu.Common.Enum.Sale;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.Course;
 using Edu.Repository.Course;
@@ -182,11 +183,36 @@ namespace Edu.Module.Course
         }
 
         /// <summary>
-        /// 获取课程报价单实体
+        /// 修改报价单价格
         /// </summary>
-        /// <param name="Id"></param>
+        /// <param name="model"></param>
         /// <returns></returns>
-        public RB_Course_Offer_ViewModel GetCourseOfferModule(object Id)
+        [TransactionCallHandler]
+        public virtual bool SetCourseOfferPriceModule(RB_Course_Offer_ViewModel model)
+        {
+            bool flag = false;
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Course_Offer_ViewModel.CustomerStatus) ,(int)CustomerStatusEnum.FinishModifyPrice}
+            };
+            flag = course_OfferRepository.Update(fileds, new WhereHelper(nameof(RB_Course_Offer_ViewModel.Id), model.Id));
+            if (flag)
+            {
+                foreach (var offerItem in model.OfferDetails)
+                {
+                    flag = course_OfferDetailsRepository.Update(offerItem);
+                }
+            }
+            return flag;
+        }
+
+
+    /// <summary>
+    /// 获取课程报价单实体
+    /// </summary>
+    /// <param name="Id"></param>
+    /// <returns></returns>
+    public RB_Course_Offer_ViewModel GetCourseOfferModule(object Id)
         {
             var model = course_OfferRepository.GetEntity<RB_Course_Offer_ViewModel>(Id);
             if (model != null)
@@ -246,6 +272,23 @@ namespace Edu.Module.Course
             return flag;
         }
 
+        /// <summary>
+        /// 申请改价
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <param name="ApplyReason"></param>
+        /// <returns></returns>
+        public bool SetApplyModifyPriceModule(int Id, string ApplyReason)
+        {
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                {nameof(RB_Course_Offer_ViewModel.CustomerStatus),(int)CustomerStatusEnum.ApplyModifyPrice },
+                {nameof(RB_Course_Offer_ViewModel.ApplyReason),ApplyReason },
+            };
+            var flag = course_OfferRepository.Update(fileds, new WhereHelper(nameof(RB_Course_Offer_ViewModel.Id), Id));
+            return flag;
+        }
+
         #region 报价单创建订单
 
         /// <summary>

Edu.WebApi/Controllers/Course/CourseOfferController.cs

@@ -158,6 +158,30 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success(data: extModel.Id) : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 修改课程报价单价格
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetCourseOfferPrice()
+        {
+            var extModel = new RB_Course_Offer_ViewModel()
+            {
+                Id = base.ParmJObj.GetInt("Id"),
+            };
+            try
+            {
+                extModel.OfferDetails = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Course_OfferDetails_ViewModel>>(base.ParmJObj.GetStringValue("OfferDetails"));
+            }
+            catch (Exception ex)
+            {
+                Common.Plugin.LogHelper.Write(ex, "SetCourseOfferPrice");
+            }
+            bool flag = courseOfferModule.SetCourseOfferPriceModule(extModel);
+            return flag ? ApiResult.Success(data: extModel.Id) : ApiResult.Failed();
+        }
+
+
         /// <summary>
         /// 获取课程报价单实体
         /// </summary>
@@ -184,19 +208,23 @@ namespace Edu.WebApi.Controllers.Course
                 EffectiveStart = extModel?.EffectiveStartStr,
                 EffectiveEnd = extModel?.EffectiveEndStr,
                 extModel?.CustomerType,
+                extModel?.CustomerTypeName,
                 extModel?.CustomerSource,
+                extModel?.CustomerSourceName,
                 extModel?.TotalOriginalPrice,
                 extModel?.TotalPrice,
                 extModel?.TotalDiscountPrice,
                 extModel?.CustomerInfo,
                 extModel?.CustomerStatus,
+                extModel?.CustomerStatusName,
                 extModel?.CreateBy,
                 extModel?.CustomerTel,
                 extModel?.CustomerName,
                 extModel?.JoinNum,
                 extModel?.SerialNum,
+                extModel?.ApplyReason,
                 OfferDetails = extModel?.OfferDetails ?? new List<RB_Course_OfferDetails_ViewModel>(),
-                CreateTime = Common.ConvertHelper.FormatDate2(extModel.CreateTime),
+                CreateTime = Common.ConvertHelper.FormatDate2(extModel?.CreateTime),
                 CreateByName,
                 CreateTel,
                 CreateWeChatNo
@@ -230,6 +258,19 @@ namespace Edu.WebApi.Controllers.Course
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 销售申请修改价格
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetApplyModifyPrice()
+        {
+            var Id = base.ParmJObj.GetInt("Id", 0);
+            string ApplyReason = base.ParmJObj.GetStringValue("ApplyReason");
+            var flag = courseOfferModule.SetApplyModifyPriceModule(Id, ApplyReason);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 获取枚举相关列表
         /// </summary>