代码优化

Mall.Module.Product/ProductModule.cs

@@ -2403,10 +2403,7 @@ namespace Mall.Module.Product
             #endregion
 
             #region 订单信息
-
-            int payment_people = 0, payment_num = 0, payment_order = 0;//订单用户  商品数量   订单数量
-            decimal payment_amount = 0;//订单总金额
-            GetGoodsOrderPeopleInfo(out payment_amount, out payment_num, out payment_order, out payment_people, goodsId);
+            GetGoodsOrderPeopleInfo(out decimal payment_amount, out int payment_num, out int payment_order, out int payment_people, goodsId);
             #endregion
 
             #region 返回参数
@@ -3543,10 +3540,7 @@ namespace Mall.Module.Product
             #endregion
 
             #region 订单信息
-
-            int payment_people = 0, payment_num = 0, payment_order = 0;//订单用户  商品数量   订单数量
-            decimal payment_amount = 0;//订单总金额
-            GetGoodsOrderPeopleInfo(out payment_amount, out payment_num, out payment_order, out payment_people, goodsId);
+            GetGoodsOrderPeopleInfo(out decimal payment_amount, out int payment_num, out int payment_order, out int payment_people, goodsId);
             #endregion
 
             #region 返回参数

Mall.WebApi/Controllers/Education/AppletEducationController.cs

@@ -2012,7 +2012,6 @@ namespace Mall.WebApi.Controllers.Education
                     decimal dPaid = Convert.ToDecimal(dic["dPrice"]) / 100;
                     string refundid = dic["refundid"];//微信退款单号
                     string outRefundNo = dic["outRefundNo"];//商户退款单号
-
                     flag = activityModule.CancelCommerceConsultModule(ActivityId, CancelRemark, out int IsCancelConfirm, userInfo.UserId, refundid, model, dPaid);
                     return flag ? ApiResult.Success("", IsCancelConfirm) : ApiResult.Failed();
                 }
@@ -2027,14 +2026,8 @@ namespace Mall.WebApi.Controllers.Education
                 return flag ? ApiResult.Success("", IsCancelConfirm) : ApiResult.Failed();
             }
             return ApiResult.Failed("报名取消失败，请联系客服");
-
         }
 
-
-
-
-
-
         /// <summary>
         /// 获取活动报名列表
         /// </summary>

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -2674,13 +2674,11 @@ namespace Mall.WebApi.Controllers.Education
         /// <returns></returns>
         public ApiResult CancelCommerceConsult()
         {
-            bool flag = false;
             JObject jObj = JObject.Parse(RequestParm.msg.ToString());
             var ActivityId = jObj.GetInt("ActivityId");
             var Id = jObj.GetInt("Id");
             var EduUserId = jObj.GetInt("EduUserId");
             string CancelRemark = jObj.GetStringValue("CancelRemark");
-            // var userInfo = AppletUserInfo;
             var model = activityModule.GetCommerceConsultListRepository(new RB_Education_Consult_Extend { EduUserId = EduUserId, OrderStatus = -1, ActivityId = ActivityId, Id = Id }).FirstOrDefault();
             if (model == null || model.Id == 0 || model.Status == Common.Enum.DateStateEnum.Delete)
             { return ApiResult.Failed("报名数据不存在"); }
@@ -2690,8 +2688,7 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.Failed("已过报名时间无法取消");
             }
-
-            flag = activityModule.CancelCommerceConsult(ActivityId, CancelRemark, out int IsCancelConfirm, model);
+            bool flag = activityModule.CancelCommerceConsult(ActivityId, CancelRemark, out int IsCancelConfirm, model);
             return flag ? ApiResult.Success("", IsCancelConfirm) : ApiResult.Failed();
         }
 

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -833,10 +833,8 @@ namespace Mall.WebApi.Controllers.MallBase
             price_max = Math.Round(price_max, 2, MidpointRounding.AwayFromZero);
             #endregion
             #region 订单信息
-
-            int payment_people = 0, payment_num = 0, payment_order = 0;//订单用户  商品数量   订单数量
-            decimal payment_amount = 0;//订单总金额
-            productModule.GetGoodsOrderPeopleInfo(out payment_amount, out payment_num, out payment_order, out payment_people, GoodsId);
+            //payment_amount-订单总金额,payment_people-订单用户, payment_num-商品数量, payment_order-订单数量
+            productModule.GetGoodsOrderPeopleInfo(out decimal payment_amount, out int payment_num, out int payment_order, out int payment_people, GoodsId);
             #endregion
 
             return ApiResult.Success("success", new

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -869,7 +869,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         public ApiResult SetTradeConsult()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var Id = parms.GetInt("Id", 0);
             RB_Commerce_Consult_Extend model = new RB_Commerce_Consult_Extend()
             {
                 Id = parms.GetInt("Id", 0),
@@ -908,7 +907,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         public ApiResult GetUserActivityPage()
         {
             ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_Commerce_Activity_Extend()
             {
             };
@@ -1043,7 +1041,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// <returns></returns>
         public ApiResult SetFirstShopActivityEnroll()
         {
-            bool flag = false;
+       
             var request = RequestParm;
             var userInfo = AppletUserInfo;
             if (userInfo == null)
@@ -1079,8 +1077,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
                         CountryInfo = item.CountryInfo,
                         Nature = firstShopModel.Nature
                     };
-                    Random R = new Random();
-                    int Rstr = R.Next(111, 999);
                     demodel.ActivityId = model.Id;
                     demodel.Remark = firstShopModel.Remark;
                     demodel.UserId = userInfo.UserId;
@@ -1094,16 +1090,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     consultList.Add(demodel);
                 }
             }
-
-            flag = consultModule.SetBatchActivityEnrollInfo(consultList);
-
+            bool flag = consultModule.SetBatchActivityEnrollInfo(consultList);
             return flag ? ApiResult.Success("报名成功") : ApiResult.Failed("出错了，请联系管理员");
-
         }
 
-
-
-
         /// <summary>
         /// 根据活动ids获取活动列表
         /// </summary>
@@ -1873,7 +1863,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [AllowAnonymous]
         public ApiResult GetBrandClassList()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             var query = new RB_BrandClass_Extend
             {
                 MallBaseId = RequestParm.MallBaseId,
@@ -2375,7 +2364,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult CancelAppletFirstShopListInfo()
         {
-            var userInfo = base.AppletUserInfo;
             JObject parms = JObject.Parse(base.RequestParm.msg.ToString());
             int EnrollId = parms.GetInt("EnrollId", 0);//报名Id
             if (EnrollId <= 0)