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

Compare commits

base: BaseSystem:d15d39bee05b5d13e60fe64f8c6b1b9942924049
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:6c0b41639bc0fd4667f89401da2439b9d05cba82
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. "d15d39bee05b5d13e60fe64f8c6b1b9942924049" and "6c0b41639bc0fd4667f89401da2439b9d05cba82" have entirely different histories.
d15d39bee0 ... 6c0b41639b

3 changed files with 347 additions and 362 deletions
Show Stats Expand all files Collapse all files

6
app/http/entities/front/pay.go
View File

@ -32,14 +32,10 @@ type PayReqs struct {
} }
type RefundReqs struct { type RefundReqs struct {
AppId int64 `json:"app_id" validate:"required"` PayCommonReqBody
Timestamp int64 `json:"timestamp" validate:"required"`
Amount int `json:"amount" validate:"required" label:"支付金额，单位分"`
PayChannelId int64 `json:"pay_channel_id" label:"支付渠道"`
RefundOutTradeNo string `json:"refund_out_trade_no" label:"需要退款的外侧商户订单号"` RefundOutTradeNo string `json:"refund_out_trade_no" label:"需要退款的外侧商户订单号"`
RefundOrderId string `json:"refundOrder_id" label:"需要退款的平台订单号"` RefundOrderId string `json:"refundOrder_id" label:"需要退款的平台订单号"`
OutTradeNo string `json:"out_trade_no" validate:"required" label:"外侧商户订单号"` OutTradeNo string `json:"out_trade_no" validate:"required" label:"外侧商户订单号"`
Desc string `json:"desc" validate:"max=100" label:"商品描述"`
} }
type PayUrlResp struct { type PayUrlResp struct {

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

@ -55,11 +55,11 @@ func ThirdPayRefundCheck(ctx context.Context, refundReq *front.RefundReqs, appCh
} }
copier.Copy(&req, refundReq) copier.Copy(&req, refundReq)
check = thirdpay.NewPayCheck(&ctx, &req, appCheck, ip) check = thirdpay.NewPayCheck(&ctx, &req, appCheck, ip)
//// 校验表单 // 校验表单
//check.CheckPayInfo() check.CheckPayInfo()
//if check.CheckCode != errorcode.Success { if check.CheckCode != errorcode.Success {
// return check, check.CheckCode return check, check.CheckCode
//} }
check.CheckOrderRefund() check.CheckOrderRefund()
return check, check.CheckCode return check, check.CheckCode
} }

183
front/templates/payPage.html
View File

@ -1,9 +1,10 @@
{{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">
<title>收银台页面</title> <title>收银台页面</title>
<style> <style>
@ -36,7 +37,7 @@
/* 按钮样式 */ /* 按钮样式 */
button { button {
background-color: #007bff; background-color: #007BFF;
color: #fff; color: #fff;
border: none; border: none;
padding: 10px 20px; padding: 10px 20px;
@ -63,7 +64,7 @@
.loading-spinner { .loading-spinner {
border: 5px solid #f3f3f3; border: 5px solid #f3f3f3;
border-top: 5px solid #007bff; border-top: 5px solid #007BFF;
border-radius: 50%; border-radius: 50%;
width: 50px; width: 50px;
height: 50px; height: 50px;
@ -72,12 +73,8 @@
} }
@keyframes spin { @keyframes spin {
0% { 0% { transform: rotate(0deg); }
transform: rotate(0deg); 100% { transform: rotate(360deg); }
}
100% {
transform: rotate(360deg);
}
} }
.loading-text { .loading-text {
@ -109,7 +106,7 @@
} }
.payment-option:hover { .payment-option:hover {
border-color: #007bff; border-color: #007BFF;
background-color: #f0f7ff; background-color: #f0f7ff;
} }
@ -118,7 +115,7 @@
} }
.payment-option.selected { .payment-option.selected {
border-color: #007bff; border-color: #007BFF;
background-color: #f0f7ff; background-color: #f0f7ff;
} }
</style> </style>
@ -127,39 +124,35 @@
{{if eq .code 200 }} {{if eq .code 200 }}
<body> <body>
<!-- 页面内容 --> <!-- 页面内容 -->
<div class="payment-info" id="payment-info" style="display: none"> <div class="payment-info" id="payment-info" style="display: none;">
<h2>订单支付</h2> <h2>订单支付</h2>
<p>{{.desc}}</p> <p>{{.desc}}</p>
<p>交易号：{{ .id }}</p> <p>交易号：{{ .id }}</p>
<p> <p>交易金额：<strong style="color: #ff5500; font-size: 24px;">{{ .amount }}</strong> 元</p>
交易金额：<strong style="color: #ff5500; font-size: 24px"
>{{ .amount }}</strong
>
元
</p>
</div> </div>
<!-- 支付方式选择区域 --> <!-- 支付方式选择区域 -->
<div id="pay-container" style="display: none"> <div id="pay-container" style="display: none;">
<div id="pay"></div> <div id="pay"></div>
<!-- 支付方式列表 --> <!-- 支付方式列表 -->
<ul id="payment-list"></ul> <ul id="payment-list"></ul>
</div> </div>
<!-- Loading状态 --> <!-- Loading状态 -->
<div id="loading" class="loading-container" style="display: flex"> <div id="loading" class="loading-container" style="display: flex;">
<div class="loading-spinner"></div> <div class="loading-spinner"></div>
<p class="loading-text">支付处理中，请稍等...</p> <p class="loading-text">支付处理中，请稍等...</p>
</div> </div>
</body> </body>
<script> <script>
// 从URL中提取参数 // 从URL中提取参数
function getQueryParam(param) { function getQueryParam(param) {
const queryString = window.location.search.substring(1); const queryString = window.location.search.substring(1);
const params = queryString.split("&"); const params = queryString.split('&');
for (let i = 0; i < params.length; i++) { for (let i = 0; i < params.length; i++) {
const [key, value] = params[i].split("="); const [key, value] = params[i].split('=');
if (key === param) { if (key === param) {
return decodeURIComponent(value); return decodeURIComponent(value);
} }
@ -169,54 +162,51 @@
// 显示Loading效果 // 显示Loading效果
function showLoading() { function showLoading() {
document.getElementById("payment-info").style.display = "none"; document.getElementById('payment-info').style.display = 'none';
document.getElementById("pay-container").style.display = "none"; document.getElementById('pay-container').style.display = 'none';
document.getElementById("loading").style.display = "block"; document.getElementById('loading').style.display = 'block';
} }
// 关闭Loading效果 // 关闭Loading效果
function closeLoading() { function closeLoading() {
document.getElementById("loading").style.display = "none"; document.getElementById('loading').style.display = 'none';
document.getElementById("payment-info").style.display = "block"; document.getElementById('payment-info').style.display = 'block';
document.getElementById("pay-container").style.display = "block"; document.getElementById('pay-container').style.display = 'block';
} }
// 处理支付回调 // 处理支付回调
function handlePaymentCallback() { function handlePaymentCallback() {
const id = getQueryParam("no"); const id = getQueryParam('no');
if (!id) { if (!id) {
closeLoading(); closeLoading();
return; return;
} };
// alert(`no:${id}`);
// 查询订单状态 // 查询订单状态
fetch(`/pay/front/api/v1/payPage/query?no=${id}`, { fetch(`/pay/front/api/v1/payPage/query?no=${id}`, {
method: "POST", method: 'POST',
}) })
.then(async (response) => { .then(async response => {
if (!response.ok) throw new Error("请求失败"); if (!response.ok) throw new Error('请求失败');
return await response.json(); return await response.json();
}) })
.then((data) => { .then(data => {
closeLoading(); closeLoading();
// alert(`订单状态:${data.status}`);
switch(data.status) { switch(data.status) {
case 2: // 处理中 case 2: // 处理中
handlePaymentCallback(); // 重查状态 handlePaymentCallback(); // 重查状态
break; break;
case 3: // 支付成功 case 3: // 支付成功
// alert(data.return_url);
if (data.return_url) { if (data.return_url) {
window.location.href = data.return_url; // 自动跳转 window.location.href = data.return_url; // 自动跳转
} }
break; break;
default: // 其他状态（待支付/失败/关闭） default: // 其他状态（待支付/失败/关闭）
// alert("其他状态（待支付");
fetchPaymentMethods(); fetchPaymentMethods();
// window.location.reload(); // window.location.reload();
} }
}) })
.catch((error) => { .catch(error => {
// closeLoading(); // closeLoading();
window.location.reload(); window.location.reload();
}); });
@ -224,33 +214,34 @@
// 获取支付方式列表 // 获取支付方式列表
function fetchPaymentMethods() { function fetchPaymentMethods() {
const id = getQueryParam("no");
const id = getQueryParam('no');
if (id) { if (id) {
fetch(`/pay/front/api/v1/payPage/list?id=${id}`, { fetch(`/pay/front/api/v1/payPage/list?id=${id}`, {
method: "POST", method: 'POST',
}) })
.then(async (response) => { .then(async response => {
if (response.ok) { if (response.ok) {
const data = await response.json(); const data = await response.json()
console.log(data); console.log(data)
if (data.code !== 200) { if (data.code !== 200) {
throw new Error("无效"); throw new Error('无效');
} else { } else {
return data; return data;
} }
} else { } else {
throw new Error("无效"); throw new Error('无效');
} }
}) })
.then((data) => { .then(data => {
// 处理返回的数据，例如渲染支付方式列表 // 处理返回的数据，例如渲染支付方式列表
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) { } else if (data.data.length === 1) {
if (localStorage.getItem("auto-redirect") != 2) { if(localStorage.getItem('auto-redirect') != 2){
// 否则设置自动跳转标记，并跳转 // 否则设置自动跳转标记，并跳转
localStorage.setItem("auto-redirect", 2); localStorage.setItem('auto-redirect', 2);
window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${data.data[0].pay_channel_id}&no=${id}`; window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${data.data[0].pay_channel_id}&no=${id}`;
} else { } else {
closeLoading(); closeLoading();
@ -262,56 +253,55 @@
renderPaymentMethods(data.data); renderPaymentMethods(data.data);
} }
}) })
.catch((error) => { .catch(error => {
closeLoading(); closeLoading();
console.error("获取支付方式失败:", error); console.error('获取支付方式失败:', error);
// const pay = document.getElementById("pay"); const pay = document.getElementById('pay');
// pay.innerHTML = pay.innerHTML = '<h3 style="color: red;">获取支付方式失败，请刷新重试</h3>';
// '<h3 style="color: red;">获取支付方式失败，请刷新重试</h3>';
}); });
} else { } else {
closeLoading(); closeLoading();
console.error("Order no not found in URL"); console.error('Order no not found in URL');
} }
} }
// 渲染支付方式列表 // 渲染支付方式列表
function renderPaymentMethods(paymentMethods) { function renderPaymentMethods(paymentMethods) {
const pay = document.getElementById("pay"); const pay = document.getElementById('pay');
pay.innerHTML = "<h3>请选择支付方式</h3>"; pay.innerHTML = '<h3>请选择支付方式</h3>';
const paymentList = document.getElementById("payment-list"); const paymentList = document.getElementById('payment-list');
paymentList.innerHTML = ""; paymentList.innerHTML = '';
// 标记是否是第一个支付方式 // 标记是否是第一个支付方式
let isFirstMethod = true; let isFirstMethod = true;
paymentMethods.forEach((method) => { paymentMethods.forEach(method => {
const listItem = document.createElement("li"); const listItem = document.createElement('li');
listItem.className = "payment-option"; listItem.className = 'payment-option';
const radioInput = document.createElement("input"); const radioInput = document.createElement('input');
radioInput.type = "radio"; radioInput.type = 'radio';
radioInput.name = "paymentMethod"; radioInput.name = 'paymentMethod';
radioInput.value = method.pay_channel_id; radioInput.value = method.pay_channel_id;
radioInput.id = `method-${method.pay_channel_id}`; radioInput.id = `method-${method.pay_channel_id}`;
// 如果是第一个支付方式，默认选中 // 如果是第一个支付方式，默认选中
if(isFirstMethod) { if(isFirstMethod) {
radioInput.checked = true; radioInput.checked = true;
listItem.classList.add("selected"); listItem.classList.add('selected');
isFirstMethod = false; isFirstMethod = false;
} }
const label = document.createElement("label"); const label = document.createElement('label');
label.htmlFor = `method-${method.pay_channel_id}`; label.htmlFor = `method-${method.pay_channel_id}`;
label.textContent = method.pay_name; label.textContent = method.pay_name;
if (method.icon_url) { if (method.icon_url) {
const icon = document.createElement("img"); const icon = document.createElement('img');
icon.src = method.icon_url; icon.src = method.icon_url;
icon.style.height = "24px"; icon.style.height = '24px';
icon.style.marginRight = "10px"; icon.style.marginRight = '10px';
label.prepend(icon); label.prepend(icon);
} }
@ -320,70 +310,69 @@
paymentList.appendChild(listItem); paymentList.appendChild(listItem);
// 点击整个区域也可以选择 // 点击整个区域也可以选择
listItem.addEventListener("click", () => { listItem.addEventListener('click', () => {
// 移除所有选中样式 // 移除所有选中样式
document.querySelectorAll(".payment-option").forEach((item) => { document.querySelectorAll('.payment-option').forEach(item => {
item.classList.remove("selected"); item.classList.remove('selected');
}); });
// 添加当前选中样式 // 添加当前选中样式
listItem.classList.add("selected"); listItem.classList.add('selected');
radioInput.checked = true; radioInput.checked = true;
}); });
}); });
// 添加提交按钮 // 添加提交按钮
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( const selectedMethod = document.querySelector('input[name="paymentMethod"]:checked');
'input[name="paymentMethod"]:checked'
);
if (selectedMethod) { if (selectedMethod) {
window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${selectedMethod.value}&no=${no}`; window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${selectedMethod.value}&no=${no}`;
} else { } else {
alert("请选择支付方式"); alert('请选择支付方式');
} }
}; };
const buttonContainer = document.createElement("div"); const buttonContainer = document.createElement('div');
buttonContainer.style.textAlign = "center"; buttonContainer.style.textAlign = 'center';
buttonContainer.appendChild(submitButton); buttonContainer.appendChild(submitButton);
paymentList.appendChild(buttonContainer); paymentList.appendChild(buttonContainer);
} }
// 页面加载时执行
// 监听页面可见性变化 // 监听页面可见性变化
document.addEventListener("visibilitychange", function () { document.addEventListener('visibilitychange', function() {
if (!document.hidden && localStorage.getItem("auto-redirect") == 2) { if (!document.hidden && localStorage.getItem('auto-redirect') == 2) {
// 按回退键返回，重新获取支付方式 // 页面从后台返回且处于支付状态
fetchPaymentMethods(); fetchPaymentMethods();
} }
}); });
// 页面加载时执行
window.onload = function() { window.onload = function() {
// alert(`return:${getQueryParam("return")}`); if (localStorage.getItem('auto-redirect') && localStorage.getItem('auto-redirect') == 2) {
if (getQueryParam("return")) {
// alert("处理支付回调");
handlePaymentCallback(); // 如果是支付回调且不是自动跳转，处理支付结果 handlePaymentCallback(); // 如果是支付回调且不是自动跳转，处理支付结果
} else { } else {
localStorage.setItem("auto-redirect", 1); // 设置自动跳转标记 localStorage.setItem('auto-redirect', 1); // 设置自动跳转标记
fetchPaymentMethods(); // 获取支付方式 fetchPaymentMethods(); // 获取支付方式
} }
}; };
</script> </script>
{{ else}} {{ else}}
<body> <body>
<div class="payment-info" style="text-align: center"> <div class="payment-info" style="text-align: center;">
<h2 style="color: #ff0000">支付异常</h2> <h2 style="color: #ff0000;">支付异常</h2>
<p>{{.message}}</p> <p>{{.message}}</p>
<button onclick="window.location.href='/'">返回</button>
</div> </div>
</body> </body>
{{end}} {{end}}
</html> </html>
{{end}} {{end}}