页面修改

Mall.Module.Miai/MiaiModule.cs

@@ -200,7 +200,6 @@ namespace Mall.Module.Miai
                     userIds = string.Join(",", list.Select(x => x.UserId).Distinct());
                 }
                 var blist = member_UserRepository.GetMiAiList(new Model.Extend.User.RB_Member_MiaiUser_Extend { TenantId = demodel.TenantId, UserIds = userIds });
-                // var blist = miai_BaseInfoRepository.GetFirstBaseInfoList(new RB_MiAi_BaseInfo_Extend() { TenantId = demodel.TenantId, UserIds = userIds });
                 foreach (var item in list)
                 {
                     var bmodel = blist.Where(x => x.Id == (demodel.VsisitorType == 1 ? item.CreateBy : item.UserId)).FirstOrDefault();
@@ -701,7 +700,7 @@ namespace Mall.Module.Miai
         /// </summary>
         /// <param name="dmodel"></param>
         /// <returns></returns>
-        public List<RB_Miai_Activity_Extend> GetMiaiActivityList(RB_Miai_Activity_Extend dmodel, bool IsAll = false)
+        public List<RB_Miai_Activity_Extend> GetMiaiActivityList(RB_Miai_Activity_Extend dmodel)
         {
             var list = miai_ActivityRepository.GetList(dmodel, IsAll: false);
             return list;

Mall.Module.Product/ProductModule.cs

@@ -1343,7 +1343,7 @@ namespace Mall.Module.Product
             var goodsModel = goodsRepository.GetEntity(goodsId);
 
             //商品信息
-            var info = new object();
+            object info;
             var goodsPoster = miniProgram_GoodPosterRepository.GetEntityExtRepository(new RB_MiniProgram_GoodPoster_Extend()
             {
                 MallBaseId = mallBaseId,

Mall.Module.User/MemberGroupModule.cs

@@ -116,12 +116,12 @@ namespace Mall.Module.User
         /// <returns></returns>
         public bool SetDefaultGroupModule(int GroupId,int MallBaseId)
         {
-            bool flag = member_GroupRepository.UpdateIsDefaultRepository(MallBaseId);
+            member_GroupRepository.UpdateIsDefaultRepository(MallBaseId);
             Dictionary<string, object> fileds = new Dictionary<string, object>()
             {
                 {nameof(RB_Member_Group_Extend.IsDefault),1 }
             };
-            flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), GroupId));
+            bool flag = member_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Member_Group_Extend.GroupId), GroupId));
             return flag;
         }
 

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -768,7 +768,7 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid
         /// <returns></returns>
         public List<RB_Member_User_Extend> AutoReleaseTheOffline(int tenantId, int mallBaseId)
         {
-            string sql = $@"SELECT * FROM rb_member_user WHERE DownlineCondition=4 and IsDistributor = 0 and SuperiorId >0 AND DATE_ADD(CreateDate,INTERVAL 7 DAY) < '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
+            string sql = $@"SELECT * FROM rb_member_user WHERE DownlineCondition=4 and IsDistributor = 0 and SuperiorId >0 AND DATE_ADD(CreateDate,INTERVAL 7 DAY) < '{Common.ConvertHelper.FormatTime(DateTime.Now)}'";
             return Get<RB_Member_User_Extend>(sql).ToList();
         }
 

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -1757,7 +1757,7 @@ namespace Mall.WebApi.Controllers
                                                     MallBaseId = MallBaseId,
                                                     ActivityIds = Ids,
                                                     OrderBy = 1
-                                                }, IsAll: false);
+                                                });
 
                                                 //判断用户是否点赞
                                                 List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
@@ -1809,7 +1809,7 @@ namespace Mall.WebApi.Controllers
                                                     MallBaseId = MallBaseId,
                                                     ActivityIds = Ids,
                                                     OrderBy = 1
-                                                }, IsAll: false);
+                                                });
                                                 //判断用户是否点赞
                                                 List<RB_MiAi_DianZan_Extend> dianZanList = new List<RB_MiAi_DianZan_Extend>();
                                                 if (UserId > 0)
@@ -3285,8 +3285,7 @@ namespace Mall.WebApi.Controllers
                     }
                 }
             }
-            //商城风格
-            var mallStyle = new object();
+        
 
             ResultMallShopStyle resultMallShopStyle = new ResultMallShopStyle();
             switch (miniProgram.MallShopStyle)
@@ -3325,7 +3324,8 @@ namespace Mall.WebApi.Controllers
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#00d6a6", secondary = "#ffc86d", IsEducation = 1 };
                     break;
             }
-            mallStyle = new
+            //商城风格
+            var mallStyle = new
             {
                 resultMallShopStyle?.main,
                 resultMallShopStyle?.secondary,

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -1410,7 +1410,7 @@ namespace Mall.WebApi.Controllers.MallBase
                         IsFollow = isFollow,
                         SexStr = (oldBaseInfo != null && oldBaseInfo.Id > 0) ? (oldBaseInfo.Sex == 1 ? "男" : "女") : "",
                         Birthday = oldBaseInfo.Birthday ?? "",
-                        BirthdayYear = BirthdayYear,
+                        BirthdayYear,
                         Sex = oldBaseInfo?.Sex ?? 0,
                         oldBaseInfo?.Height,
                         oldBaseInfo?.Weight,