1

server/marketserver/api/v1/market/market.go

@@ -6,6 +6,7 @@ import (
 	"mt"
 	"main/constant"
 	"main/common"
+	"main/service"
 	"jccommon"
 	. "main/global"
 	"fmt"
@@ -19,6 +20,8 @@ type MarketApi struct {
 }
 
 func (this *MarketApi) ProductList(c *gin.Context) {
+	openId := c.MustGet("open_id").(string)
+	cartDb := service.GetShopCartByOpenId(openId)
 	netId := q5.ToInt64(c.Param("net_id"))
 	reqJson := struct {
 		PageSize interface{} `json:"page_size"`
@@ -137,6 +140,7 @@ SELECT * FROM t_order A WHERE idx > %d AND net_id = %d
 		Rows []struct{
 			Event interface{} `json:"event"`
 			Nft interface{} `json:"nft"`
+			InShopCart int32 `json:"in_shopcart"`
 		} `json:"rows"`
 	}{}
 	q5.NewSlice(&rspObj.Rows, 0, 10)
@@ -168,6 +172,9 @@ SELECT * FROM t_order A WHERE idx > %d AND net_id = %d
 			p := q5.NewSliceElement(&rspObj.Rows)
 			p.Event = val.Payload
 			p.Nft = val.NftCache.GetJsonData()
+			if cartDb != nil && cartDb.GetGoods(val.NetId, val.ContractAddress, val.TokenId) != nil{
+				p.InShopCart = 1
+			}
 		}
 	}
 	c.JSON(200, rspObj)

server/marketserver/middleware/jwtauth.go

@@ -8,14 +8,28 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+func MaybeJwtAuth(c *gin.Context) {
+	internalJwtAuth(c, true)
+}
+
+func JwtAuth(c *gin.Context) {
+	internalJwtAuth(c, false)
+}
+
 /*
 	'Authorization Bearer {JwtToken}'
 */
-func JwtAuth(c *gin.Context) {
+func internalJwtAuth(c *gin.Context, maybe bool) {
 	tokenHeader := c.Request.Header.Get("Authorization")
 	jwtToken := ""
 	if len(tokenHeader) > 8 {
 		jwtToken = tokenHeader[7:len(tokenHeader)]
+	} else {
+		if maybe {
+			c.Set("open_id", "")
+			c.Next()
+			return
+		}
 	}
 
 	params := map[string]string{

server/marketserver/router/market/market.go

@@ -3,13 +3,16 @@ package market
 import (
 	"f5"
 	"main/api/v1"
+	"main/middleware"
 )
 
 type MarketRouter struct{}
 
 func (this *MarketRouter) InitRouter() {
 	api := v1.ApiGroupApp.MarketApiGroup
-	f5.GetApp().GetGinEngine().POST("/api/market/product/list/:net_id", api.MarketApi.ProductList)
+	f5.GetApp().GetGinEngine().POST("/api/market/product/list/:net_id",
+		middleware.MaybeJwtAuth,
+		api.MarketApi.ProductList)
 	f5.GetApp().GetGinEngine().GET("/api/market/transaction/history/:net_id/:account_address",
 		api.MarketApi.TransactionHistory)
 	f5.GetApp().GetGinEngine().GET("/api/market/product/category/:net_id", api.MarketApi.CategoryGoodsNum)

server/marketserver/service/shopcart.go

@@ -0,0 +1,29 @@
+package service
+
+import (
+	"q5"
+	"f5"
+	"main/constant"
+	"main/common"
+)
+
+func GetShopCartByOpenId(openId string) *common.ShopCart {
+	cartDb := common.NewShopCart()
+	f5.GetGoStyleDb().OrmSelectOne(
+		constant.BCNFT_DB,
+		"t_shopcart",
+		[][]string{
+			{"open_id", openId},
+		},
+		func (err error, ds* f5.DataSet) {
+			if err != nil {
+				return
+			}
+			if ds.Next() {
+				cartDb := common.NewShopCart()
+				if q5.DecodeJson(ds.GetByName("data"), cartDb) == nil {
+				}
+			}
+		})
+	return cartDb
+}