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

Merge branch 'dev/dev1.0' into feature_413_cjh

This commit is contained in:
陈俊宏 2024-08-09 17:59:41 +08:00
parent bdfd4c6b9c 595726bc60
commit f24a725cef
5 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/services/thirdpay/api/api_res_data.go
View File

@ -5,6 +5,7 @@ type OrdersResp struct {
OrderType int `json:"order_type"` OrderType int `json:"order_type"`
OutTradeNo string `json:"out_trade_no"` OutTradeNo string `json:"out_trade_no"`
Amount int `json:"amount"` Amount int `json:"amount"`
PayerTotal int `json:"payer_total"`
Desc string `json:"desc"` Desc string `json:"desc"`
Status int `json:"status"` Status int `json:"status"`

2
app/services/thirdpay/do/pay.go
View File

@ -121,7 +121,6 @@ func (w *Pay) Refund() {
RefundOrderId: w.RelationOrder.Id, RefundOrderId: w.RelationOrder.Id,
RefundReason: w.PayParam.Desc, RefundReason: w.PayParam.Desc,
RefundAmount: int64(w.PayParam.Amount), RefundAmount: int64(w.PayParam.Amount),
PayChannel: w.PayParam.Channel.ChannelType,
} }
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
@ -138,6 +137,7 @@ func (w *Pay) Refund() {
code := services.OrderUpdate(w.Order, "status") code := services.OrderUpdate(w.Order, "status")
if code != errorcode.Success { if code != errorcode.Success {
w.PayCode = code w.PayCode = code
return
} }
} else { } else {
w.PayCode = errorcode.PreRefundFail w.PayCode = errorcode.PreRefundFail

2
app/services/thirdpay/do/refund_way.go
View File

@ -13,6 +13,7 @@ var RefundWayList = map[int]func(commonRefundInfo *paymentService.OrderRefundReq
} }
func WechatH5Refund(commonRefundInfo *paymentService.OrderRefundRequest, channel *paychannelmodel.PayChannel) error { func WechatH5Refund(commonRefundInfo *paymentService.OrderRefundRequest, channel *paychannelmodel.PayChannel) error {
commonRefundInfo.PayChannel = common.PAY_CHANNLE_TYPE_WECHAT
err := sonic.Unmarshal([]byte(channel.ExtJson), &commonRefundInfo.Wx) err := sonic.Unmarshal([]byte(channel.ExtJson), &commonRefundInfo.Wx)
if err != nil { if err != nil {
return err return err
@ -22,6 +23,7 @@ func WechatH5Refund(commonRefundInfo *paymentService.OrderRefundRequest, channel
} }
func AlipayWebRefund(commonRefundInfo *paymentService.OrderRefundRequest, channel *paychannelmodel.PayChannel) error { func AlipayWebRefund(commonRefundInfo *paymentService.OrderRefundRequest, channel *paychannelmodel.PayChannel) error {
commonRefundInfo.PayChannel = common.PAY_CHANNLE_TYPE_ZFB
err := sonic.Unmarshal([]byte(channel.ExtJson), &commonRefundInfo.Ali) err := sonic.Unmarshal([]byte(channel.ExtJson), &commonRefundInfo.Ali)
if err != nil { if err != nil {
return err return err

1
app/services/thirdpay/pay.go
View File

@ -27,6 +27,7 @@ func NewOrdersResp(db *ordersmodel.Orders) *api.OrdersResp {
Status: db.Status, Status: db.Status,
OrderType: db.OrderType, OrderType: db.OrderType,
Amount: db.Amount, Amount: db.Amount,
PayerTotal: db.PayerTotal,
Desc: db.Desc, Desc: db.Desc,
CreateTime: db.CreateTime.Format("2006-01-02 15:04:05"), CreateTime: db.CreateTime.Format("2006-01-02 15:04:05"),
} }

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

@ -151,6 +151,7 @@ func (o *OrderNotify) updateOrder() {
return return
} }
o.order.Status = o.Status o.order.Status = o.Status
o.order.PayerTotal = o.ActualAmount
o.Code = services.OrderUpdate(o.order, "status") o.Code = services.OrderUpdate(o.order, "status")
return return
} }