|
|
|
@ -8,6 +8,7 @@ import (
|
|
|
|
|
"recook/internal/model/aftersales"
|
|
|
|
|
"recook/internal/model/goods"
|
|
|
|
|
"recook/internal/model/order"
|
|
|
|
|
"recook/internal/v2/logic/manage/jyy"
|
|
|
|
|
goods2 "recook/internal/v2/model/recook/goods"
|
|
|
|
|
"recook/tools"
|
|
|
|
|
"strconv"
|
|
|
|
@ -381,6 +382,7 @@ type queryOrderDetailResponse struct {
|
|
|
|
|
BuyerMsg string `json:"buyerMsg"`
|
|
|
|
|
PayTime formatime.Second `json:"payTime"`
|
|
|
|
|
StatusList []goodsStatus `json:"status_list"`
|
|
|
|
|
MakeUpText string `json:"make_up_text"`
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type goodsStatus struct {
|
|
|
|
@ -585,7 +587,8 @@ func QueryOrderDetail(c *gin.Context) {
|
|
|
|
|
temp.GoodsTotalCommission = temp.GoodsTotalCommission.Add(v.GoodsTotalCommission)
|
|
|
|
|
temp.ActualTotalAmount = temp.ActualTotalAmount.Add(v.ActualTotalAmount)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
var o jyy.OrderConfirmReq
|
|
|
|
|
dbc.DB.Table((&jyy.OrderConfirmReq{}).TableName()).First(&o, "order_goods_id = ?", goodsList[0].ID)
|
|
|
|
|
back.Suc(c, "", queryOrderDetailResponse{
|
|
|
|
|
Information: temp,
|
|
|
|
|
CanConfirm: canConfirm,
|
|
|
|
@ -597,6 +600,7 @@ func QueryOrderDetail(c *gin.Context) {
|
|
|
|
|
BuyerMsg: buyerMsg,
|
|
|
|
|
PayTime: orderInfo[0].PayTime,
|
|
|
|
|
StatusList: statusList,
|
|
|
|
|
MakeUpText: o.Reason,
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|