Compare commits

..

No commits in common. "6c28023f7dce6d8695c2b84a02f9e70d487ebcc4" and "b6a7684cff54a231824b112f2bd336bbc42dd16b" have entirely different histories.

4 changed files with 7 additions and 3 deletions

View File

@ -240,7 +240,7 @@ func (w *Pay) Refund() {
RefundOrderId: w.Order.Id, RefundOrderId: w.Order.Id,
RefundReason: w.PayParam.Desc, RefundReason: w.PayParam.Desc,
RefundAmount: int64(w.PayParam.Amount), RefundAmount: int64(w.PayParam.Amount),
TransactionId: w.RelationOrder.TransactionId, TransactionId: w.Order.TransactionId,
} }
if refundFunc, ok = RefundWayList[w.PayParam.Channel.ChannelType]; !ok { if refundFunc, ok = RefundWayList[w.PayParam.Channel.ChannelType]; !ok {
w.PayCode = errorcode.PayChannelNotBuild w.PayCode = errorcode.PayChannelNotBuild

View File

@ -148,7 +148,7 @@ func (w *PayCheck) GetOrder(orderCol *types.OrderFindOne) (order *ordersmodel.Or
return return
} }
if orderCol.OrderId != "" { if orderCol.OrderId != "" {
cond = cond.And(builder.Eq{"id": orderCol.OrderId}) cond = cond.And(builder.Eq{"order_id": orderCol.OrderId})
} }
if orderCol.OutTradeNo != "" { if orderCol.OutTradeNo != "" {
cond = cond.And(builder.Eq{"out_trade_no": orderCol.OutTradeNo}) cond = cond.And(builder.Eq{"out_trade_no": orderCol.OutTradeNo})

View File

@ -69,5 +69,9 @@ func (c *Client) Refund(req RefundRequest) (*RefundResponse, error) {
return nil, fmt.Errorf("解析响应失败: %v响应内容: %s", err, responseData) return nil, fmt.Errorf("解析响应失败: %v响应内容: %s", err, responseData)
} }
if result.RespCode != "" && result.RespCode != "0000" && result.RespCode != "00" {
return nil, fmt.Errorf("退款申请失败,错误码: %s错误信息: %s", result.RespCode, result.RespMsg)
}
return &result, nil return &result, nil
} }

View File

@ -159,7 +159,7 @@ func PsbcRefundOrder(ctx context.Context, orderRefundRequest OrderRefundRequest)
switch resp.RefundOrderSta { switch resp.RefundOrderSta {
case "03": case "03":
refundStatus = payCommon.PAY_REFUND_STATU_SUCCESS refundStatus = payCommon.PAY_REFUND_STATU_SUCCESS
default: case "04":
refundStatus = payCommon.PAY_REFUND_STATU_FAIL refundStatus = payCommon.PAY_REFUND_STATU_FAIL
} }