Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

This commit is contained in:
eson 2023-09-21 18:26:19 +08:00
commit a566f61f23
3 changed files with 10 additions and 14 deletions

View File

@ -129,8 +129,8 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri
} }
calculateResultList = append(calculateResultList, types.CalculateResultItem{ calculateResultList = append(calculateResultList, types.CalculateResultItem{
CartId: cart.Id, CartId: cart.Id,
ItemPrice: fmt.Sprintf("%.3f", format.CentitoDollar(itemPrice)), ItemPrice: format.CentitoDollar(itemPrice, 3),
TotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(totalPrice)), TotalPrice: format.CentitoDollar(totalPrice, 2),
}) })
updData := &gmodel.FsShoppingCart{ updData := &gmodel.FsShoppingCart{
PurchaseQuantity: &reqPurchaseQuantity, PurchaseQuantity: &reqPurchaseQuantity,
@ -152,7 +152,7 @@ func (l *CalculateCartPriceLogic) CalculateCartPrice(req *types.CalculateCartPri
return resp.SetStatusWithMessage(basic.CodeDbSqlErr, err.Error()) return resp.SetStatusWithMessage(basic.CodeDbSqlErr, err.Error())
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateCartPriceRsp{ return resp.SetStatusWithMessage(basic.CodeOK, "success", types.CalculateCartPriceRsp{
SubTotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(subTotalPrice)), SubTotalPrice: format.CentitoDollar(subTotalPrice, 2),
CalculateResultList: calculateResultList, CalculateResultList: calculateResultList,
}) })
} }

View File

@ -173,8 +173,8 @@ func (l *GetCartsLogic) GetCarts(req *types.GetCartsReq, userinfo *auth.UserInfo
FittingId: *cart.FittingId, FittingId: *cart.FittingId,
FittingName: fittingName, FittingName: fittingName,
}, },
ItemPrice: fmt.Sprintf("%.3f", format.CentitoDollar(itemPrice)), ItemPrice: format.CentitoDollar(itemPrice, 3),
TotalPrice: fmt.Sprintf("%.3f", format.CentitoDollar(totalPrice)), TotalPrice: format.CentitoDollar(totalPrice, 2),
DiyInformation: types.DiyInformation{ DiyInformation: types.DiyInformation{
Phone: snapShot.UserDiyInformation.Phone, Phone: snapShot.UserDiyInformation.Phone,
Address: snapShot.UserDiyInformation.Address, Address: snapShot.UserDiyInformation.Address,

View File

@ -2,23 +2,19 @@ package format
import ( import (
"fmt" "fmt"
"strconv"
) )
// 厘转美元 // 厘转美元
func CentitoDollar(price int64, remainFloatPoint ...uint) float64 { func CentitoDollar(price int64, remainFloatPoint ...uint) string {
s := "%.3f" s := "%0.3f"
if len(remainFloatPoint) > 0 { if len(remainFloatPoint) > 0 {
s = fmt.Sprintf("%%.%df", remainFloatPoint[0]) s = fmt.Sprintf("%%0.%df", remainFloatPoint[0])
} }
fmt.Println(s) return fmt.Sprintf(s, float64(price)/float64(1000))
str := fmt.Sprintf(s, float64(price)/float64(1000))
dollar, _ := strconv.ParseFloat(str, 64)
return dollar
} }
// 厘转美元 // 厘转美元
func CentitoDollarStr(price float64) string { func CentitoDollarStr(price float64) string {
s := "%.2f" s := "%0.2f"
return fmt.Sprintf(s, price/float64(1000)) return fmt.Sprintf(s, price/float64(1000))
} }