Merge branch 'master' of git.oa00.com:jyy/recook-plus

internal/api/manage/promotion/update.go

@@ -250,7 +250,7 @@ type jdRes struct {
 	SkuList []goods3.RecookGoodsSkuModel `json:"skuList"`
 }
 
-//返回前端50条随机的京东商品
+// JDGoods 返回前端50条随机的京东商品
 func JDGoods(c *gin.Context) {
 
 	var p jdReq
@@ -262,14 +262,25 @@ func JDGoods(c *gin.Context) {
 	q := mysql2.Db.Table((&promotion.Goods{}).TableName()).Select("goods_id").Where("promotion_id=?", p.PromotionId)
 	var gl []int64
 	sub := mysql2.Db.Table((&goods3.RecookGoodsSkuModel{}).TableName()).
-		Select("goods_id").Where("third_party_type = 3").Where("purchase_price >= 103").
-		Where("purchase_price < 200").Group("goods_id")
-	mysql2.Db.Table((&goods3.RecookGoodsInfoModel{}).TableName()).Where("vendor_id = 1800").Where("id in (?)", sub).
-		Where("publish_status=1").Where("id not in (?)", q).Where("id not in (?)", p.GoodsIds).Pluck("id", &gl)
+		Select("goods_id").
+		Where("third_party_type = 3").
+		Where("inventory <> 0").
+		Where("purchase_price >= 103").
+		Where("purchase_price < 200").
+		Group("goods_id")
+
+	mysql2.Db.Table((&goods3.RecookGoodsInfoModel{}).TableName()).
+		Where("vendor_id = 1800").
+		Where("id in (?)", sub).
+		Where("publish_status=1").
+		Where("id not in (?)", q).
+		Where("id not in (?)", p.GoodsIds).
+		Pluck("id", &gl)
+
 	sortI := rand.Perm(len(gl))
-	newsort := sortI[0:20]
+	newSort := sortI[0:20]
 	var ngl []int64
-	for _, v := range newsort {
+	for _, v := range newSort {
 		ngl = append(ngl, gl[v])
 	}
 	fmt.Println(ngl)

internal/api/mobile/messages/message.go

@@ -33,7 +33,7 @@ const (
 	regionId          = "cn-hangzhou"
 	accessKey         = "LTAI5t8N2GVy5Q8hKLJCvtmd"
 	accessKeySecret   = "Lo5rlllMFuvtrI9voeQaeOk227kkB6"
-	loginTemplateCode = "SMS_231305089"
+	loginTemplateCode = "SMS_232590019"
 )
 
 func init() {

internal/v2/controller/app/message/utils.go

@@ -20,7 +20,7 @@ const (
 	regionId          = "cn-hangzhou"
 	accessKey         = "LTAI5t8N2GVy5Q8hKLJCvtmd"
 	accessKeySecret   = "Lo5rlllMFuvtrI9voeQaeOk227kkB6"
-	loginTemplateCode = "SMS_231305089"
+	loginTemplateCode = "SMS_232590019"
 )
 
 func init() {

internal/v2/logic/manage/goods/goods.go

@@ -2574,7 +2574,7 @@ const (
 	regionId          = "cn-hangzhou"
 	accessKey         = "LTAI5t8N2GVy5Q8hKLJCvtmd"
 	accessKeySecret   = "Lo5rlllMFuvtrI9voeQaeOk227kkB6"
-	loginTemplateCode = "SMS_231305089"
+	loginTemplateCode = "SMS_232590019"
 )
 
 var client *sdk.Client

internal/v2/logic/supplier/gysretreat/logic.go

@@ -31,7 +31,7 @@ const (
 	regionId          = "cn-hangzhou"
 	accessKey         = "LTAI5t8N2GVy5Q8hKLJCvtmd"
 	accessKeySecret   = "Lo5rlllMFuvtrI9voeQaeOk227kkB6"
-	loginTemplateCode = "SMS_231305089"
+	loginTemplateCode = "SMS_232590019"
 )
 
 var client *sdk.Client