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

Compare commits

base: BaseSystem:e5f50423ad4b69f24ca43ec037ac0576c8aca1e0
Branches Tags
BaseSystem:master
BaseSystem:dev/dev2.0
BaseSystem:prod/prod2.0
BaseSystem:dev/dev1.0
BaseSystem:prod/prod1.0
BaseSystem:feature/zhifu
BaseSystem:feature_413_cjh
BaseSystem:feature/rzy/api_1.0
BaseSystem:feature/zxp
..
compare: BaseSystem:627e1c852c432ea771340fee203053560979a859
Branches Tags
BaseSystem:dev/dev2.0
BaseSystem:prod/prod2.0
BaseSystem:dev/dev1.0
BaseSystem:prod/prod1.0
BaseSystem:feature/zhifu
BaseSystem:feature_413_cjh
BaseSystem:feature/rzy/api_1.0
BaseSystem:feature/zxp
BaseSystem:master

No commits in common. "e5f50423ad4b69f24ca43ec037ac0576c8aca1e0" and "627e1c852c432ea771340fee203053560979a859" have entirely different histories.
e5f50423ad ... 627e1c852c

3 changed files with 12 additions and 13 deletions
Show Stats Expand all files Collapse all files

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

@ -131,8 +131,8 @@ func ALiCallBack(notifyReq gopay.BodyMap, aliConfig AliPay) error {
// 记录日志 // 记录日志
go func() { go func() {
payCallback, _ := json.Marshal(notifyReq) payCallback, _ := json.Marshal(notifyReq)
payParam := "{}" payParam := ""
SaveLog(int64(orderId), common.THIRD_ORDER_TYPE_CALL_BACK, string(payCallback), payParam, string(merchantCallback)) saveLog(int64(orderId), common.THIRD_ORDER_TYPE_CALL_BACK, string(payCallback), payParam, string(merchantCallback))
}() }()
if res.ErrCode != errorcode.Success { if res.ErrCode != errorcode.Success {

17
app/third/paymentService/payment_service.go
View File

@ -8,7 +8,6 @@ import (
"PaymentCenter/app/third/paymentService/payCommon" "PaymentCenter/app/third/paymentService/payCommon"
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"github.com/qit-team/snow-core/log/logger" "github.com/qit-team/snow-core/log/logger"
"strconv" "strconv"
) )
@ -86,10 +85,10 @@ func PaymentService(c context.Context, payOrderRequest PayOrderRequest) PayOrder
// 记录日志 // 记录日志
go func() { go func() {
orderId := payOrderRequest.OrderId orderId := payOrderRequest.OrderId
payCallback := fmt.Sprintf("{%s}", info) payCallback := info
payParam, _ := json.Marshal(payOrderRequest) payParam, _ := json.Marshal(payOrderRequest)
merchantCallback, _ := json.Marshal(payOrderResponse) merchantCallback, _ := json.Marshal(payOrderResponse)
SaveLog(orderId, common.THIRD_ORDER_TYPE_PAY, payCallback, string(payParam), string(merchantCallback)) saveLog(orderId, common.THIRD_ORDER_TYPE_PAY, payCallback, string(payParam), string(merchantCallback))
}() }()
return payOrderResponse return payOrderResponse
} }
@ -152,7 +151,7 @@ func PayOrderQuery(c context.Context, payOrderQueryRequest PayOrderQueryRequest)
payCallback, _ := json.Marshal(info) payCallback, _ := json.Marshal(info)
payParam, _ := json.Marshal(payOrderQueryRequest) payParam, _ := json.Marshal(payOrderQueryRequest)
merchantCallback, _ := json.Marshal(payOrderQueryResponse) merchantCallback, _ := json.Marshal(payOrderQueryResponse)
SaveLog(orderId, common.THIRD_ORDER_TYPE_ORDER_QUERY, string(payCallback), string(payParam), string(merchantCallback)) saveLog(orderId, common.THIRD_ORDER_TYPE_ORDER_QUERY, string(payCallback), string(payParam), string(merchantCallback))
}() }()
return payOrderQueryResponse return payOrderQueryResponse
} }
@ -216,7 +215,7 @@ func OrderRefund(c context.Context, orderRefundRequest OrderRefundRequest) Order
payCallback, _ := json.Marshal(info) payCallback, _ := json.Marshal(info)
payParam, _ := json.Marshal(orderRefundRequest) payParam, _ := json.Marshal(orderRefundRequest)
merchantCallback, _ := json.Marshal(orderRefundResponse) merchantCallback, _ := json.Marshal(orderRefundResponse)
SaveLog(orderId, common.THIRD_ORDER_TYPE_REFUND, string(payCallback), string(payParam), string(merchantCallback)) saveLog(orderId, common.THIRD_ORDER_TYPE_REFUND, string(payCallback), string(payParam), string(merchantCallback))
}() }()
return orderRefundResponse return orderRefundResponse
@ -268,7 +267,7 @@ func OrderRefundQuery(c context.Context, orderRefundQueryRequest OrderRefundQuer
payCallback, _ := json.Marshal(info) payCallback, _ := json.Marshal(info)
payParam, _ := json.Marshal(orderRefundQueryRequest) payParam, _ := json.Marshal(orderRefundQueryRequest)
merchantCallback, _ := json.Marshal(orderRefundQueryResponse) merchantCallback, _ := json.Marshal(orderRefundQueryResponse)
SaveLog(orderId, common.THIRD_ORDER_TYPE_REFUND_QUERY, string(payCallback), string(payParam), string(merchantCallback)) saveLog(orderId, common.THIRD_ORDER_TYPE_REFUND_QUERY, string(payCallback), string(payParam), string(merchantCallback))
}() }()
return orderRefundQueryResponse return orderRefundQueryResponse
@ -324,14 +323,14 @@ func OrderClose(c context.Context, orderCloseRequest OrderCloseRequest) OrderClo
payCallback, _ := json.Marshal(info) payCallback, _ := json.Marshal(info)
payParam, _ := json.Marshal(orderCloseRequest) payParam, _ := json.Marshal(orderCloseRequest)
merchantCallback, _ := json.Marshal(orderCloseResponse) merchantCallback, _ := json.Marshal(orderCloseResponse)
SaveLog(orderId, common.THIRD_ORDER_TYPE_CLOSE, string(payCallback), string(payParam), string(merchantCallback)) saveLog(orderId, common.THIRD_ORDER_TYPE_CLOSE, string(payCallback), string(payParam), string(merchantCallback))
}() }()
return orderCloseResponse return orderCloseResponse
} }
// SaveLog 记录操作日志 // saveLog 记录操作日志
func SaveLog(orderId int64, OType int, payCallback string, PayParam string, MerchantCallback string) { func saveLog(orderId int64, OType int, payCallback string, PayParam string, MerchantCallback string) {
thirdRepo := data.NewOrderThirdPayLogRepo(paychannelmodel.GetInstance().GetDb()) thirdRepo := data.NewOrderThirdPayLogRepo(paychannelmodel.GetInstance().GetDb())
log := orderthirdpaylogmodel.OrderThirdPayLog{ log := orderthirdpaylogmodel.OrderThirdPayLog{
OrderId: orderId, OrderId: orderId,

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

@ -165,8 +165,8 @@ func WxPayCallBack(notifyReq *wechat.V3NotifyReq, wxConfig WxPay) error {
// 记录日志 // 记录日志
go func() { go func() {
payCallback, _ := json.Marshal(CallBackInfo) payCallback, _ := json.Marshal(CallBackInfo)
payParam := "{}" payParam := ""
SaveLog(int64(orderId), common.THIRD_ORDER_TYPE_CALL_BACK, string(payCallback), payParam, string(merchantCallback)) saveLog(int64(orderId), common.THIRD_ORDER_TYPE_CALL_BACK, string(payCallback), payParam, string(merchantCallback))
}() }()
if res.ErrCode != errorcode.Success { if res.ErrCode != errorcode.Success {