Compare commits
2 Commits
b6a7684cff
...
6c28023f7d
| Author | SHA1 | Date |
|---|---|---|
|
|
6c28023f7d | |
|
|
4753fe59b8 |
|
|
@ -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.Order.TransactionId,
|
TransactionId: w.RelationOrder.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
|
||||||
|
|
|
||||||
|
|
@ -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{"order_id": orderCol.OrderId})
|
cond = cond.And(builder.Eq{"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})
|
||||||
|
|
|
||||||
|
|
@ -69,9 +69,5 @@ 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
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
case "04":
|
default:
|
||||||
refundStatus = payCommon.PAY_REFUND_STATU_FAIL
|
refundStatus = payCommon.PAY_REFUND_STATU_FAIL
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue