Merge branch 'develop' into orders

This commit is contained in:
Hiven 2023-07-24 19:17:07 +08:00
commit 03627b93e9

View File

@ -202,24 +202,19 @@ func (l *GetOrderDetailLogic) GetOrderDetail(req *types.GetOrderDetailReq, useri
IsDefault: *addressInfo.IsDefault, IsDefault: *addressInfo.IsDefault,
} }
} }
data.PayInfo = &types.PayInfo{}
//首款 //首款
if payIndex, ok := mapPay[1]; ok { if payIndex, ok := mapPay[1]; ok {
data.PayInfo = &types.PayInfo{ data.PayInfo.Deposit = types.Deposit{
Deposit: types.Deposit{
Method: *payList[payIndex].Brand, Method: *payList[payIndex].Brand,
TransNo: *payList[payIndex].TradeNo, TransNo: *payList[payIndex].TradeNo,
},
Final: types.Deposit{},
} }
} }
//尾款 //尾款
if payIndex, ok := mapPay[2]; ok { if payIndex, ok := mapPay[2]; ok {
data.PayInfo = &types.PayInfo{ data.PayInfo.Final = types.Deposit{
Deposit: types.Deposit{},
Final: types.Deposit{
Method: *payList[payIndex].Brand, Method: *payList[payIndex].Brand,
TransNo: *payList[payIndex].TradeNo, TransNo: *payList[payIndex].TradeNo,
},
} }
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", data) return resp.SetStatusWithMessage(basic.CodeOK, "success", data)