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

Mall.Common/Plugin/WeiXinHelper.cs

@@ -55,9 +55,14 @@ namespace Mall.Common.Plugin
                 }
             }
             catch (Exception ex)
+            {
+                //GetWeChatOpenId:result={"errcode":40163,"errmsg":"code been used, hints: [ req_id: AHGbGiqNe-OhJh.a ]"}&&Code=051S1Ykl2wYCF64U7gnl2AK6ga0S1Yk2
+                //Code过期
+                if (result != null && !string.IsNullOrEmpty(result) && !result.Contains("40163"))
                 {
                     Common.Plugin.LogHelper.Write(ex, string.Format("GetWeChatOpenId:result={0}&&Code={1}", result, Code));
                 }
+            }
             return openid;
         }
 

Mall.Module.Miai/MiaiModule.cs

@@ -129,7 +129,7 @@ namespace Mall.Module.Miai
                 VisitorModel = new
                 {
                     Num = Num4,
-                    Title = "拼拼Plus",
+                    Title = "访客",
                     Description = GetMiaiMessageDescription(message4),
                     Time = message4 != null ? message4.CreateDate.ToString("yyyy-MM-dd HH:mm") : ""
                 }
@@ -213,6 +213,8 @@ namespace Mall.Module.Miai
                     return "有新违规通知";
                 case Common.Enum.MiAi.MessageTypeEnum.ActivityCancel:
                     return "有活动报名被取消";
+                case Common.Enum.MiAi.MessageTypeEnum.FollowMember:
+                    return "有新用户关注了你";
                 default:
                     return "";
             }

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -541,7 +541,6 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId, miniProgram);
                 user_info = memberModel;
-
             }
 
             var data = new object();

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -2800,7 +2800,7 @@ namespace Mall.WebApi.Controllers
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#555555", IsEducation = 0 };
                     break;
                 case MallShopStyleEnum.FreshGreen:
-                    resultMallShopStyle = new ResultMallShopStyle() { main = "#63be72", secondary = "#e1f4e3", IsEducation = 0 };
+                    resultMallShopStyle = new ResultMallShopStyle() { main = "#00C6C1", secondary = "#e1f4e3", IsEducation = 0 };
                     break;
                 case MallShopStyleEnum.BusinessBlue:
                     resultMallShopStyle = new ResultMallShopStyle() { main = "#4a90e2", secondary = "#dbe9f9", IsEducation = 0 };
@@ -2901,6 +2901,7 @@ namespace Mall.WebApi.Controllers
                 is_show_sales_num = mallBaseModel?.ListBuyCount,
                 is_show_goods_name = mallBaseModel?.ListName,
                 is_show_korea = miniProgram?.IsKorea ?? 0,//是否是韩国馆(1-是)
+                is_show_miai = miniProgram?.IsOpenMiAi ?? 0,//是否开启相亲项目(1-是)
                 is_underline_price = mallBaseModel?.DetailsLineationPrice,
                 is_express = mallBaseModel?.DeatilsExpress,
                 is_not_share_show = mallBaseModel?.OtherNoShare,

Mall.WebApi/Controllers/Miai/AppletMiaiController.cs

@@ -48,8 +48,6 @@ namespace Mall.WebApi.Controllers.MallBase
         {
             var req = base.RequestParm;
             RB_Miai_Forum_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Forum_Extend>(req.msg.ToString());
-
-            demodel.TenantId = req.TenantId;
             demodel.MallBaseId = req.MallBaseId;
             demodel.IsShow = 1;
             var list = miaiModule.GetForumList(demodel);
@@ -75,7 +73,6 @@ namespace Mall.WebApi.Controllers.MallBase
             var parms = RequestParm;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Miai_Activity_Extend demodel = JsonConvert.DeserializeObject<RB_Miai_Activity_Extend>(parms.msg.ToString());
-            demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
@@ -127,7 +124,6 @@ namespace Mall.WebApi.Controllers.MallBase
                 userInfo = new AppletUserInfo
                 {
                     UserId = 0,
-                    TenantId = RequestParm.TenantId,
                     MallBaseId = RequestParm.MallBaseId
                 };
             }
@@ -272,6 +268,7 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetActivityDiscussPageList()
         {
             var parms = RequestParm;
@@ -281,7 +278,6 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("请传递活动id");
             }
-            demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityDiscussPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
@@ -317,6 +313,7 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <returns></returns>
         [HttpPost]
+        [AllowAnonymous]
         public ApiResult GetActivityReplyPageList()
         {
             var parms = RequestParm;
@@ -326,7 +323,6 @@ namespace Mall.WebApi.Controllers.MallBase
             {
                 return ApiResult.ParamIsNull("请传递上级id");
             }
-            demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             var list = miaiModule.GetActivityReplyPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
@@ -699,6 +695,30 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             var list = miaiModule.GetMiaiMessageVisitorPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
+            //根据日期分组
+            //List<string> DateList = list.Select(x => x.CreateDate.ToString("yyyy-MM-dd")).Distinct().ToList();
+            //List<object> RList = new List<object>();
+            //foreach (var item in DateList) {
+            //    RList.Add(new
+            //    {
+            //        DateStr = item,
+            //        List = list.Where(x => x.CreateDate.ToString("yyyy-MM-dd") == item).Select(x => new
+            //        {
+            //            x.Id,
+            //            x.Type,
+            //            TypeName = x.Type.GetEnumName(),
+            //            UserId = demodel.VsisitorType == 1 ? x.CreateBy : x.UserId,
+            //            UserName = x.Name,
+            //            x.RealName,
+            //            x.Photo,
+            //            x.Sex,
+            //            x.Status,
+            //            CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+            //            CreateDateDay = x.CreateDate.ToString("yyyy-MM-dd"),
+            //            CreateDateHour = x.CreateDate.ToString("HH:mm")
+            //        })
+            //    });
+            //}
             pagelist.pageData = list.Select(x => new
             {
                 x.Id,
@@ -710,7 +730,9 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.Photo,
                 x.Sex,
                 x.Status,
-                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm")
+                CreateDate = x.CreateDate.ToString("yyyy-MM-dd HH:mm"),
+                CreateDateDay = x.CreateDate.ToString("yyyy-MM-dd"),
+                CreateDateHour = x.CreateDate.ToString("HH:mm")
             });
             return ApiResult.Success("", pagelist);
         }

Mall.WebApi/Controllers/TradePavilion/AppletTradeController.cs

@@ -325,6 +325,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
         /// 获取商会活动类型列表
         /// </summary>
         /// <returns></returns>
+        [AllowAnonymous]
         public ApiResult GetCommerceActivityTypeList()
         {
             var query = new RB_Commerce_ActivityType_Extend();
@@ -349,7 +350,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
                 ActivityType = jObj.GetInt("ActivityType")
             };
             query.MallBaseId = RequestParm.MallBaseId;
-            query.TenantId = RequestParm.TenantId;
             var list = activityModule.GetCommerceActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
             pageModel.count = Convert.ToInt32(rowsCount);
             pageModel.pageData = list;