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

Compare commits

base: BaseSystem:f6bdfdf84c64750a8da2dccfad2ae322b69c3759
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:9b7f904108bf0c6ca44a6b7888412ca6eb98bf6e
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. "f6bdfdf84c64750a8da2dccfad2ae322b69c3759" and "9b7f904108bf0c6ca44a6b7888412ca6eb98bf6e" have entirely different histories.
f6bdfdf84c ... 9b7f904108

4 changed files with 44 additions and 78 deletions
Show Stats Expand all files Collapse all files

4
app/constants/common/common.go
View File

@ -45,10 +45,6 @@ const (
THIRD_ORDER_TYPE_REFUND_QUERY = 4 // 退款查询 THIRD_ORDER_TYPE_REFUND_QUERY = 4 // 退款查询
THIRD_ORDER_TYPE_CLOSE = 5 // 关闭订单 THIRD_ORDER_TYPE_CLOSE = 5 // 关闭订单
THIRD_ORDER_TYPE_CALL_BACK = 6 // 支付回调 THIRD_ORDER_TYPE_CALL_BACK = 6 // 支付回调
THIRD_ORDER_LOG_STATUS_COMMON = 0 // 第三方日志状态 未知
THIRD_ORDER_LOG_STATUS_FAIL = 1 // 第三方日志状态 失败
THIRD_ORDER_LOG_STATUS_SUCCESS = 2 // 第三方日志状态 成功
) )
var PayChannelList = map[int]string{ var PayChannelList = map[int]string{

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

@ -132,8 +132,7 @@ func ALiCallBack(notifyReq gopay.BodyMap, aliConfig AliPay) error {
go func() { go func() {
payCallback, _ := json.Marshal(notifyReq) payCallback, _ := json.Marshal(notifyReq)
payParam := "{}" payParam := "{}"
status := common.THIRD_ORDER_LOG_STATUS_SUCCESS 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, "{}", status)
}() }()
if res.ErrCode != errorcode.Success { if res.ErrCode != errorcode.Success {

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

@ -51,7 +51,6 @@ func PaymentService(c context.Context, payOrderRequest PayOrderRequest) PayOrder
logger.Info(c, "PaymentService 收到支付请求", payOrderRequest) logger.Info(c, "PaymentService 收到支付请求", payOrderRequest)
var err error var err error
var info string var info string
var payOrderResponse PayOrderResponse
switch payOrderRequest.ChannelType { switch payOrderRequest.ChannelType {
case payCommon.PAY_CHANNEL_WECHAT_H5: case payCommon.PAY_CHANNEL_WECHAT_H5:
// 微信H5支付 // 微信H5支付
@ -60,35 +59,29 @@ func PaymentService(c context.Context, payOrderRequest PayOrderRequest) PayOrder
// 支付宝H5支付 // 支付宝H5支付
info, err = ALiH5PayInfo(c, payOrderRequest) info, err = ALiH5PayInfo(c, payOrderRequest)
default: default:
payOrderResponse = PayOrderResponse{ return PayOrderResponse{
Code: payCommon.PAY_NOT_FOUND_CODE, Code: payCommon.PAY_NOT_FOUND_CODE,
ErrorMsg: "暂不支持该支付渠道，请后续再使用", ErrorMsg: "暂不支持该支付渠道，请后续再使用",
} }
} }
logStatus := common.THIRD_ORDER_LOG_STATUS_FAIL
if err != nil { if err != nil {
payOrderResponse = PayOrderResponse{ return PayOrderResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: err.Error(), ErrorMsg: err.Error(),
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL }
} else { payOrderResponse := PayOrderResponse{
payOrderResponse = PayOrderResponse{
Code: payCommon.PAY_SUCCESS_CODE, Code: payCommon.PAY_SUCCESS_CODE,
ErrorMsg: "", ErrorMsg: "",
Result: info, Result: info,
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_SUCCESS
}
// 记录日志 // 记录日志
go func() { go func() {
orderId := payOrderRequest.OrderId orderId := payOrderRequest.OrderId
payCallback := fmt.Sprintf("{%s}", info) payCallback := fmt.Sprintf("{%s}", 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), logStatus) SaveLog(orderId, common.THIRD_ORDER_TYPE_PAY, payCallback, string(payParam), string(merchantCallback))
}() }()
return payOrderResponse return payOrderResponse
} }
@ -121,7 +114,6 @@ type PayOrderQueryInfo struct {
func PayOrderQuery(c context.Context, payOrderQueryRequest PayOrderQueryRequest) PayOrderQueryResponse { func PayOrderQuery(c context.Context, payOrderQueryRequest PayOrderQueryRequest) PayOrderQueryResponse {
var err error var err error
var info PayOrderQueryInfo var info PayOrderQueryInfo
var payOrderQueryResponse PayOrderQueryResponse
switch payOrderQueryRequest.PayChannel { switch payOrderQueryRequest.PayChannel {
case payCommon.PAY_CHANNLE_TYPE_WECHAT: case payCommon.PAY_CHANNLE_TYPE_WECHAT:
// 微信H5支付 // 微信H5支付
@ -129,26 +121,22 @@ func PayOrderQuery(c context.Context, payOrderQueryRequest PayOrderQueryRequest)
case payCommon.PAY_CHANNLE_TYPE_ZFB: case payCommon.PAY_CHANNLE_TYPE_ZFB:
info, err = ALiOrderQuery(c, payOrderQueryRequest.Ali, strconv.FormatInt(payOrderQueryRequest.OrderId, 10)) info, err = ALiOrderQuery(c, payOrderQueryRequest.Ali, strconv.FormatInt(payOrderQueryRequest.OrderId, 10))
default: default:
payOrderQueryResponse = PayOrderQueryResponse{ return PayOrderQueryResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: "暂不支持该支付渠道，请后续再使用", ErrorMsg: "暂不支持该支付渠道，请后续再使用",
} }
} }
logStatus := common.THIRD_ORDER_LOG_STATUS_FAIL
if err != nil { if err != nil {
payOrderQueryResponse = PayOrderQueryResponse{ return PayOrderQueryResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: err.Error(), ErrorMsg: err.Error(),
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL }
} else {
payOrderQueryResponse = PayOrderQueryResponse{ payOrderQueryResponse := PayOrderQueryResponse{
Code: payCommon.PAY_SUCCESS_CODE, Code: payCommon.PAY_SUCCESS_CODE,
Result: info, Result: info,
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_SUCCESS
}
// 记录日志 // 记录日志
go func() { go func() {
@ -156,7 +144,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), logStatus) SaveLog(orderId, common.THIRD_ORDER_TYPE_ORDER_QUERY, string(payCallback), string(payParam), string(merchantCallback))
}() }()
return payOrderQueryResponse return payOrderQueryResponse
} }
@ -191,7 +179,6 @@ func OrderRefund(c context.Context, orderRefundRequest OrderRefundRequest) Order
logger.Info(c, "PaymentService 收到退款请求", orderRefundRequest) logger.Info(c, "PaymentService 收到退款请求", orderRefundRequest)
var err error var err error
var info OrderRefundInfo var info OrderRefundInfo
var orderRefundResponse OrderRefundResponse
switch orderRefundRequest.PayChannel { switch orderRefundRequest.PayChannel {
case payCommon.PAY_CHANNLE_TYPE_WECHAT: case payCommon.PAY_CHANNLE_TYPE_WECHAT:
// 微信H5支付 // 微信H5支付
@ -199,35 +186,31 @@ func OrderRefund(c context.Context, orderRefundRequest OrderRefundRequest) Order
case payCommon.PAY_CHANNLE_TYPE_ZFB: case payCommon.PAY_CHANNLE_TYPE_ZFB:
info, err = AliRefundOrder(c, orderRefundRequest) info, err = AliRefundOrder(c, orderRefundRequest)
default: default:
orderRefundResponse = OrderRefundResponse{ return OrderRefundResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: "暂不支持该支付渠道，请后续再使用", ErrorMsg: "暂不支持该支付渠道，请后续再使用",
} }
} }
logStatus := common.THIRD_ORDER_LOG_STATUS_FAIL
if err != nil { if err != nil {
orderRefundResponse = OrderRefundResponse{ return OrderRefundResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: err.Error(), ErrorMsg: err.Error(),
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL }
} else {
orderRefundResponse = OrderRefundResponse{ orderRefundResponse := OrderRefundResponse{
Code: payCommon.PAY_SUCCESS_CODE, Code: payCommon.PAY_SUCCESS_CODE,
Result: info, Result: info,
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_SUCCESS
}
// 记录日志 // 记录日志
go func() { go func() {
orderId := orderRefundRequest.OrderId orderId := orderRefundRequest.OrderId
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), logStatus) SaveLog(orderId, common.THIRD_ORDER_TYPE_REFUND, string(payCallback), string(payParam), string(merchantCallback))
}() }()
return orderRefundResponse return orderRefundResponse
} }
@ -248,7 +231,6 @@ type OrderRefundQueryResponse struct {
func OrderRefundQuery(c context.Context, orderRefundQueryRequest OrderRefundQueryRequest) OrderRefundQueryResponse { func OrderRefundQuery(c context.Context, orderRefundQueryRequest OrderRefundQueryRequest) OrderRefundQueryResponse {
var err error var err error
var info OrderRefundInfo var info OrderRefundInfo
var orderRefundQueryResponse OrderRefundQueryResponse
switch orderRefundQueryRequest.PayChannel { switch orderRefundQueryRequest.PayChannel {
case payCommon.PAY_CHANNLE_TYPE_WECHAT: case payCommon.PAY_CHANNLE_TYPE_WECHAT:
// 微信H5支付 // 微信H5支付
@ -256,26 +238,21 @@ func OrderRefundQuery(c context.Context, orderRefundQueryRequest OrderRefundQuer
case payCommon.PAY_CHANNLE_TYPE_ZFB: case payCommon.PAY_CHANNLE_TYPE_ZFB:
info, err = AliRefundOrderQuery(c, orderRefundQueryRequest) info, err = AliRefundOrderQuery(c, orderRefundQueryRequest)
default: default:
orderRefundQueryResponse = OrderRefundQueryResponse{ return OrderRefundQueryResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: "暂不支持该支付渠道，请后续再使用", ErrorMsg: "暂不支持该支付渠道，请后续再使用",
} }
} }
logStatus := common.THIRD_ORDER_LOG_STATUS_FAIL
if err != nil { if err != nil {
orderRefundQueryResponse = OrderRefundQueryResponse{ return OrderRefundQueryResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: err.Error(), ErrorMsg: err.Error(),
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL }
} else { orderRefundQueryResponse := OrderRefundQueryResponse{
orderRefundQueryResponse = OrderRefundQueryResponse{
Code: payCommon.PAY_SUCCESS_CODE, Code: payCommon.PAY_SUCCESS_CODE,
Result: info, Result: info,
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_SUCCESS
}
// 记录日志 // 记录日志
go func() { go func() {
@ -283,8 +260,9 @@ 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), logStatus) SaveLog(orderId, common.THIRD_ORDER_TYPE_REFUND_QUERY, string(payCallback), string(payParam), string(merchantCallback))
}() }()
return orderRefundQueryResponse return orderRefundQueryResponse
} }
@ -310,7 +288,6 @@ func OrderClose(c context.Context, orderCloseRequest OrderCloseRequest) OrderClo
logger.Info(c, "PaymentService 收到关闭订单请求", orderCloseRequest) logger.Info(c, "PaymentService 收到关闭订单请求", orderCloseRequest)
var err error var err error
var info OrderCloseInfo var info OrderCloseInfo
var orderCloseResponse OrderCloseResponse
switch orderCloseRequest.PayChannel { switch orderCloseRequest.PayChannel {
case payCommon.PAY_CHANNLE_TYPE_WECHAT: case payCommon.PAY_CHANNLE_TYPE_WECHAT:
// 微信H5支付 // 微信H5支付
@ -318,45 +295,40 @@ func OrderClose(c context.Context, orderCloseRequest OrderCloseRequest) OrderClo
case payCommon.PAY_CHANNLE_TYPE_ZFB: case payCommon.PAY_CHANNLE_TYPE_ZFB:
info, err = AliCloseOrder(c, orderCloseRequest) info, err = AliCloseOrder(c, orderCloseRequest)
default: default:
orderCloseResponse = OrderCloseResponse{ return OrderCloseResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: "暂不支持该支付渠道，请后续再使用", ErrorMsg: "暂不支持该支付渠道，请后续再使用",
} }
} }
logStatus := common.THIRD_ORDER_LOG_STATUS_FAIL
if err != nil { if err != nil {
orderCloseResponse = OrderCloseResponse{ return OrderCloseResponse{
Code: payCommon.PAY_ERROR_CODE, Code: payCommon.PAY_ERROR_CODE,
ErrorMsg: err.Error(), ErrorMsg: err.Error(),
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL }
} else { orderCloseResponse := OrderCloseResponse{
orderCloseResponse = OrderCloseResponse{
Code: payCommon.PAY_SUCCESS_CODE, Code: payCommon.PAY_SUCCESS_CODE,
Result: info, Result: info,
} }
logStatus = common.THIRD_ORDER_LOG_STATUS_SUCCESS
}
// 记录日志 // 记录日志
go func() { go func() {
orderId := orderCloseRequest.OrderId orderId := orderCloseRequest.OrderId
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), logStatus) 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, status int) { 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,
PayCallback: payCallback, PayCallback: payCallback,
Status: status, Status: 0,
PayParam: PayParam, PayParam: PayParam,
MerchantCallback: MerchantCallback, MerchantCallback: MerchantCallback,
Type: OType, Type: OType,

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

@ -166,8 +166,7 @@ func WxPayCallBack(notifyReq *wechat.V3NotifyReq, wxConfig WxPay) error {
go func() { go func() {
payCallback, _ := json.Marshal(CallBackInfo) payCallback, _ := json.Marshal(CallBackInfo)
payParam := "{}" payParam := "{}"
status := common.THIRD_ORDER_LOG_STATUS_SUCCESS 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, "{}", status)
}() }()
if res.ErrCode != errorcode.Success { if res.ErrCode != errorcode.Success {