Commit f38dc68a authored by 吴春's avatar 吴春

提交代码

parent 2c3cac76
...@@ -1045,7 +1045,7 @@ namespace Mall.Module.User ...@@ -1045,7 +1045,7 @@ namespace Mall.Module.User
{ {
touser = item, touser = item,
template_id = appletWeChatModel.HatchExamineTpl, template_id = appletWeChatModel.HatchExamineTpl,
page = "pages/order/index/index", page = "pages/user-center/user-center",
data = new data = new
{ {
phrase1 = new phrase1 = new
......
...@@ -3,6 +3,7 @@ using System.Collections.Generic; ...@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Mall.CacheManager.User; using Mall.CacheManager.User;
using Mall.Common;
using Mall.Common.API; using Mall.Common.API;
using Mall.Common.Enum.Goods; using Mall.Common.Enum.Goods;
using Mall.Common.Enum.User; using Mall.Common.Enum.User;
...@@ -898,6 +899,15 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -898,6 +899,15 @@ namespace Mall.WebApi.Controllers.TradePavilion
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0; query.TenantId = userInfo?.TenantId ?? 0;
var extModel = carrierModule.GetCarrierModel(query); var extModel = carrierModule.GetCarrierModel(query);
if (userInfo == null)
{
userInfo = new AppletUserInfo
{
UserId = RequestParm.UserId,
MallBaseId = RequestParm.MallBaseId,
TenantId = RequestParm.TenantId
};
}
if (userInfo.UserId > 0 && extModel.ID > 0) if (userInfo.UserId > 0 && extModel.ID > 0)
{ //判断是否已经关注过 { //判断是否已经关注过
var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 1, UserId = userInfo.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault(); var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 1, UserId = userInfo.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment