Merge branch 'hcy-2023.4.6-成本'

model/ly_sku.go

@@ -226,11 +226,13 @@ func getLadderPrice(ladderPriceStr string) (ladderPrice []LadderPrice) {
 	ladderPriceArr := gjson.Parse(ladderPriceStr).Array()
 	for _, price := range ladderPriceArr {
 		ladderPrice = append(ladderPrice, LadderPrice{
-			Purchases: price.Get("purchases").Int(),
-			PriceUs:   price.Get("price_us").Float(),
-			PriceCn:   price.Get("price_cn").Float(),
-			PriceAc:   price.Get("price_ac").Float(),
-			CostPrice: price.Get("cost_price").Float(),
+			Purchases:   price.Get("purchases").Int(),
+			PriceUs:     price.Get("price_us").Float(),
+			PriceCn:     price.Get("price_cn").Float(),
+			PriceAc:     price.Get("price_ac").Float(),
+			CostPrice:   price.Get("cost_price").Float(),
+			PriceCostUs: price.Get("price_cost_us").Float(),
+			PriceCostCn: price.Get("price_cost_cn").Float(),
 		})
 	}
 	if len(ladderPrice) == 0 {

service/service_ly_common.go

@@ -203,11 +203,16 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 			if price.PriceCn != 0 {
 				data[key].PriceCn = c.MyRound(price.PriceCn, 4)
 			}
+			//todo 2023.4.6 专卖成本价
+			data[key].PriceCostUs = price.PriceCostUs
+			data[key].PriceCostCn = price.PriceCostCn
+
 			//联营或者专卖 同时 存在活动价格
 			if (sku.GoodsType == 1 || sku.GoodsType == 2) && sku.AcType > 1 && sku.Ratio > 0 {
 				tempAcPrice := c.MyRound(c.MulFloat(price.PriceCn, (sku.Ratio/100)), 4)
 				data[key].PriceAc = tempAcPrice
 				data[key].PriceAcUs = c.MyRound(c.MulFloat(price.PriceUs, (sku.RatioUs/100)), 4)
+
 				//优惠价后等于0,就代表没有搞活动
 				if tempAcPrice <= 0 {
 					sku.AcType = 0
@@ -530,6 +535,7 @@ func (ls *LyService) GetCoefficientAndPrice(sku model.LySku) model.LySku {
 					RatioUsd: 1,
 				}
 			}
+
 			//美金成本价
 			priceCostUs := c.MulFloat(price.PriceUs, usDiscountRatio)
 			priceCostUs = c.MyRound(priceCostUs, 4)

tests/test1.go

+package main
+
+import (
+	"fmt"
+	"sync"
+)
+
+func add_num(a, b int, done func()) {
+	defer done()
+	c := a + b
+	fmt.Printf("%d + %d = %d\n", a, b, c)
+}
+
+func main() {
+	var wg sync.WaitGroup
+
+	for i := 0; i < 10; i++ {
+		go add_num(i, 1, wg.Done)
+	}
+	wg.Add(10)
+	wg.Wait()
+	println("nnni")
+}