Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.Module.Education/ActivityModule.cs

@@ -334,32 +334,31 @@ namespace Mall.Module.Education
                 if (model.Id > 0)
                 {
                     Dictionary<string, object> fileds = new Dictionary<string, object>()
-                {
-                    {nameof(RB_Education_Activity_Extend.ActivityName),model.ActivityName },
-                    {nameof(RB_Education_Activity_Extend.StartTime),model.StartTime },
-                    {nameof(RB_Education_Activity_Extend.EndTime),model.EndTime },
-                    {nameof(RB_Education_Activity_Extend.CoverImg),model.CoverImg },
-                    {nameof(RB_Education_Activity_Extend.ActivityType),model.ActivityType },
-                    {nameof(RB_Education_Activity_Extend.ActivityInfo),model.ActivityInfo },
-                    {nameof(RB_Education_Activity_Extend.UpdateBy),model.UpdateBy },
-                    {nameof(RB_Education_Activity_Extend.UpdateDate),model.UpdateDate },
-                    {nameof(RB_Education_Activity_Extend.SignStartTime),model.SignStartTime },
-                    {nameof(RB_Education_Activity_Extend.SignEndTime),model.SignEndTime },
-                    {nameof(RB_Education_Activity_Extend.IsFree),model.IsFree },
-                    {nameof(RB_Education_Activity_Extend.Price),model.Price },
-                    {nameof(RB_Education_Activity_Extend.IsCancelConfirm),model.IsCancelConfirm },
-                    {nameof(RB_Education_Activity_Extend.PointNum),model.PointNum },
-                    {nameof(RB_Education_Activity_Extend.AgeLimit),model.AgeLimit },
-                    {nameof(RB_Education_Activity_Extend.StartAge),model.StartAge },
-                    {nameof(RB_Education_Activity_Extend.EndAge),model.EndAge },
-                    {nameof(RB_Education_Activity_Extend.WoManNum),model.WoManNum },
-                      {nameof(RB_Education_Activity_Extend.ManNum),model.ManNum },
-                    {nameof(RB_Education_Activity_Extend.Distinguish),model.Distinguish },
-                    {nameof(RB_Education_Activity_Extend.LonLat),model.LonLat },
-                    {nameof(RB_Education_Activity_Extend.LocationName),model.LocationName },
-                    {nameof(RB_Education_Activity_Extend.LnsideLimit),model.LnsideLimit },
-
-                };
+                    {
+                        {nameof(RB_Education_Activity_Extend.ActivityName),model.ActivityName },
+                        {nameof(RB_Education_Activity_Extend.StartTime),model.StartTime },
+                        {nameof(RB_Education_Activity_Extend.EndTime),model.EndTime },
+                        {nameof(RB_Education_Activity_Extend.CoverImg),model.CoverImg },
+                        {nameof(RB_Education_Activity_Extend.ActivityType),model.ActivityType },
+                        {nameof(RB_Education_Activity_Extend.ActivityInfo),model.ActivityInfo },
+                        {nameof(RB_Education_Activity_Extend.UpdateBy),model.UpdateBy },
+                        {nameof(RB_Education_Activity_Extend.UpdateDate),model.UpdateDate },
+                        {nameof(RB_Education_Activity_Extend.SignStartTime),model.SignStartTime },
+                        {nameof(RB_Education_Activity_Extend.SignEndTime),model.SignEndTime },
+                        {nameof(RB_Education_Activity_Extend.IsFree),model.IsFree },
+                        {nameof(RB_Education_Activity_Extend.Price),model.Price },
+                        {nameof(RB_Education_Activity_Extend.IsCancelConfirm),model.IsCancelConfirm },
+                        {nameof(RB_Education_Activity_Extend.PointNum),model.PointNum },
+                        {nameof(RB_Education_Activity_Extend.AgeLimit),model.AgeLimit },
+                        {nameof(RB_Education_Activity_Extend.StartAge),model.StartAge },
+                        {nameof(RB_Education_Activity_Extend.EndAge),model.EndAge },
+                        {nameof(RB_Education_Activity_Extend.WoManNum),model.WoManNum },
+                        {nameof(RB_Education_Activity_Extend.ManNum),model.ManNum },
+                        {nameof(RB_Education_Activity_Extend.Distinguish),model.Distinguish },
+                        {nameof(RB_Education_Activity_Extend.LonLat),model.LonLat },
+                        {nameof(RB_Education_Activity_Extend.LocationName),model.LocationName },
+                        {nameof(RB_Education_Activity_Extend.LnsideLimit),model.LnsideLimit },
+                    };
                     flag = education_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Education_Activity_Extend.Id), model.Id), trans);
                     if (flag)
                     {
@@ -412,6 +411,7 @@ namespace Mall.Module.Education
             }
             catch (Exception ex)
             {
+                Common.Plugin.LogHelper.Write(ex, string.Format("SetActivityModule_Msg:{0}",Common.Plugin.JsonHelper.Serialize(model)));
                 education_ActivityRepository.DBSession.Rollback("SetActivityModule");
                 return false;
             }
@@ -469,7 +469,7 @@ namespace Mall.Module.Education
                 education_ActivityTitleRepository.DBSession.Commit();
                 return flag;
             }
-            catch (Exception ex)
+            catch
             {
                 education_ActivityTitleRepository.DBSession.Rollback("SetActivityPlanModule");
                 return false;
@@ -585,7 +585,7 @@ namespace Mall.Module.Education
         /// <returns></returns>
         public bool SetEduSellBaseInfo(RB_Education_EduSell_Extend model)
         {
-            bool flag = false;
+            bool flag;
             if (model.Id == 0)
             {
                 flag = education_EduSellRepository.Insert(model) > 0;
@@ -646,7 +646,7 @@ namespace Mall.Module.Education
         /// <returns></returns>
         public bool SetEduBaseInfo(RB_Education_BaseInfo_Extend model)
         {
-            bool flag = false;
+            bool flag;
             if (model.Id == 0)
             {
                 flag = education_BaseInfoRepository.Insert(model) > 0;
@@ -685,7 +685,7 @@ namespace Mall.Module.Education
         /// <returns></returns>
         public bool UpdateEduBaseInfoSex(RB_Education_BaseInfo_Extend model)
         {
-            bool flag = false;
+            bool flag;
             if (model.Id == 0)
             {
                 flag = education_BaseInfoRepository.Insert(model) > 0;
@@ -1469,7 +1469,7 @@ namespace Mall.Module.Education
                                 ClientType = 0,
                                 ClientID = 0,
                                 IsPublic = 8,
-                                CurrencyId = financeConfig.CurrencyId,
+                                financeConfig.CurrencyId,
                                 BType = 1,
                                 WBMoney = Convert.ToDecimal(model.Money),
                                 PayDate = DateTime.Now.ToString("yyyy-MM-dd"),
@@ -1685,7 +1685,7 @@ namespace Mall.Module.Education
                                     ClientType = 0,
                                     ClientID = 0,
                                     IsPublic = 8,
-                                    CurrencyId = financeConfig.CurrencyId,
+                                    financeConfig.CurrencyId,
                                     BType = 1,
                                     WBMoney = Convert.ToDecimal(cmodel.Money),
                                     PayDate = DateTime.Now.ToString("yyyy-MM-dd"),

Mall.Module.Product/ProductModule.cs

@@ -134,7 +134,7 @@ namespace Mall.Module.Product
         /// <summary>
         /// 商户仓储层对象
         /// </summary>
-        private Mall.Repository.User.RB_MiniProgramRepository programRepository = new Repository.User.RB_MiniProgramRepository();
+        private readonly RB_MiniProgramRepository programRepository = new RB_MiniProgramRepository();
         /// <summary>
         /// 商品收藏
         /// </summary>
@@ -178,16 +178,18 @@ namespace Mall.Module.Product
         /// </summary>
         private readonly RB_Distributor_FXCommissionRepository distributor_FXCommissionRepository = new RB_Distributor_FXCommissionRepository();
 
-        private RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
+        private readonly RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
 
         /// <summary>
         /// 微店
         /// </summary>
-        private RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository();
+        private readonly RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository();
+
         /// <summary>
         /// 微店商品价格
         /// </summary>
-        private RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository();
+        private readonly RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository();
+
         /// <summary>
         /// 课程
         /// </summary>
@@ -1141,10 +1143,12 @@ namespace Mall.Module.Product
                     {
                         string priceIds = string.Join(",", priceList.Select(x => x.ID));
                         var regionList = logistics_RulesRegionRepository.GetListRepository(new Model.Extend.BaseSetUp.RB_Logistics_RulesRegion_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, PriceIds = priceIds });
-                        List<int> disList = new List<int>();
-                        disList.Add(samodel.Province ?? 0);
-                        disList.Add(samodel.City ?? 0);
-                        disList.Add(samodel.District ?? 0);
+                        List<int> disList = new List<int>
+                        {
+                            samodel.Province ?? 0,
+                            samodel.City ?? 0,
+                            samodel.District ?? 0
+                        };
                         var regionModel = regionList.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
                         if (regionModel != null)
                         {
@@ -1848,10 +1852,12 @@ namespace Mall.Module.Product
                     {
                         string priceIds = string.Join(",", priceList1.Select(x => x.ID));
                         var regionList = logistics_RulesRegionRepository.GetListRepository(new Model.Extend.BaseSetUp.RB_Logistics_RulesRegion_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, PriceIds = priceIds });
-                        List<int> disList = new List<int>();
-                        disList.Add(samodel.Province ?? 0);
-                        disList.Add(samodel.City ?? 0);
-                        disList.Add(samodel.District ?? 0);
+                        List<int> disList = new List<int>
+                        {
+                            samodel.Province ?? 0,
+                            samodel.City ?? 0,
+                            samodel.District ?? 0
+                        };
                         var regionModel = regionList.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
                         if (regionModel != null)
                         {
@@ -2397,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 返回参数
@@ -2613,7 +2616,7 @@ namespace Mall.Module.Product
                     goods_country = model.GoodsCountry,
                     fatcode = model.FatCode,
                     goodsurl = model.GoodsUrl,
-                    goodsLogo = model.goodsLogo,
+                    model.goodsLogo,
                     goodsPreferentialList = goodsPreferentialList?.Select(x => new
                     {
                         x.Id,
@@ -3025,10 +3028,12 @@ namespace Mall.Module.Product
                     {
                         string priceIds = string.Join(",", priceList1.Select(x => x.ID));
                         var regionList = logistics_RulesRegionRepository.GetListRepository(new Model.Extend.BaseSetUp.RB_Logistics_RulesRegion_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, PriceIds = priceIds });
-                        List<int> disList = new List<int>();
-                        disList.Add(samodel.Province ?? 0);
-                        disList.Add(samodel.City ?? 0);
-                        disList.Add(samodel.District ?? 0);
+                        List<int> disList = new List<int>
+                        {
+                            samodel.Province ?? 0,
+                            samodel.City ?? 0,
+                            samodel.District ?? 0
+                        };
                         var regionModel = regionList.Where(x => disList.Contains(x.RegionId)).FirstOrDefault();
                         if (regionModel != null)
                         {
@@ -3535,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 返回参数
@@ -6843,8 +6845,10 @@ namespace Mall.Module.Product
                 var cmodel = product_CategoryRepository.GetEntity(demodel.CategoryIds);
                 if (cmodel != null)
                 {
-                    List<int> AllClist = new List<int>();
-                    AllClist.Add(cmodel.Id);
+                    List<int> AllClist = new List<int>
+                    {
+                        cmodel.Id
+                    };
                     var clist = product_CategoryRepository.GetList(new RB_Product_Category_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, RootId = cmodel.RootId });
                     var OneList = clist.Where(x => x.ParentId == cmodel.Id).ToList();
                     foreach (var item in OneList)

Mall.Module.TradePavilion/CustomFormModule.cs

@@ -95,7 +95,7 @@ namespace Mall.Module.TradePavilion
         [TransactionCallHandler]
         public virtual bool SetCustomFormModule(RB_Custom_Form_Extend model)
         {
-            bool flag = false;
+            bool flag;
             if (model.Id > 0)
             {
                 Dictionary<string, object> fileds = new Dictionary<string, object>()

Mall.Module.TradePavilion/FirstShopListModule.cs

@@ -425,9 +425,8 @@ namespace Mall.Module.TradePavilion
         /// 取消报名
         /// </summary>
         /// <param name="enrollId"></param>
-        /// <param name="userInfo"></param>
         /// <returns></returns>
-        public string CancelAppletFirstShopListInfo(int enrollId, AppletUserInfo userInfo)
+        public string CancelAppletFirstShopListInfo(int enrollId)
         {
             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                 { nameof(RB_FirstShop_ListEnroll_Extend.Status),1},
@@ -986,9 +985,6 @@ namespace Mall.Module.TradePavilion
             var listModel = firstShop_ListRepository.GetEntity(enrollModel.ListId);
             if (listModel == null) { errorMsg = "榜单不存在"; return ""; }
 
-            //创建一个临时文件夹
-            string tempFoldr = "";
-
             #region 解析表单内容
 
             if (string.IsNullOrEmpty(enrollModel.Content))
@@ -1090,7 +1086,7 @@ namespace Mall.Module.TradePavilion
                             return "";
                         }
                         List<FormDataItem> elist = JsonHelper.DeserializeObject<List<FormDataItem>>(item.Content);
-                        elist = elist.Where(x => x.CompKey == "ImageUploadComp" || x.CompKey == "VideoUploadComp"||x.CompKey== "CommonUploadComp").ToList();
+                        elist = elist.Where(x => x.CompKey == "ImageUploadComp" || x.CompKey == "VideoUploadComp" || x.CompKey == "CommonUploadComp").ToList();
                         var templistnowPath = Path.Combine(templistPath + enrollModel.ListName + "\\");//路径
                         if (!Directory.Exists(templistnowPath))
                         {
@@ -1119,7 +1115,7 @@ namespace Mall.Module.TradePavilion
                                             bitmap.Save(templistnowPath + Path.GetFileName(qitem), System.Drawing.Imaging.ImageFormat.Jpeg);
                                         }
                                     }
-                                    catch (Exception ex)
+                                    catch
                                     {
 
                                     }
@@ -1158,7 +1154,7 @@ namespace Mall.Module.TradePavilion
                                             fs.Close();
                                         }
                                     }
-                                    catch (Exception ex)
+                                    catch
                                     {
 
                                     }
@@ -1192,7 +1188,6 @@ namespace Mall.Module.TradePavilion
                             item.Delete(true);
                         }
                     }
-
                 }
                 catch
                 {
@@ -1204,9 +1199,6 @@ namespace Mall.Module.TradePavilion
             {
                 return "";
             }
-         
-
-
         }
 
 
@@ -1225,7 +1217,6 @@ namespace Mall.Module.TradePavilion
             {
                 string tempPath = Path.Combine(rootBook + Url.TrimStart('/'));
                 #region 解析表单内容
-
                 string timeStr = Url.TrimStart('/').Split("/")[4];
                 if (!File.Exists(tempPath))
                 {
@@ -1233,7 +1224,6 @@ namespace Mall.Module.TradePavilion
                 }
                 else
                 {
-
                     DirectoryInfo dir = new DirectoryInfo(Path.Combine(rootBook + "upfile\\temporary\\firstshopenrollzip\\" + "zip\\"));
                     DirectoryInfo[] dirArr = dir.GetDirectories();
                     foreach (DirectoryInfo item in dirArr)
@@ -1248,18 +1238,13 @@ namespace Mall.Module.TradePavilion
                         }
                     }
                     return true;
-
-
                 }
             }
-            catch (Exception ex)
+            catch
             {
-
                 return false;
             }
             #endregion
-
-
         }
     }
 }

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>
@@ -2128,13 +2121,15 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.Failed("订单已全部提成/暂无报入订单");
             }
-            var query = new RB_Education_Consult_Extend();
-            query.EnrollState = 0;
-            query.ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0;
-            query.MallBaseId = userInfo.MallBaseId;
-            query.TenantId = userInfo.TenantId;
-            query.OrderStatus = 1;
-           // query.IsCommission = 1;
+            var query = new RB_Education_Consult_Extend
+            {
+                EnrollState = 0,
+                ActivityId = newList.FirstOrDefault()?.ActivityId ?? 0,
+                MallBaseId = userInfo.MallBaseId,
+                TenantId = userInfo.TenantId,
+                OrderStatus = 1
+            };
+            // query.IsCommission = 1;
             var list = new List<RB_Education_Consult_Extend>();
             if (query.ActivityId > 0)
             {
@@ -2172,7 +2167,6 @@ namespace Mall.WebApi.Controllers.Education
         public ApiResult SendCodeByStudentInfo()
         {
             var req = RequestParm;
-            var userInfo = AppletUserInfo;
             JObject jobj = JObject.Parse(req.msg.ToString());
             string stuTel = jobj.GetStringValue("StuTel");
             var model = activityModule.GetStudentList(new RB_Student()
@@ -2204,15 +2198,12 @@ namespace Mall.WebApi.Controllers.Education
                 UserReidsCache.AddUserSendCodeHistory(stuTel);
                 return ApiResult.Success("验证码已发送，请注意查收", data: null);
             }
-            catch (Exception ex)
+            catch
             {
                 return ApiResult.Failed("发送短信失败，请稍后再试");
             }
         }
 
-
-
-
         /// <summary>
         /// 判断输入的验证码是否正确
         /// </summary>
@@ -2265,14 +2256,16 @@ namespace Mall.WebApi.Controllers.Education
                 var eduModel = activityModule.GetEducationBaseInfo(new RB_Education_BaseInfo_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
                 if (eduModel == null || eduModel.Id == 0)
                 {
-                    eduModel = new RB_Education_BaseInfo_Extend();
-                    eduModel.Id = 0;
-                    eduModel.TenantId = userInfo.TenantId;
-                    eduModel.MallBaseId = userInfo.MallBaseId;
-                    eduModel.Sex = 0;
-                    eduModel.CreateDate = System.DateTime.Now;
-                    eduModel.Status = 0;
-                    eduModel.UserId = userInfo.UserId;
+                    eduModel = new RB_Education_BaseInfo_Extend
+                    {
+                        Id = 0,
+                        TenantId = userInfo.TenantId,
+                        MallBaseId = userInfo.MallBaseId,
+                        Sex = 0,
+                        CreateDate = System.DateTime.Now,
+                        Status = 0,
+                        UserId = userInfo.UserId
+                    };
                 }
                 eduModel.Birthday = model.StuBirth.HasValue ? model.StuBirth.Value.ToString("yyyy-MM-dd") : "";
                 eduModel.StudentId = model.StuId;
@@ -2305,10 +2298,12 @@ namespace Mall.WebApi.Controllers.Education
         public ApiResult GetEduSchool()
         {
             var userInfo = AppletUserInfo;
-            Rb_Education_School_Extend demodel = new Rb_Education_School_Extend();
-            demodel.TenantId = userInfo.TenantId;
-            demodel.MallBaseId = userInfo.MallBaseId;
-            demodel.UserId = userInfo.UserId;
+            Rb_Education_School_Extend demodel = new Rb_Education_School_Extend
+            {
+                TenantId = userInfo.TenantId,
+                MallBaseId = userInfo.MallBaseId,
+                UserId = userInfo.UserId
+            };
             var list = educationModule.GetEducationSchoolList(demodel);
             return ApiResult.Success("", list.Select(x => new { x.Id, x.CoverPhoto, x.ShoolName }));
         }
@@ -2362,13 +2357,15 @@ namespace Mall.WebApi.Controllers.Education
             //  var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
             if (eduModel == null || eduModel.Id == 0)
             {
-                eduModel = new RB_Education_EduSell_Extend();
-                eduModel.Id = 0;
-                eduModel.TenantId = userInfo.TenantId;
-                eduModel.MallBaseId = userInfo.MallBaseId;
-                eduModel.CreateDate = System.DateTime.Now;
-                eduModel.Status = 0;
-                eduModel.UserId = userInfo.UserId;
+                eduModel = new RB_Education_EduSell_Extend
+                {
+                    Id = 0,
+                    TenantId = userInfo.TenantId,
+                    MallBaseId = userInfo.MallBaseId,
+                    CreateDate = System.DateTime.Now,
+                    Status = 0,
+                    UserId = userInfo.UserId
+                };
             }
             eduModel.EduSellId = model.Id;
             bool result = activityModule.SetEduSellBaseInfo(eduModel);
@@ -2386,15 +2383,12 @@ namespace Mall.WebApi.Controllers.Education
         [HttpPost]
         public ApiResult GetBindEduSellInfo()
         {
-            var req = RequestParm;
             var userInfo = AppletUserInfo;
-
             var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
             if (eduModel == null || eduModel.Id == 0)
             {
                 eduModel = new RB_Education_EduSell_Extend();
             }
-
             return ApiResult.Success("", new
             {
                 eduModel.Id,
@@ -2414,9 +2408,7 @@ namespace Mall.WebApi.Controllers.Education
         [HttpPost]
         public ApiResult GetEduRollCallAction()
         {
-            var req = RequestParm;
             var userInfo = AppletUserInfo;
-
             var eduModel = activityModule.GetEducationSellBaseInfo(new RB_Education_EduSell_Extend { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId, UserId = userInfo.UserId }).FirstOrDefault();
             if (eduModel == null || eduModel.Id == 0)
             {
@@ -2431,6 +2423,7 @@ namespace Mall.WebApi.Controllers.Education
                 }
                 catch (Exception ex)
                 {
+                    Common.Plugin.LogHelper.Write(ex, string.Format("GetEduRollCallAction_Msg:{0}", Common.Plugin.JsonHelper.Serialize(userInfo)));
                     return ApiResult.Failed("", new { IsEduRollCallAction = 0 });
                 }
             }

Mall.WebApi/Controllers/Education/EducationController.cs

@@ -33,7 +33,7 @@ namespace Mall.WebApi.Controllers.Education
     {
         private readonly IHttpContextAccessor _accessor;
         private readonly EducationModule educationModule = new EducationModule();
-        private Module.User.UserModule UserModule = new Module.User.UserModule();
+        private readonly Module.User.UserModule UserModule = new Module.User.UserModule();
         private readonly DynamicModule dynamicModule = new DynamicModule();
         private readonly ActivityModule activityModule = new ActivityModule();
 
@@ -1029,10 +1029,11 @@ namespace Mall.WebApi.Controllers.Education
             var oldLogisticsModel = educationModule.GetDiscountCouponList(query).FirstOrDefault();
             if (oldLogisticsModel == null)
             {
-                oldLogisticsModel = new RB_Education_Coupon_Extend();
-                oldLogisticsModel.IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon;
+                oldLogisticsModel = new RB_Education_Coupon_Extend
+                {
+                    IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon
+                };
             }
-
             return ApiResult.Success("", oldLogisticsModel);
         }
 
@@ -1207,19 +1208,21 @@ namespace Mall.WebApi.Controllers.Education
                     {
                         if (!string.IsNullOrWhiteSpace(item))
                         {
-                            RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend();
-                            memberCoupon.Id = 0;
-                            memberCoupon.UserId = Convert.ToInt32(item);
-                            memberCoupon.Description = oldLogisticsModel.Describe;
-                            memberCoupon.CreateDate = System.DateTime.Now;
-                            memberCoupon.TenantId = oldLogisticsModel.TenantId;
-                            memberCoupon.MallBaseId = oldLogisticsModel.MallBaseId;
-                            memberCoupon.Remarks = "";
-                            memberCoupon.CouponId = oldLogisticsModel.ID;
-                            memberCoupon.Name = oldLogisticsModel.Name;
-                            memberCoupon.UseType = oldLogisticsModel.UseType;
-                            memberCoupon.HeXiao = oldLogisticsModel.HeXiao;
-                            memberCoupon.UseHeXiao = 0;
+                            RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend
+                            {
+                                Id = 0,
+                                UserId = Convert.ToInt32(item),
+                                Description = oldLogisticsModel.Describe,
+                                CreateDate = System.DateTime.Now,
+                                TenantId = oldLogisticsModel.TenantId,
+                                MallBaseId = oldLogisticsModel.MallBaseId,
+                                Remarks = "",
+                                CouponId = oldLogisticsModel.ID,
+                                Name = oldLogisticsModel.Name,
+                                UseType = oldLogisticsModel.UseType,
+                                HeXiao = oldLogisticsModel.HeXiao,
+                                UseHeXiao = 0
+                            };
                             if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
                             {
                                 memberCoupon.StartDate = System.DateTime.Now;
@@ -1873,7 +1876,6 @@ namespace Mall.WebApi.Controllers.Education
         {
             var qequest = RequestParm;
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            Int32.TryParse(RequestParm.uid, out int Uid);
             var model = new Rb_Education_Talk_Extend()
             {
                 Id = parms.GetInt("Id", 0),
@@ -2148,7 +2150,7 @@ namespace Mall.WebApi.Controllers.Education
             {
                 extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
             }
-            catch (Exception ex)
+            catch
             {
                 extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
             }
@@ -2204,7 +2206,7 @@ namespace Mall.WebApi.Controllers.Education
             {
                 extModel.ActivityTitleList = JsonConvert.DeserializeObject<List<RB_Education_ActivityTitle_Extend>>(jObj.GetStringValue("ActivityTitle"));
             }
-            catch (Exception ex)
+            catch
             {
                 extModel.ActivityTitleList = new List<RB_Education_ActivityTitle_Extend>();
             }
@@ -2347,7 +2349,7 @@ namespace Mall.WebApi.Controllers.Education
                 x.RefundPrice,
                 x.IsCommission,
                 x.CommissionPrice,
-                PlatformTax = x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
+                x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
                 DueInMoney = x.Money - x.Income - x.PlatformTax - x.RefundPrice,
                 PaymentWay = x.PaymentWay.HasValue ? (int)x.PaymentWay : 0,
                 PaymentWayName = (x.Money == 0 && x.TotalPoint == 0) ? "免费" : (x.PaymentWay.HasValue ? EnumHelper.GetEnumName(x.PaymentWay) : ""),
@@ -2407,7 +2409,7 @@ namespace Mall.WebApi.Controllers.Education
                     x.Money,
                     x.Income,
                     x.RefundPrice,
-                    PlatformTax = x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
+                    x.PlatformTax,//(x.PaymentWay == OrderPaymentTypeEnum.OnlinePayment ? ((x.Status == 0 && x.OrderStatus == 1) ? (Math.Round((Convert.ToDecimal(Config.SettlementRate) / 100) * (Convert.ToDecimal(x.Money)), 2, MidpointRounding.AwayFromZero)) : 0) : x.PlatformTax),
                     x.ApplyForCancelStatus,
                     x.CancelRemark,
                     x.ActivityName,
@@ -2644,7 +2646,6 @@ namespace Mall.WebApi.Controllers.Education
                         decimal dPaid = Convert.ToDecimal(dic["dPrice"]) / 100;
                         string refundid = dic["refundid"];//微信退款单号
                         string outRefundNo = dic["outRefundNo"];//商户退款单号
-
                         flag = activityModule.SetCommerceConsultApplyCancel(Id, ApplyForCancelStatus, RejectRemark, refundid, dPaid);
                     }
                     else
@@ -2673,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("报名数据不存在"); }
@@ -2689,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();
         }
 
@@ -3517,11 +3515,12 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.ParamIsNull();
             }
-            Rb_Education_School_Extend demodel = new Rb_Education_School_Extend();
-            demodel.TenantId = UserInfo.TenantId;
-            demodel.MallBaseId = parms.MallBaseId;
-            demodel.Id = Id;
-            //demodel.TeacherStatus = -1;
+            Rb_Education_School_Extend demodel = new Rb_Education_School_Extend
+            {
+                TenantId = UserInfo.TenantId,
+                MallBaseId = parms.MallBaseId,
+                Id = Id
+            };
             var model = educationModule.GetEducationSchoolList(demodel);
             var result = model.Select(x => new
             {
@@ -3593,10 +3592,12 @@ namespace Mall.WebApi.Controllers.Education
             {
                 return ApiResult.Failed("请传递参数");
             }
-            Rb_Education_School_Extend demodel = new Rb_Education_School_Extend();
-            demodel.TenantId = UserInfo.TenantId;
-            demodel.MallBaseId = parms.MallBaseId;
-            demodel.Ids = idInfo;
+            Rb_Education_School_Extend demodel = new Rb_Education_School_Extend
+            {
+                TenantId = UserInfo.TenantId,
+                MallBaseId = parms.MallBaseId,
+                Ids = idInfo
+            };
             var list = educationModule.GetEducationSchoolList(demodel);
             if (list.Any(x => x.UserCount > 0))
             {

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -1508,10 +1508,9 @@ namespace Mall.WebApi.Controllers.MallBase
                         Status = 0,
                         CreateDate = System.DateTime.Now
                     };
-
                     var queryResult = miaiModule.SetMiAiBaseInfoQuery(queryModel);
                 }
-                catch (Exception ex)
+                catch
                 {
 
                 }
@@ -1557,7 +1556,6 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetBaseInfoQueryList()
         {
             var parms = RequestParm;
-            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
             RB_MiAi_BaseInfoQuery demodel = JsonConvert.DeserializeObject<RB_MiAi_BaseInfoQuery>(RequestParm.msg.ToString());
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
@@ -1643,9 +1641,6 @@ namespace Mall.WebApi.Controllers.MallBase
             }));
         }
 
-
-
-
         /// <summary>
         /// 获取每日随机信息
         /// </summary>
@@ -1662,8 +1657,6 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.UserId = parms.UserId;
 
             var dayQueryModel = new RB_MiAi_BaseInfoDayQuery();
-            //if (demodel.UserId > 0)//说明用户登录了的
-            //{
             try
             {
                 if (demodel.Sex == 0 && demodel.UserId > 0)
@@ -1710,9 +1703,8 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             catch (Exception ex)
             {
-
+                Common.Plugin.LogHelper.Write(ex, string.Format("GetDailyRandomList_Msg:{0}", Common.Plugin.JsonHelper.Serialize(parms)));
             }
-            //   }
             var list = miaiModule.GetFirstBaseInfoPageList_V2(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
 
             List<Model.Extend.MarketingCenter.miaiUserDetail> newGoodsList = new List<Model.Extend.MarketingCenter.miaiUserDetail>();

Mall.WebApi/Controllers/Miai/MiaiController.cs

@@ -1082,17 +1082,18 @@ namespace Mall.WebApi.Controllers.MallBase
                 {
                     oldBaseInfo.AlbumList = JsonConvert.DeserializeObject<List<string>>(oldBaseInfo.Album);
                 }
-
             }
             else
             {
-                oldBaseInfo = new RB_MiAi_BaseInfo_Extend();
-                oldBaseInfo.Sex = 1;
-                oldBaseInfo.EducationType = Common.Enum.MiAi.EducationTypeEnum.HighSchool;
-                oldBaseInfo.Marriage = Common.Enum.MiAi.MarriageEnum.Unmarried;
-                oldBaseInfo.CarInfo = Common.Enum.MiAi.CarInfoEnum.Yes;
-                oldBaseInfo.HouseInfo = Common.Enum.MiAi.HouseInfoEnum.Yes;
-                oldBaseInfo.AlbumList = new List<string>();
+                oldBaseInfo = new RB_MiAi_BaseInfo_Extend
+                {
+                    Sex = 1,
+                    EducationType = Common.Enum.MiAi.EducationTypeEnum.HighSchool,
+                    Marriage = Common.Enum.MiAi.MarriageEnum.Unmarried,
+                    CarInfo = Common.Enum.MiAi.CarInfoEnum.Yes,
+                    HouseInfo = Common.Enum.MiAi.HouseInfoEnum.Yes,
+                    AlbumList = new List<string>()
+                };
             }
             return ApiResult.Success("", new
             {

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -506,7 +506,6 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull(message: "请选择门店");
             }
-            int UserId = req.UserId;
             object Robj = productModule.GetServerpersionListInfoModule(GoodsId, req.TenantId, req.MallBaseId, storeId: StoreId, servicePersionId: servicePersionId, chooseDate: chooseDate);
             return ApiResult.Success("", Robj);
         }
@@ -834,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

@@ -26,11 +26,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
     [EnableCors("AllowCors")]
     public class AppletTradeController : BaseController
     {
-        /// <summary>
-        /// 联系人处理类对象
-        /// </summary>
-        private readonly ContractModule module = new ContractModule();
-
         /// <summary>
         /// 投资采购处理类对象
         /// </summary>
@@ -874,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),
@@ -913,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()
             {
             };
@@ -1048,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)
@@ -1073,17 +1066,17 @@ namespace Mall.WebApi.Controllers.TradePavilion
 
                 foreach (var item in firstShopModel.FirstShopLinkManList)
                 {
-                    RB_Commerce_Consult_Extend demodel = new RB_Commerce_Consult_Extend();
-                    demodel.ActivityName = model.ActivityName;
-                    demodel.LinkMan = item.LinkMan;
-                    demodel.LinkTel = item.LinkTel;
-                    demodel.Post = item.Post;
-                    demodel.CompanyName = firstShopModel.CompanyName;
-                    demodel.ActivityIds = firstShopModel.ActivityIds;
-                    demodel.CountryInfo = item.CountryInfo;
-                    demodel.Nature = firstShopModel.Nature;
-                    Random R = new Random();
-                    int Rstr = R.Next(111, 999);
+                    RB_Commerce_Consult_Extend demodel = new RB_Commerce_Consult_Extend
+                    {
+                        ActivityName = model.ActivityName,
+                        LinkMan = item.LinkMan,
+                        LinkTel = item.LinkTel,
+                        Post = item.Post,
+                        CompanyName = firstShopModel.CompanyName,
+                        ActivityIds = firstShopModel.ActivityIds,
+                        CountryInfo = item.CountryInfo,
+                        Nature = firstShopModel.Nature
+                    };
                     demodel.ActivityId = model.Id;
                     demodel.Remark = firstShopModel.Remark;
                     demodel.UserId = userInfo.UserId;
@@ -1097,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>
@@ -1876,17 +1863,15 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [AllowAnonymous]
         public ApiResult GetBrandClassList()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var query = new RB_BrandClass_Extend();
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
+            var query = new RB_BrandClass_Extend
+            {
+                MallBaseId = RequestParm.MallBaseId,
+                TenantId = RequestParm.TenantId
+            };
             var list = carrierModule.GetBrandClassList(query);
             return ApiResult.Success(data: list);
         }
 
-
-
-
         #region 奖章
         [HttpPost]
         [AllowAnonymous]
@@ -1925,18 +1910,19 @@ namespace Mall.WebApi.Controllers.TradePavilion
         public ApiResult GetMyBrandList()
         {
             var userInfo = base.AppletUserInfo;
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var query = new RB_Brand_Extend();
-            query.MallBaseId = userInfo.MallBaseId;
-            query.TenantId = userInfo.TenantId;
-            query.RanQi = -1;
-            query.KongTiao = -1;
-            query.XinFeng = -1;
-            query.Plumbing = -1;
-            query.Caliber = -1;
-            query.PaiYan = -1;
-            query.Sewage = -1;
-            query.UserId = userInfo.UserId;
+            var query = new RB_Brand_Extend
+            {
+                MallBaseId = userInfo.MallBaseId,
+                TenantId = userInfo.TenantId,
+                RanQi = -1,
+                KongTiao = -1,
+                XinFeng = -1,
+                Plumbing = -1,
+                Caliber = -1,
+                PaiYan = -1,
+                Sewage = -1,
+                UserId = userInfo.UserId
+            };
             var extList = carrierModule.GetBrandListByWhere(query);
             return ApiResult.Success(data: extList);
         }
@@ -2379,15 +2365,13 @@ 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)
             {
                 return ApiResult.ParamIsNull();
             }
-
-            string msg = firstShopListModule.CancelAppletFirstShopListInfo(EnrollId, userInfo);
+            string msg = firstShopListModule.CancelAppletFirstShopListInfo(EnrollId);
             if (msg == "")
             {
                 return ApiResult.Success();

Mall.WebApi/Controllers/TradePavilion/TradeController.cs

@@ -647,7 +647,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             };
             query.MallBaseId = RequestParm.MallBaseId;
             query.TenantId = RequestParm.TenantId;
-            var list = consultModule.GetCommerceConsultPageModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            var list = consultModule.GetCommerceConsultPageModule(pageModel.pageIndex, pageModel.pageSize, out _, query);
             string ExcelName = "活动用户导出" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
             List<ExcelDataSource> slist = new List<ExcelDataSource>();
             ExcelDataSource header = new ExcelDataSource()
@@ -1189,8 +1189,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 var umodel = userModule.GetMemberUserInfo(model.CreateBy);
                 if (umodel != null && !string.IsNullOrWhiteSpace(umodel.OpenId))
                 {
-                    List<string> openidList = new List<string>();
-                    openidList.Add(umodel.OpenId);
+                    List<string> openidList = new List<string>
+                    {
+                        umodel.OpenId
+                    };
                     new Module.User.MiniProgramMsgModule().SendHatchExamineMsg(model.TenantId, model.MallBaseId, openidList, AuditState == 2 ? "认证通过" : "认证失败", "首店认证结果通知", System.DateTime.Now.ToString("yyyy年MM月dd日 HH:mm"));
                 }
                 return ApiResult.Success();
@@ -1391,13 +1393,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetSetCarrier()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             RB_Carrier_Extend query = JsonConvert.DeserializeObject<RB_Carrier_Extend>(RequestParm.msg.ToString());
             if (string.IsNullOrWhiteSpace(query.CarrierName))
             {
                 return ApiResult.Failed("请输入载体名称");
             }
-
             if (string.IsNullOrWhiteSpace(query.Developers))
             {
                 return ApiResult.Failed("请输入开发商");
@@ -1496,16 +1496,14 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     }
                 }
             }
-            catch (Exception ex)
+            catch
             {
                 demodel.ExcelEnumIds = new List<int>();
-
                 for (int i = 1; i <= 15; i++)
                 {
                     demodel.ExcelEnumIds.Add(i);
                 }
             }
-
             string ExcelName = "载体列表" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
             List<ExcelDataSource> slist = new List<ExcelDataSource>();
             if (demodel.ExcelEnumIds == null || !demodel.ExcelEnumIds.Any())
@@ -1662,10 +1660,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetBrandClassList()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var query = new RB_BrandClass_Extend();
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
+            var query = new RB_BrandClass_Extend
+            {
+                MallBaseId = RequestParm.MallBaseId,
+                TenantId = RequestParm.TenantId
+            };
             var list = carrierModule.GetBrandClassList(query);
             return ApiResult.Success(data: list);
         }
@@ -1696,16 +1695,11 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetSetBrandClass()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             RB_BrandClass_Extend query = JsonConvert.DeserializeObject<RB_BrandClass_Extend>(RequestParm.msg.ToString());
             if (string.IsNullOrWhiteSpace(query.ClassName))
             {
                 return ApiResult.Failed("请输入分类名称");
             }
-            //if (string.IsNullOrWhiteSpace(query.Logo))
-            //{
-            //    return ApiResult.Failed("请上传Logo");
-            //}
             if (query.ID == 0)
             {
                 query.CreateDate = System.DateTime.Now;
@@ -1821,7 +1815,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetSetBrand()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             RB_Brand_Extend query = JsonConvert.DeserializeObject<RB_Brand_Extend>(RequestParm.msg.ToString());
             if (string.IsNullOrWhiteSpace(query.BrandName))
             {
@@ -1908,10 +1901,9 @@ namespace Mall.WebApi.Controllers.TradePavilion
                     }
                 }
             }
-            catch (Exception ex)
+            catch
             {
                 demodel.ExcelEnumIds = new List<int>();
-
                 for (int i = 1; i <= 23; i++)
                 {
                     demodel.ExcelEnumIds.Add(i);
@@ -2595,7 +2587,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
             {
                 return ApiResult.ParamIsNull("请传递文件路径");
             }
-           bool result = firstShopListModule.DelFirstShopEnrollZipExport(ListIds);
+            firstShopListModule.DelFirstShopEnrollZipExport(ListIds);
             return ApiResult.Success("");
         }
 
@@ -2726,20 +2718,18 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-
         [HttpPost]
         public ApiResult GetPrizeList()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            var query = new RB_Prize_Extend();
-            query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
+            var query = new RB_Prize_Extend
+            {
+                MallBaseId = RequestParm.MallBaseId,
+                TenantId = RequestParm.TenantId
+            };
             var extList = carrierModule.GetPrizeList(query);
             return ApiResult.Success(data: extList);
         }
 
-
-
         /// <summary>
         /// 新增/修改奖项信息
         /// </summary>
@@ -2747,7 +2737,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
         [HttpPost]
         public ApiResult GetSetPrize()
         {
-            JObject parms = JObject.Parse(RequestParm.msg.ToString());
             RB_Prize_Extend query = JsonConvert.DeserializeObject<RB_Prize_Extend>(RequestParm.msg.ToString());
             if (string.IsNullOrWhiteSpace(query.Name))
             {

Mall.WebApi/Controllers/User/TenantController.cs

@@ -133,7 +133,7 @@ namespace Mall.WebApi.Controllers.User
                             RoleAuth = 1;
                         }
                     }
-                    catch (Exception ex)
+                    catch
                     {
                         
                     }