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

Compare commits

base: BaseSystem:9397b72a2eb30182c84f5f9f5ce32bc3f64a0a46
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:3f26ffa8cbc083b7560097c1abddaa72c1f5ba1a
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

2 Commits
9397b72a2e ... 3f26ffa8cb

Author SHA1 Message Date
wolter 3f26ffa8cb feat: 收银台只有一个支付方式默认唤起 2025-02-18 10:47:17 +08:00
wolter d634ca7d22 feat: v2预支付fix 2024-12-25 14:36:08 +08:00
4 changed files with 15 additions and 6 deletions
Show Stats Expand all files Collapse all files

9
app/constants/errorcode/error_code.go
View File

@ -79,6 +79,8 @@ const (
OrderRefundAmountError = 1414 OrderRefundAmountError = 1414
OrderPayChannelChange = 1415 OrderPayChannelChange = 1415
OrderPayRequestLogNotExist = 1416 OrderPayRequestLogNotExist = 1416
OrderPayRequestAcquireLock = 1430
// 关闭订单 // 关闭订单
CloseOrderPayed = 1420 CloseOrderPayed = 1420
@ -188,9 +190,10 @@ var MsgZH = map[int]string{
ThirdRefundFail: "第三方退款失败", ThirdRefundFail: "第三方退款失败",
WechatAuthFail: "微信授权失败", WechatAuthFail: "微信授权失败",
WechatAuthSignFail: "微信签名失败", WechatAuthSignFail: "微信签名失败",
ClientEnvErr: "支付环境错误", ClientEnvErr: "支付环境错误",
OrderPayRequestAcquireLock: "系统繁忙,请稍后再试",
} }
var MsgMap map[string]map[int]string = map[string]map[int]string{"en": MsgZH} var MsgMap map[string]map[int]string = map[string]map[int]string{"en": MsgZH}

3
app/services/thirdpay/pay_page.go
View File

@ -181,6 +181,9 @@ func (this *payUrl) PayUrlV2Service() (result front.PayReqsV2Response, code int)
} else { } else {
if err != nil { if err != nil {
utils.Log(nil, "", "PayUrlV2Service,获取分布式锁失败", fmt.Sprintf("错误原因：%s", err.Error())) utils.Log(nil, "", "PayUrlV2Service,获取分布式锁失败", fmt.Sprintf("错误原因：%s", err.Error()))
code = errorcode.SystemError
} else {
code = errorcode.OrderPayRequestAcquireLock
} }
return return
} }

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

@ -30,7 +30,7 @@ type WxPay struct {
SerialNo string `json:"serial_no"` // 商户证书的证书序列号 SerialNo string `json:"serial_no"` // 商户证书的证书序列号
ApiV3Key string `json:"api_v_3_key"` // apiV3Key，商户平台获取 ApiV3Key string `json:"api_v_3_key"` // apiV3Key，商户平台获取
PrivateKey string `json:"private_key"` // 私钥 apiclient_key.pem 读取后的内容 PrivateKey string `json:"private_key"` // 私钥 apiclient_key.pem 读取后的内容
Secret string `json:"secret"` // 商户私钥，读取后的内容 Secret string `json:"secret"` // 和appid配对使用
} }
type AliPay struct { type AliPay struct {

7
front/templates/payPage.html
View File

@ -1,6 +1,7 @@
{{define "payPage.html"}} {{define "payPage.html"}}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
@ -38,8 +39,6 @@
button:hover { button:hover {
background-color: #0056b3; background-color: #0056b3;
} }
</style> </style>
</head> </head>
@ -100,6 +99,8 @@
if (data === null || data.data.length === 0) { if (data === null || data.data.length === 0) {
const pay = document.getElementById('pay'); const pay = document.getElementById('pay');
pay.innerHTML = '<h3>支付环境异常，请检查</h3>'; pay.innerHTML = '<h3>支付环境异常，请检查</h3>';
} else if (data.data.length === 1) {
window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${data.data[0].pay_channel_id}&no=${id}`;
} else { } else {
renderPaymentMethods(data.data); renderPaymentMethods(data.data);
} }
@ -136,6 +137,7 @@
const submitButton = document.createElement('button'); const submitButton = document.createElement('button');
submitButton.type = 'button'; submitButton.type = 'button';
submitButton.textContent = '提交'; submitButton.textContent = '提交';
submitButton.onclick = function () { submitButton.onclick = function () {
const no = getQueryParam('no'); const no = getQueryParam('no');
const selectedMethod = document.querySelector('input[name="paymentMethod"]:checked'); const selectedMethod = document.querySelector('input[name="paymentMethod"]:checked');
@ -154,6 +156,7 @@
</script> </script>
{{ else}} {{ else}}
<body> <body>
<p>{{.message}}</p> <p>{{.message}}</p>
</body> </body>