fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:基础信息

Browse Source
This commit is contained in:
momo 2023-09-21 14:26:14 +08:00
parent e01884cce6
commit 1605da27bf
4 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/order/internal/logic/orderdetaillogic.go
View File

@ -47,7 +47,7 @@ func (l *OrderDetailLogic) OrderDetail(req *types.OrderDetailReq, userinfo *auth
} }
return resp.SetStatus(basic.CodeOK, map[string]interface{}{ return resp.SetStatus(basic.CodeOK, map[string]interface{}{
"order_detail": res, "order_detail": res.OrderDetail,
}) })
} }

29
service/repositories/order.go
View File

@ -63,6 +63,7 @@ type (
OrderSn string `json:"order_sn"` OrderSn string `json:"order_sn"`
} }
DetailRes struct { DetailRes struct {
OrderDetail gmodel.OrderDetail
} }
/* 详情 */ /* 详情 */
) )
@ -72,10 +73,16 @@ func (d *defaultOrder) Detail(ctx context.Context, in *DetailReq) (res *DetailRe
var order gmodel.FsOrder var order gmodel.FsOrder
result := d.MysqlConn.Where("order_sn = ?", in.OrderSn).Where("user_id = ?", in.UserId).Take(&order) result := d.MysqlConn.Where("order_sn = ?", in.OrderSn).Where("user_id = ?", in.UserId).Take(&order)
if result.Error != nil { if result.Error != nil {
logx.Errorf("detail failed, err: %v", err)
return nil, result.Error return nil, result.Error
} }
d.OrderDetailHandler(ctx, &order) ress, err := d.OrderDetailHandler(ctx, &order)
return &DetailRes{}, nil if err != nil {
return nil, err
}
return &DetailRes{
ress.OrderDetail,
}, nil
} }
func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel.FsOrder) (res *DetailRes, err error) { func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel.FsOrder) (res *DetailRes, err error) {
@ -83,17 +90,23 @@ func (d *defaultOrder) OrderDetailHandler(ctx context.Context, orderInfo *gmodel
err = json.Unmarshal(*orderInfo.Metadata, &orderDetail) err = json.Unmarshal(*orderInfo.Metadata, &orderDetail)
if err != nil { if err != nil {
logx.Errorf("create handler unmarshal metadata failed, err: %v", err) logx.Errorf("detail handler unmarshal metadata failed, err: %v", err)
return nil, err return nil, err
} }
for _, orderProduct := range orderDetail.OrderProduct { for orderProductKey, orderProduct := range orderDetail.OrderProduct {
orderProduct.TotalPrice = order.GetAmountInfoFormat(&orderProduct.TotalPrice) orderDetail.OrderProduct[orderProductKey].TotalPrice = order.GetAmountInfoFormat(&orderProduct.TotalPrice)
orderProduct.ItemPrice = order.GetAmountInfoFormat(&orderProduct.ItemPrice) orderDetail.OrderProduct[orderProductKey].ItemPrice = order.GetAmountInfoFormat(&orderProduct.ItemPrice)
orderProduct.ShoppingCartSnapshot = nil orderDetail.OrderProduct[orderProductKey].ShoppingCartSnapshot = nil
orderDetail.OrderProduct[orderProductKey].ProductSnapshot = nil
} }
orderDetail.OrderInfo.StatusLink = order.GetOrderStatusLinkUser(orderDetail.OrderInfo.DeliveryMethod, orderDetail.OrderInfo.StatusLink) orderDetail.OrderInfo.StatusLink = order.GetOrderStatusLinkUser(orderDetail.OrderInfo.DeliveryMethod, orderDetail.OrderInfo.StatusLink)
orderDetail.OrderAmount.Deposit.PayAmount = order.GetAmountInfoFormat(&orderDetail.OrderAmount.Deposit.PayAmount) orderDetail.OrderAmount.Deposit.PayAmount = order.GetAmountInfoFormat(&orderDetail.OrderAmount.Deposit.PayAmount)
return nil, nil orderDetail.OrderAmount.RemainingBalance.PayAmount = order.GetAmountInfoFormat(&orderDetail.OrderAmount.RemainingBalance.PayAmount)
orderDetail.OrderAmount.Subtotal = order.GetAmountInfoFormat(&orderDetail.OrderAmount.Subtotal)
orderDetail.OrderAmount.Total = order.GetAmountInfoFormat(&orderDetail.OrderAmount.Total)
return &DetailRes{
OrderDetail: orderDetail,
}, nil
} }
// 下单 // 下单

4
utils/format/price.go
View File

@ -18,7 +18,7 @@ func CentitoDollar(price int64, remainFloatPoint ...uint) float64 {
} }
// 厘转美元 // 厘转美元
func CentitoDollarStr(price int64) string { func CentitoDollarStr(price float64) string {
s := "%.2f" s := "%.2f"
return fmt.Sprintf(s, float64(price)/float64(1000)) return fmt.Sprintf(s, price/float64(1000))
} }

8
utils/order/order.go
View File

@ -91,9 +91,9 @@ type GetAmountCurrencyUSDReq struct {
// 处理金额（元） // 处理金额（元）
func GetAmountCurrencyFormat(req *gmodel.AmountCurrency) (res gmodel.AmountCurrency) { func GetAmountCurrencyFormat(req *gmodel.AmountCurrency) (res gmodel.AmountCurrency) {
return gmodel.AmountCurrency{ return gmodel.AmountCurrency{
ExchangeRate: format.CentitoDollarStr(req.ExchangeRate.(int64)), ExchangeRate: format.CentitoDollarStr(req.ExchangeRate.(float64)),
CurrentAmount: format.CentitoDollarStr(req.CurrentAmount.(int64)), CurrentAmount: format.CentitoDollarStr(req.CurrentAmount.(float64)),
OriginalAmount: format.CentitoDollarStr(req.OriginalAmount.(int64)), OriginalAmount: format.CentitoDollarStr(req.OriginalAmount.(float64)),
CurrentCurrency: req.CurrentCurrency, CurrentCurrency: req.CurrentCurrency,
OriginalCurrency: req.OriginalCurrency, OriginalCurrency: req.OriginalCurrency,
} }
@ -101,6 +101,8 @@ func GetAmountCurrencyFormat(req *gmodel.AmountCurrency) (res gmodel.AmountCurre
// 处理金额（元） // 处理金额（元）
func GetAmountInfoFormat(req *gmodel.AmountInfo) gmodel.AmountInfo { func GetAmountInfoFormat(req *gmodel.AmountInfo) gmodel.AmountInfo {
Current := GetAmountCurrencyFormat(&req.Current)
fmt.Println(Current)
return gmodel.AmountInfo{ return gmodel.AmountInfo{
Change: GetAmountCurrencyFormat(&req.Change), Change: GetAmountCurrencyFormat(&req.Change),
ChangeRemark: req.ChangeRemark, ChangeRemark: req.ChangeRemark,