From 6ead25a7af74374012a7876f9bf2d12fadb2718a Mon Sep 17 00:00:00 2001
From: rosydev <rosydev@rosy.net.cn>
Date: Thu, 3 Mar 2022 16:52:06 +0800
Subject: [PATCH] -----bug of goto shop

---
 business/jxstore/cms/user2.go | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go
index 26a9742ea..a1dc6d70a 100644
--- a/business/jxstore/cms/user2.go
+++ b/business/jxstore/cms/user2.go
@@ -1223,21 +1223,23 @@ func UpdateUserLastInfo(ctx *jxcontext.Context, storeID, brandID int) (err error
 		db = dao.GetDB()
 	)
 	if user, err := dao.GetUserByID(db, "user_id", ctx.GetUserID()); err == nil {
-
-		if storeID != 0 {
+		//不带参数进入的店铺，品牌值为0
+		if storeID == 0 || storeID == 102919 {
 			user.LastStoreID = storeID
-			_, err = dao.UpdateEntity(db, user, "LastStoreID")
-		}
-		//扫码进店,会绑定这个店铺。通过公众号进入模板店后，初始化为最初状态。
-		// 上次看到的是模板店，初始化为未进过任何店.Shi
-		if brandID != 0 {
-			if storeID == 102919 {
+			if user.LastBrandID > 1 {
 				user.LastBrandID = 0
-			} else {
-				user.LastBrandID = brandID
 			}
-			_, err = dao.UpdateEntity(db, user, "LastBrandID")
+		} else { //带参数进入的店铺
+			user.LastStoreID = storeID
+			if storeID == model.MatterStoreID { //物料店比较特殊
+				user.LastBrandID = 1
+			} else {
+				user.LastBrandID = storeID
+			}
+
 		}
+		_, err = dao.UpdateEntity(db, user, "LastStoreID")
+		_, err = dao.UpdateEntity(db, user, "LastBrandID")
 	}
 	return err
 }