diff --git a/internal/api/mobile/order/query.go b/internal/api/mobile/order/query.go index abccf95..427a623 100755 --- a/internal/api/mobile/order/query.go +++ b/internal/api/mobile/order/query.go @@ -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, }) } diff --git a/internal/model/order/goods_detail.go b/internal/model/order/goods_detail.go index c30de13..ddfde0a 100755 --- a/internal/model/order/goods_detail.go +++ b/internal/model/order/goods_detail.go @@ -76,6 +76,7 @@ type GoodsDetail struct { IsFerme int `gorm:"column:is_ferme" json:"isFerme"` //是否包税 ActivityStatus uint `gorm:"column:activity_status" json:"activity_status"` ActivityId uint `gorm:"column:activity_id" json:"activity_id"` //活动id + MakeUpStatus uint `json:"make_up_status"` } // TableName sets the insert table name for this struct type