BaseSystem
/
PaymentCenter
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

<fix>修改回调

This commit is contained in:
renzhiyuan 2024-08-14 14:01:10 +08:00
parent 2035af1580
commit 921c40606b
4 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/console/command.go
View File

@ -86,7 +86,7 @@ func closeOrder() {
}
orderIds = append(orderIds, orderInfo.Id)
// 回调通知下游
notifyResult := thirdpay_notify.NewOrderNotifyWithHandle(orderInfo.Id, common.ORDER_STATUS_CLOSE, 0, "长时间未支付关闭订单")
notifyResult := thirdpay_notify.NewOrderNotifyWithHandle(orderInfo.Id, response.Code, common.ORDER_STATUS_CLOSE, 0, "长时间未支付关闭订单")
//utils.Log(nil, "主动查询订单支付状态，回调下游", notifyResult)
if notifyResult.ErrCode != errorcode.Success {
utils.Log(nil, "关闭订单，回调下游失败", fmt.Sprintf("%#v", notifyResult))
@ -192,7 +192,7 @@ func queryOrder() {
msg = "订单关闭"
}
// 回调通知下游
notifyResult := thirdpay_notify.NewOrderNotifyWithHandle(orderInfo.Id, status, int(result.Result.PayerTotal), msg)
notifyResult := thirdpay_notify.NewOrderNotifyWithHandle(orderInfo.Id, result.Code, status, int(result.Result.PayerTotal), msg)
//utils.Log(nil, "主动查询订单支付状态，回调下游", notifyResult)
if notifyResult.ErrCode != errorcode.Success {
utils.Log(nil, "主动查询订单支付状态，回调下游失败", fmt.Sprintf("%+v", notifyResult))
@ -295,7 +295,7 @@ func queryRefundOrder() {
msg = "退款失败"
}
// 回调通知下游 todo
notifyResult := thirdpay_notify.NewOrderNotifyWithHandle(orderInfo.Id, status, int(result.Result.RefundFee), msg)
notifyResult := thirdpay_notify.NewOrderNotifyWithHandle(orderInfo.Id, result.Code, status, int(result.Result.RefundFee), msg)
//utils.Log(nil, "主动查询退款订单状态，回调下游", notifyResult)
if notifyResult.ErrCode != errorcode.Success {
utils.Log(nil, "查询退款订单状态，回调下游失败", notifyResult)

8
app/services/thirdpay/thirdpay_notify/notify.go
View File

@ -51,13 +51,13 @@ type OrderNotifySendContent struct {
PayerTotal int `json:"payer_total"`
}
func NewOrderNotifyWithHandle(orderId int64, Status int, actualAmount int, msg string) *OrderNotifyResp {
func NewOrderNotifyWithHandle(orderId int64, code int, Status int, actualAmount int, msg string) *OrderNotifyResp {
orderNotify := &OrderNotify{
OrderId: orderId,
Status: Status,
ActualAmount: actualAmount,
Msg: msg,
Code: errorcode.Success,
Code: code,
}
return orderNotify.Handle()
}
@ -72,6 +72,9 @@ func (o *OrderNotify) NotifyRespFail(errorCode int) *OrderNotifyResp {
}
func (o *OrderNotify) Handle() (res *OrderNotifyResp) {
if o.Code != errorcode.Success {
return o.NotifyRespFail(o.Code)
}
o.checkOrder()
if o.Code != errorcode.Success {
return o.NotifyRespFail(o.Code)
@ -168,6 +171,7 @@ func (o *OrderNotify) setBody() *OrderNotifySendContent {
func (o *OrderNotify) updateOrder() {
if _, ok := common.OrderStatusMap[o.Status]; !ok {
o.Code = errorcode.OrderStatusErr
return
}

6
app/third/paymentService/ali_service.go
View File

@ -81,6 +81,7 @@ func ALiH5PayInfo(c context.Context, payOrderRequest PayOrderRequest) (string, e
// ALiCallBack 支付宝支付回调
func ALiCallBack(notifyReq gopay.BodyMap, aliConfig AliPay) error {
var orderStatus int
ok, err := alipay.VerifySignWithCert([]byte(aliConfig.AlipayPublicCert), notifyReq)
if !ok || err != nil {
return err
@ -96,12 +97,15 @@ func ALiCallBack(notifyReq gopay.BodyMap, aliConfig AliPay) error {
switch tradeStatus {
case "TRADE_CLOSED":
errCode = errorcode.ParamError
orderStatus = common.ORDER_STATUS_CLOSE
msg = "未付款交易超时关闭，或支付完成后全额退款。"
case "TRADE_SUCCESS":
errCode = errorcode.Success
orderStatus = common.ORDER_STATUS_PAYED
msg = "交易支付成功。"
case "TRADE_FINISHED":
errCode = errorcode.Success
orderStatus = common.ORDER_STATUS_CLOSE
msg = "交易结束，不可退款。"
}
if errCode == 0 {
@ -109,7 +113,7 @@ func ALiCallBack(notifyReq gopay.BodyMap, aliConfig AliPay) error {
return errors.New("订单状态异常，无法进行后续回调")
}
res := thirdpay_notify.NewOrderNotifyWithHandle(int64(orderId), errCode, payerTotal, msg)
res := thirdpay_notify.NewOrderNotifyWithHandle(int64(orderId), orderStatus, errCode, payerTotal, msg)
merchantCallback, _ := json.Marshal(res)
// 记录日志
go func() {

11
app/third/paymentService/wechat_service.go
View File

@ -91,6 +91,7 @@ func WxH5PayInfo(c context.Context, payOrderRequest PayOrderRequest) (string, er
// WxPayCallBack 微信支付回调
func WxPayCallBack(notifyReq *wechat.V3NotifyReq, wxConfig WxPay) error {
// 初始化微信客户端
var orderStatus int
wxClient, err := InitClient(wxConfig)
if err != nil {
return err
@ -128,22 +129,26 @@ func WxPayCallBack(notifyReq *wechat.V3NotifyReq, wxConfig WxPay) error {
// 订单状态
switch CallBackInfo.TradeState {
case "SUCCESS":
orderStatus = common.ORDER_STATUS_PAYED
errCode = errorcode.Success
msg = "支付成功"
case "CLOSED":
errCode = errorcode.ParamError
orderStatus = common.ORDER_STATUS_CLOSE
msg = "已关闭"
case "REVOKED":
errCode = errorcode.ParamError
orderStatus = common.ORDER_STATUS_FAILED
msg = "已撤销（付款码支付）"
case "PAYERROR":
errCode = errorcode.ParamError
msg = "支付失败(其他原因，如银行返回失败)"
orderStatus = common.ORDER_STATUS_FAILED
}
// 触发下游回调的格式
orderId, _ := strconv.Atoi(CallBackInfo.OutTradeNo)
res := thirdpay_notify.NewOrderNotifyWithHandle(int64(orderId), errCode, int(CallBackInfo.Amount.PayerTotal), msg)
res := thirdpay_notify.NewOrderNotifyWithHandle(int64(orderId), orderStatus, errCode, int(CallBackInfo.Amount.PayerTotal), msg)
merchantCallback, _ := json.Marshal(res)
// 记录日志
go func() {
@ -224,8 +229,8 @@ func WxOrderRefund(ctx context.Context, orderRefundRequest OrderRefundRequest) (
SetBodyMap("amount", func(bm gopay.BodyMap) {
// 退款金额:单位是分
bm.Set("refund", orderRefundRequest.RefundAmount). //实际退款金额
Set("total", orderRefundRequest.RefundAmount). // 折扣前总金额（不是实际退款数）
Set("currency", "CNY")
Set("total", orderRefundRequest.RefundAmount). // 折扣前总金额（不是实际退款数）
Set("currency", "CNY")
})
// body：参数Body
refund, err := wxClient.V3Refund(ctx, bm)