From ee9246839281793d6071e92ac4cafc6cc621d517 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Fri, 15 Sep 2023 14:52:36 +0800
Subject: [PATCH] fix

---
 server/shopping-cart/internal/handler/routes.go    |  6 +++---
 .../shopping-cart/internal/logic/getcartslogic.go  | 14 ++++++++++----
 server_api/shopping-cart.api                       |  6 +++---
 utils/format/price.go                              |  6 +++---
 utils/step_price/price.go                          | 10 +++++-----
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/server/shopping-cart/internal/handler/routes.go b/server/shopping-cart/internal/handler/routes.go
index 08ade841..9857154b 100644
--- a/server/shopping-cart/internal/handler/routes.go
+++ b/server/shopping-cart/internal/handler/routes.go
@@ -14,17 +14,17 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 		[]rest.Route{
 			{
 				Method:  http.MethodPost,
-				Path:    "/api/shopping-cart/add_to_cart",
+				Path:    "/api/shopping-cart/add",
 				Handler: AddToCartHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/api/shopping-cart/delete_cart",
+				Path:    "/api/shopping-cart/delete",
 				Handler: DeleteCartHandler(serverCtx),
 			},
 			{
 				Method:  http.MethodPost,
-				Path:    "/api/shopping-cart/modify_cart_purchase_quantity",
+				Path:    "/api/shopping-cart/modify",
 				Handler: ModifyCartPurchaseQuantityHandler(serverCtx),
 			},
 			{
diff --git a/server/shopping-cart/internal/logic/getcartslogic.go b/server/shopping-cart/internal/logic/getcartslogic.go
index 436831f9..de21354b 100644
--- a/server/shopping-cart/internal/logic/getcartslogic.go
+++ b/server/shopping-cart/internal/logic/getcartslogic.go
@@ -169,8 +169,14 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo
 			tmpMinBuyNum++
 		}
 		//根据数量获取阶梯价格中对应的价格
-		itemPrice := step_price.GetStepPrice(boxQuantity, stepNum, stepPrice)
-		totalPrice := itemPrice * float64(*cart.PurchaseQuantity)
+		itemPrice := step_price.GetCentStepPrice(boxQuantity, stepNum, stepPrice)
+		//如果有配件，单价也要加入配件价格
+		if *cart.FittingId > 0 {
+			if curFittingInfo, ok := mapModel[*cart.FittingId]; ok {
+				itemPrice += *curFittingInfo.Price
+			}
+		}
+		totalPrice := itemPrice * (*cart.PurchaseQuantity)
 		item := types.CartItem{
 			ProductId: *cart.ProductId,
 			SizeInfo: types.SizeInfo{
@@ -185,8 +191,8 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo
 				FittingId:   *cart.FittingId,
 				FittingName: snapShot.FittingInfo.FittingName,
 			},
-			ItemPrice:  fmt.Sprintf("%.3f", itemPrice),
-			TotalPrice: fmt.Sprintf("%.3f", totalPrice),
+			ItemPrice:  fmt.Sprintf("%.3f", format.CentitoDollar(itemPrice)),
+			TotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(totalPrice)),
 			DiyInformation: types.DiyInformation{
 				Phone:   snapShot.UserDiyInformation.Phone,
 				Address: snapShot.UserDiyInformation.Address,
diff --git a/server_api/shopping-cart.api b/server_api/shopping-cart.api
index 15bb5c98..21ce857e 100644
--- a/server_api/shopping-cart.api
+++ b/server_api/shopping-cart.api
@@ -11,13 +11,13 @@ import "basic.api"
 service shopping-cart {
 	//加入购物车
 	@handler AddToCartHandler
-	post /api/shopping-cart/add_to_cart(AddToCartReq) returns (response);
+	post /api/shopping-cart/add(AddToCartReq) returns (response);
 	//删除购物车
 	@handler DeleteCartHandler
-	post /api/shopping-cart/delete_cart(DeleteCartReq) returns (response);
+	post /api/shopping-cart/delete(DeleteCartReq) returns (response);
 	//修改购物车购买数量
 	@handler ModifyCartPurchaseQuantityHandler
-	post /api/shopping-cart/modify_cart_purchase_quantity(ModifyCartPurchaseQuantityReq) returns (response);
+	post /api/shopping-cart/modify(ModifyCartPurchaseQuantityReq) returns (response);
 	//获取购物车列表
 	@handler GetCartsHandler
 	get /api/shopping-cart/get_carts(GetCartsReq) returns (response);
diff --git a/utils/format/price.go b/utils/format/price.go
index 8c7ee70a..99063fde 100644
--- a/utils/format/price.go
+++ b/utils/format/price.go
@@ -5,9 +5,9 @@ import (
 	"strconv"
 )
 
-// 美分转美元
-func CentoDollar(price int64) float64 {
-	str := fmt.Sprintf("%.2f", float64(price)/float64(100))
+// 厘转美元
+func CentitoDollar(price int64) float64 {
+	str := fmt.Sprintf("%.3f", float64(price)/float64(1000))
 	dollar, _ := strconv.ParseFloat(str, 64)
 	return dollar
 }
diff --git a/utils/step_price/price.go b/utils/step_price/price.go
index 0cfe5d09..f8eb2b9a 100644
--- a/utils/step_price/price.go
+++ b/utils/step_price/price.go
@@ -3,20 +3,20 @@ package step_price
 // 返回美元
 func GetStepPrice(minBuyNum int, stepNum []int, stepPrice []int) float64 {
 	if minBuyNum > stepNum[len(stepNum)-1] {
-		return float64(stepPrice[len(stepPrice)-1]) / float64(100)
+		return float64(stepPrice[len(stepPrice)-1]) / float64(1000)
 	}
 	for k, v := range stepNum {
 		if minBuyNum <= v {
 			if k <= (len(stepPrice) - 1) {
-				return float64(stepPrice[k]) / float64(100)
+				return float64(stepPrice[k]) / float64(1000)
 			}
-			return float64(stepPrice[len(stepPrice)-1]) / float64(100)
+			return float64(stepPrice[len(stepPrice)-1]) / float64(1000)
 		}
 	}
-	return float64(stepPrice[len(stepPrice)-1]) / float64(100)
+	return float64(stepPrice[len(stepPrice)-1]) / float64(1000)
 }
 
-// 返回美分
+// 返回厘
 func GetCentStepPrice(minBuyNum int, stepNum []int, stepPrice []int) int64 {
 	if minBuyNum > stepNum[len(stepNum)-1] {
 		return int64(stepPrice[len(stepPrice)-1])