Merge branch 'dev' of http://119.23.72.7/q578953158/go_sku_server into dev

service/service_ly.go

@@ -6,7 +6,6 @@ import (
 	"github.com/syyongx/php2go"
 	"github.com/syyongx/php2go"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/gjson"
 	"go_sku_server/model"
 	"go_sku_server/model"
-	"go_sku_server/pkg/common"
 	"go_sku_server/pkg/gredis"
 	"go_sku_server/pkg/gredis"
 	"sort"
 	"sort"
 	"sync"
 	"sync"
@@ -45,7 +44,6 @@ func (ls *LyService) LyGoodsDetail(ctx *gin.Context, goodsIds []string, ch chan
 		SpecialInvoice:  ctx.Request.FormValue("power[special_invoice]"),
 		SpecialInvoice:  ctx.Request.FormValue("power[special_invoice]"),
 		VerifyBlacklist: ctx.Request.FormValue("power[verify_blacklist]"),
 		VerifyBlacklist: ctx.Request.FormValue("power[verify_blacklist]"),
 	}
 	}
-	common.PrintDebugHtml(ctx,power)
 	//批量获取商品详情
 	//批量获取商品详情
 	skuArr := gredis.Hmget("default_r", "sku", goodsIds)
 	skuArr := gredis.Hmget("default_r", "sku", goodsIds)
 	//为了性能着想,这边也先去批量获取spu的信息
 	//为了性能着想,这边也先去批量获取spu的信息
@@ -136,11 +134,9 @@ func (ls *LyService) LyGoodsDetail(ctx *gin.Context, goodsIds []string, ch chan
 				hasActivity = true
 				hasActivity = true
 			}
 			}
 		}
 		}
-		common.PrintDebugHtml(ctx,power.Member)
 
 
 		//获取会员价
 		//获取会员价
-		if !hasActivity && (power.Member == "true" || power.Member == "1") {
-			common.PrintDebugHtml(ctx,power.Member)
+		if !hasActivity {
 			sku = ls.GetActivityPrice(sku, "_Member", power)
 			sku = ls.GetActivityPrice(sku, "_Member", power)
 			if sku.AcType > 0 {
 			if sku.AcType > 0 {
 				hasActivity = true
 				hasActivity = true
@@ -205,8 +201,6 @@ func (ls *LyService) getSpuList(skuArr map[string]string) (spuList map[string]st
 		spuId := gjson.Get(skuStr, "spu_id").String()
 		spuId := gjson.Get(skuStr, "spu_id").String()
 		spuIds = append(spuIds, spuId)
 		spuIds = append(spuIds, spuId)
 	}
 	}
-	redisConn := gredis.Conn("default_r")
-	defer redisConn.Close()
 	//批量获取spu详情
 	//批量获取spu详情
 	spuList = gredis.Hmget("default_r", "spu", spuIds)
 	spuList = gredis.Hmget("default_r", "spu", spuIds)
 	return
 	return

service/service_ly_common.go

@@ -279,6 +279,7 @@ func (ls *LyService) GetCoefficient(sku model.LySku) model.LySku {
 		}
 		}
 		if !hasCoefficient && !hasDefault {
 		if !hasCoefficient && !hasDefault {
 			logger.Error("%s", "系数获取异常，供应商："+common.ToString(sku.SupplierId))
 			logger.Error("%s", "系数获取异常，供应商："+common.ToString(sku.SupplierId))
+			sku.Content = "系数获取异常，供应商："+common.ToString(sku.SupplierId)
 			return sku
 			return sku
 		}
 		}
 
 
@@ -339,13 +340,13 @@ func (ls *LyService) GetCoefficient(sku model.LySku) model.LySku {
 				}
 				}
 			}
 			}
 		}
 		}
-		if len(data) > 0 {
-           sku.LadderPrice = data
-		}
 		//输出税费到前端
 		//输出税费到前端
 		coefficient.Tax = tax
 		coefficient.Tax = tax
 		sku.Coefficient = coefficient
 		sku.Coefficient = coefficient
 	}
 	}
+	if len(data) > 0 {
+		sku.LadderPrice = data
+	}
 	return sku
 	return sku
 }
 }
 
 
@@ -393,19 +394,14 @@ func (ls *LyService) GetIsBuy(sku model.LySku) (isBuy int) {
 
 
 //合并spu的信息
 //合并spu的信息
 func (ls *LyService) CombineSup(sku model.LySku, spuStr string) model.LySku {
 func (ls *LyService) CombineSup(sku model.LySku, spuStr string) model.LySku {
-	var spu model.Spu
-	err := json.Unmarshal([]byte(spuStr), &spu)
-	if err != nil {
-		return sku
-	}
-	sku.UpdateTime = spu.UpdateTime
-	sku.ClassID1 = spu.ClassID1
-	sku.ClassID2 = spu.ClassID2
-	sku.SpuName = spu.SpuName
-	sku.SpuBrief = spu.SpuBrief
-	sku.SpuDetail = spu.SpuDetail
-	sku.Status = spu.Status
-	sku.Encap = spu.Encap
+	sku.UpdateTime = gjson.Get(spuStr,"update_time").Int()
+	sku.ClassID1 = int(gjson.Get(spuStr,"class_id1").Int())
+	sku.ClassID2 = int(gjson.Get(spuStr,"class_id2").Int())
+	sku.SpuName = gjson.Get(spuStr,"spu_name").String()
+	sku.SpuBrief =gjson.Get(spuStr,"spu_brief").String()
+	sku.SpuDetail = gjson.Get(spuStr,"spu_detail").String()
+	sku.Status = int(gjson.Get(spuStr,"status").Int())
+	sku.Encap =  gjson.Get(spuStr,"encap").String()
 	return sku
 	return sku
 }
 }
 
 

service/service_price.go

@@ -175,12 +175,13 @@ func (ls *LyService) GetActivityPrice(sku model.LySku, suffix string, power Powe
 			//	4: "mobile",
 			//	4: "mobile",
 			//	5: "email",
 			//	5: "email",
 			//}
 			//}
-			////遍历黑名单类型
-			////黑名单就不显示折扣价吗,黑名单只针对折扣价
+			//遍历黑名单类型
+			//黑名单就不显示折扣价吗,黑名单只针对折扣价
 			//activityBlackListTypes := gjson.Get(activityInfo, "blacklist_type").Array()
 			//activityBlackListTypes := gjson.Get(activityInfo, "blacklist_type").Array()
 			//for _, value := range activityBlackListTypes {
 			//for _, value := range activityBlackListTypes {
 			//	//验证是否有对应的黑名单类型
 			//	//验证是否有对应的黑名单类型
 			//	blackListType := blacklistTypeList[int(value.Int())]
 			//	blackListType := blacklistTypeList[int(value.Int())]
+			//	blackListItem :=
 			//
 			//
 			//}
 			//}
 		}
 		}

update.sh

@@ -5,7 +5,7 @@ echo $Cur_Dir
 cd $Cur_Dir
 cd $Cur_Dir
 git reset --hard HEAD
 git reset --hard HEAD
 git pull origin dev
 git pull origin dev
-rm -f ${Cur_Dir}"/cmd/http/http"
+#rm -f ${Cur_Dir}"/cmd/http/http"
 export GO111MODULE=on
 export GO111MODULE=on
 export CGO_ENABLED=0
 export CGO_ENABLED=0
 go env -w GOPROXY=https://goproxy.cn,direct
 go env -w GOPROXY=https://goproxy.cn,direct