Merge branch 'ysx-美金活动价-20230420'

service/service_ladder_price.go

@@ -2,11 +2,12 @@ package service
 
 
 import (
 import (
 	"encoding/json"
 	"encoding/json"
-	"github.com/gogf/gf/util/gconv"
-	"github.com/tidwall/gjson"
 	"go_sku_server/model"
 	"go_sku_server/model"
 	"go_sku_server/pkg/common"
 	"go_sku_server/pkg/common"
 	"go_sku_server/pkg/e"
 	"go_sku_server/pkg/e"
+
+	"github.com/gogf/gf/util/gconv"
+	"github.com/tidwall/gjson"
 )
 )
 
 
 type LadderPriceService struct {
 type LadderPriceService struct {
@@ -44,7 +45,14 @@ func (LP *LadderPriceService) GetPriceInfoByNum(ladderPriceRequest model.LadderP
 	if (goodsType == 1 || goodsType == 2) && acType != 1 && ladderPriceRequest.Currency != 1 { //美元
 	if (goodsType == 1 || goodsType == 2) && acType != 1 && ladderPriceRequest.Currency != 1 { //美元
 		res["price_us"] = ladderPriceOne.Get("price_us").Float()
 		res["price_us"] = ladderPriceOne.Get("price_us").Float()
 		res["price_us_total"] = common.MyRound(gconv.Float64(res["price_us"])*gconv.Float64(num), 4)
 		res["price_us_total"] = common.MyRound(gconv.Float64(res["price_us"])*gconv.Float64(num), 4)
+		priceAcUs := ladderPriceOne.Get("price_ac_us").Float()
+		if priceAcUs == 0 {
 			goodsInfo["ac_type"] = 0
 			goodsInfo["ac_type"] = 0
+		}
+		if priceAcUs != 0 {
+			res["price_ac_us"] = priceAcUs
+			res["price_ac_us_total"] = common.MyRound(priceAcUs*gconv.Float64(num), 4)
+		}
 	} else { //人民币
 	} else { //人民币
 
 
 		res["price_cn"] = ladderPriceOne.Get("price_cn").Float()
 		res["price_cn"] = ladderPriceOne.Get("price_cn").Float()