fix

model/gmodel/fs_product_model3d_logic.go

@@ -37,11 +37,15 @@ func (d *FsProductModel3dModel) GetAllByIdsWithoutStatus(ctx context.Context, id
 	err = db.Find(&resp).Error
 	return resp, err
 }
-func (d *FsProductModel3dModel) GetAllByIdsTag(ctx context.Context, ids []int64, tag int64) (resp []FsProductModel3d, err error) {
+func (d *FsProductModel3dModel) GetAllByIdsTag(ctx context.Context, ids []int64, tag int64, fields ...string) (resp []FsProductModel3d, err error) {
 	if len(ids) == 0 {
 		return
 	}
-	err = d.db.WithContext(ctx).Model(&FsProductModel3d{}).Where("`id` in (?) and `status` = ? and `tag` = ?", ids, 1, tag).Find(&resp).Error
+	db := d.db.WithContext(ctx).Model(&FsProductModel3d{}).Where("`id` in (?) and `status` = ? and `tag` = ?", ids, 1, tag)
+	if len(fields) > 0 {
+		db = db.Select(fields[0])
+	}
+	err = db.Find(&resp).Error
 	return resp, err
 }
 

server/shopping-cart/internal/logic/calculatecartpricelogic.go

@@ -3,9 +3,14 @@ package logic
 import (
 	"context"
 	"fmt"
+	"fusenapi/constants"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
+	"fusenapi/utils/format"
+	"fusenapi/utils/step_price"
+	"math"
+	"strings"
 
 	"fusenapi/server/shopping-cart/internal/svc"
 	"fusenapi/server/shopping-cart/internal/types"
@@ -32,6 +37,7 @@ func NewCalculateCartPriceLogic(ctx context.Context, svcCtx *svc.ServiceContext)
 // }
 
 func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPriceReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+	userinfo.UserId = 39
 	if !userinfo.IsUser() {
 		return resp.SetStatusWithMessage(basic.CodeUnAuth, "please sign in")
 	}
@@ -39,13 +45,18 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri
 		return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateCartPriceRsp{CalculateResultList: []types.CalculateResultItem{}})
 	}
 	cartIds := make([]int64, 0, len(req.CalculateList))
+	mapCalculateQuantity := make(map[int64]int64)
 	for _, v := range req.CalculateList {
 		cartIds = append(cartIds, v.CartId)
+		if v.PurchaseQuantity <= 0 {
+			return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "purchase quantity must grater than 0")
+		}
+		mapCalculateQuantity[v.CartId] = v.PurchaseQuantity
 	}
 	//获取购物车列表
 	carts, _, err := l.svcCtx.AllModels.FsShoppingCart.GetAllCartsByParam(l.ctx, gmodel.GetAllCartsByParamReq{
 		Ids:    cartIds,
-		Fields: "id,size_id,product_id",
+		Fields: "id,size_id,product_id,fitting_id",
 		UserId: userinfo.UserId,
 		Page:   1,
 		Limit:  len(cartIds),
@@ -54,6 +65,9 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get cart list")
 	}
+	if len(carts) < len(req.CalculateList) {
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "please refresh page for the shopping cart has changed!!")
+	}
 	sizeIds := make([]int64, 0, len(carts))
 	productIds := make([]int64, 0, len(carts))
 	fittingIds := make([]int64, 0, len(carts))
@@ -70,14 +84,68 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get price list")
 	}
-	mapPrice := make(map[string]int)
+	mapPrice := make(map[string]gmodel.FsProductPrice)
-	for k, v := range priceList {
+	for _, v := range priceList {
-		mapPrice[fmt.Sprintf("%d_%d", *v.ProductId, *v.SizeId)] = k
+		mapPrice[fmt.Sprintf("%d_%d", *v.ProductId, *v.SizeId)] = v
 	}
-	//获取配件列表
+	//获取配件列表(只有id跟价格)
-	// todo 下周写
+	fittingList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByIdsTag(l.ctx, fittingIds, constants.TAG_PARTS, "id,price")
-	/*fittingList, err := l.svcCtx.AllModels.FsProductModel3d.GetAllByIdsTag()*/
+	if err != nil {
-	return resp.SetStatus(basic.CodeOK)
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeDbSqlErr, "failed to get fitting list")
+	}
+	mapFitting := make(map[int64]int64)
+	for _, v := range fittingList {
+		mapFitting[v.Id] = *v.Price
+	}
+	//开始计算价格
+	calculateResultList := make([]types.CalculateResultItem, 0, len(req.CalculateList))
+	sumPrice := int64(0)
+	for _, cart := range carts {
+		sizePrice, ok := mapPrice[fmt.Sprintf("%d_%d", *cart.ProductId, *cart.SizeId)]
+		if !ok {
+			return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, fmt.Sprintf("there carts contain some one which have no price info:%d_%d", *cart.ProductId, *cart.SizeId))
+		}
+		//阶梯数量切片
+		stepNum, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepNum, ","))
+		if err != nil {
+			logx.Error(err)
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step number:%d_%d", *cart.ProductId, *cart.SizeId))
+		}
+		lenStepNum := len(stepNum)
+		//阶梯价格切片
+		stepPrice, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepPrice, ","))
+		if err != nil {
+			logx.Error(err)
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price:%d_%d", *cart.ProductId, *cart.SizeId))
+		}
+		lenStepPrice := len(stepPrice)
+		if lenStepPrice == 0 || lenStepNum == 0 {
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price or step number is not set:%d_%d", *cart.ProductId, *cart.SizeId))
+		}
+		//购买箱数
+		boxQuantity := int(math.Ceil(float64(mapCalculateQuantity[cart.Id]) / float64(*sizePrice.EachBoxNum)))
+		//根据数量获取阶梯价格中对应的价格
+		itemPrice := step_price.GetCentStepPrice(boxQuantity, stepNum, stepPrice)
+		//如果有配件，单价也要加入配件价格
+		if *cart.FittingId > 0 {
+			if fittingPrice, ok := mapFitting[*cart.FittingId]; ok {
+				itemPrice += fittingPrice
+			}
+		}
+		//单个购物车总价
+		totalPrice := itemPrice * mapCalculateQuantity[cart.Id]
+		calculateResultList = append(calculateResultList, types.CalculateResultItem{
+			CartId:     cart.Id,
+			ItemPrice:  fmt.Sprintf("%.3f", format.CentitoDollar(itemPrice)),
+			TotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(totalPrice)),
+		})
+		sumPrice += totalPrice
+	}
+	return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateCartPriceRsp{
+		SumPrice:            fmt.Sprintf("%.3f", format.CentitoDollar(sumPrice)),
+		CalculateResultList: calculateResultList,
+	})
 }
 
 // 处理逻辑后 w,r 如:重定向, resp 必须重新处理

server/shopping-cart/internal/logic/getcartslogic.go

@@ -41,7 +41,6 @@ func NewGetCartsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetCarts
 // }
 
 func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo) (resp *basic.Response) {
-	userinfo.UserId = 39
 	if req.CurrentPage <= 0 {
 		req.CurrentPage = constants.DEFAULT_PAGE
 	}
@@ -112,24 +111,24 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo
 		snapShot := mapSnapshot[cart.Id]
 		sizePrice, ok := mapSizePrice[fmt.Sprintf("%d_%d", *cart.ProductId, *cart.SizeId)]
 		if !ok {
-			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("the size`s price info is not exists:%d", *cart.SizeId))
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("the size`s price info is not exists:%d_%d", *cart.ProductId, *cart.SizeId))
 		}
 		//阶梯数量切片
 		stepNum, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepNum, ","))
 		if err != nil {
 			logx.Error(err)
-			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step number:%d", *cart.SizeId))
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step number:%d_%d", *cart.ProductId, *cart.SizeId))
 		}
 		lenStepNum := len(stepNum)
 		//阶梯价格切片
 		stepPrice, err := format.StrSlicToIntSlice(strings.Split(*sizePrice.StepPrice, ","))
 		if err != nil {
 			logx.Error(err)
-			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price:%d", *cart.SizeId))
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("failed to parse step price:%d_%d", *cart.ProductId, *cart.SizeId))
 		}
 		lenStepPrice := len(stepPrice)
 		if lenStepPrice == 0 || lenStepNum == 0 {
-			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price or step number is not set:%d ", *cart.SizeId))
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, fmt.Sprintf("step price or step number is not set:%d_%d ", *cart.ProductId, *cart.SizeId))
 		}
 		//购买箱数
 		boxQuantity := int(math.Ceil(float64(*cart.PurchaseQuantity) / float64(*sizePrice.EachBoxNum)))

server/shopping-cart/internal/types/types.go

@@ -98,6 +98,7 @@ type CalculateItem struct {
 }
 
 type CalculateCartPriceRsp struct {
+	SumPrice            string                `json:"sum_price"`
 	CalculateResultList []CalculateResultItem `json:"calculate_result_list"`
 }
 

server_api/shopping-cart.api

@@ -111,6 +111,7 @@ type CalculateItem {
 	PurchaseQuantity int64 `json:"purchase_quantity"` //数量
 }
 type CalculateCartPriceRsp {
+	SumPrice            string                `json:"sum_price"`
 	CalculateResultList []CalculateResultItem `json:"calculate_result_list"`
 }
 type CalculateResultItem {

service/repositories/order.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"fusenapi/model/gmodel"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/shopping_cart"
@@ -157,7 +158,7 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
 
 			// 商品总价
 			productTotalPrice := productPrice * *shoppingCart.PurchaseQuantity
-
+			fmt.Println(productTotalPrice)
 			// 存储订单商品
 			orderProductList = append(orderProductList, &gmodel.OrderProduct{})
 		}