Compare commits

..

No commits in common. "d15d39bee05b5d13e60fe64f8c6b1b9942924049" and "6c0b41639bc0fd4667f89401da2439b9d05cba82" have entirely different histories.

3 changed files with 347 additions and 362 deletions

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 {

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
} }

View File

@ -1,389 +1,378 @@
{{define "payPage.html"}} {{define "payPage.html"}}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>收银台页面</title>
<style> <head>
/* 基础样式 */ <meta charset="UTF-8">
body { <meta name="viewport" content="width=device-width, initial-scale=1.0">
font-family: Arial, sans-serif; <title>收银台页面</title>
max-width: 800px;
margin: 0 auto;
padding: 20px;
}
/* 段落样式 */ <style>
p { /* 基础样式 */
color: #666666; body {
margin-bottom: 10px; font-family: Arial, sans-serif;
} max-width: 800px;
margin: 0 auto;
padding: 20px;
}
/* 段落样式 */
p {
color: #666666;
margin-bottom: 10px;
}
/* 无序列表样式 */ /* 无序列表样式 */
ul { ul {
list-style: none; list-style: none;
padding: 0; padding: 0;
} }
/* 列表项样式 */ /* 列表项样式 */
li { li {
margin: 10px 0; margin: 10px 0;
display: flex; display: flex;
align-items: center; align-items: center;
} }
/* 按钮样式 */ /* 按钮样式 */
button { button {
background-color: #007bff; background-color: #007BFF;
color: #fff; color: #fff;
border: none; border: none;
padding: 10px 20px; padding: 10px 20px;
cursor: pointer; cursor: pointer;
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
border-radius: 4px; border-radius: 4px;
font-size: 16px; font-size: 16px;
margin-top: 20px; margin-top: 20px;
} }
/* 按钮悬停样式 */ /* 按钮悬停样式 */
button:hover { button:hover {
background-color: #0056b3; background-color: #0056b3;
} }
/* loading样式 */ /* loading样式 */
.loading-container { .loading-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 100%; height: 100%;
} }
.loading-spinner {
border: 5px solid #f3f3f3;
border-top: 5px solid #007BFF;
border-radius: 50%;
width: 50px;
height: 50px;
animation: spin 1s linear infinite;
margin-bottom: 20px;
}
@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}
.loading-text {
color: #666;
font-size: 18px;
}
/* 支付信息卡片 */
.payment-info {
background: #f9f9f9;
padding: 20px;
border-radius: 8px;
margin-bottom: 20px;
}
.payment-info h2 {
margin-top: 0;
color: #333;
}
/* 支付方式选项 */
.payment-option {
padding: 15px;
border: 1px solid #ddd;
border-radius: 8px;
margin-bottom: 10px;
cursor: pointer;
transition: all 0.3s ease;
}
.payment-option:hover {
border-color: #007BFF;
background-color: #f0f7ff;
}
.payment-option input[type="radio"] {
margin-right: 15px;
}
.loading-spinner { .payment-option.selected {
border: 5px solid #f3f3f3; border-color: #007BFF;
border-top: 5px solid #007bff; background-color: #f0f7ff;
border-radius: 50%; }
width: 50px; </style>
height: 50px; </head>
animation: spin 1s linear infinite;
margin-bottom: 20px;
}
@keyframes spin { {{if eq .code 200 }}
0% { <body>
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
.loading-text {
color: #666;
font-size: 18px;
}
/* 支付信息卡片 */
.payment-info {
background: #f9f9f9;
padding: 20px;
border-radius: 8px;
margin-bottom: 20px;
}
.payment-info h2 {
margin-top: 0;
color: #333;
}
/* 支付方式选项 */
.payment-option {
padding: 15px;
border: 1px solid #ddd;
border-radius: 8px;
margin-bottom: 10px;
cursor: pointer;
transition: all 0.3s ease;
}
.payment-option:hover {
border-color: #007bff;
background-color: #f0f7ff;
}
.payment-option input[type="radio"] {
margin-right: 15px;
}
.payment-option.selected {
border-color: #007bff;
background-color: #f0f7ff;
}
</style>
</head>
{{if eq .code 200 }}
<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>
<script> </body>
// 从URL中提取参数
function getQueryParam(param) {
const queryString = window.location.search.substring(1);
const params = queryString.split("&");
for (let i = 0; i < params.length; i++) {
const [key, value] = params[i].split("=");
if (key === param) {
return decodeURIComponent(value);
}
}
return null;
}
// 显示Loading效果 <script>
function showLoading() { // 从URL中提取参数
document.getElementById("payment-info").style.display = "none"; function getQueryParam(param) {
document.getElementById("pay-container").style.display = "none"; const queryString = window.location.search.substring(1);
document.getElementById("loading").style.display = "block"; const params = queryString.split('&');
} for (let i = 0; i < params.length; i++) {
const [key, value] = params[i].split('=');
// 关闭Loading效果 if (key === param) {
function closeLoading() { return decodeURIComponent(value);
document.getElementById("loading").style.display = "none"; }
document.getElementById("payment-info").style.display = "block";
document.getElementById("pay-container").style.display = "block";
}
// 处理支付回调
function handlePaymentCallback() {
const id = getQueryParam("no");
if (!id) {
closeLoading();
return;
}
// alert(`no:${id}`);
// 查询订单状态
fetch(`/pay/front/api/v1/payPage/query?no=${id}`, {
method: "POST",
})
.then(async (response) => {
if (!response.ok) throw new Error("请求失败");
return await response.json();
})
.then((data) => {
closeLoading();
// alert(`订单状态:${data.status}`);
switch (data.status) {
case 2: // 处理中
handlePaymentCallback(); // 重查状态
break;
case 3: // 支付成功
// alert(data.return_url);
if (data.return_url) {
window.location.href = data.return_url; // 自动跳转
}
break;
default: // 其他状态(待支付/失败/关闭)
// alert("其他状态(待支付");
fetchPaymentMethods();
// window.location.reload();
}
})
.catch((error) => {
// closeLoading();
window.location.reload();
});
}
// 获取支付方式列表
function fetchPaymentMethods() {
const id = getQueryParam("no");
if (id) {
fetch(`/pay/front/api/v1/payPage/list?id=${id}`, {
method: "POST",
})
.then(async (response) => {
if (response.ok) {
const data = await response.json();
console.log(data);
if (data.code !== 200) {
throw new Error("无效");
} else {
return data;
}
} else {
throw new Error("无效");
} }
}) return null;
.then((data) => { }
// 处理返回的数据,例如渲染支付方式列表
if (data === null || data.data.length === 0) { // 显示Loading效果
const pay = document.getElementById("pay"); function showLoading() {
pay.innerHTML = "<h3>支付环境异常,请检查</h3>"; document.getElementById('payment-info').style.display = 'none';
} else if (data.data.length === 1) { document.getElementById('pay-container').style.display = 'none';
if (localStorage.getItem("auto-redirect") != 2) { document.getElementById('loading').style.display = 'block';
// 否则设置自动跳转标记,并跳转 }
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}`; // 关闭Loading效果
} else { function closeLoading() {
document.getElementById('loading').style.display = 'none';
document.getElementById('payment-info').style.display = 'block';
document.getElementById('pay-container').style.display = 'block';
}
// 处理支付回调
function handlePaymentCallback() {
const id = getQueryParam('no');
if (!id) {
closeLoading(); closeLoading();
renderPaymentMethods(data.data); return;
} };
// 查询订单状态
fetch(`/pay/front/api/v1/payPage/query?no=${id}`, {
method: 'POST',
})
.then(async response => {
if (!response.ok) throw new Error('请求失败');
return await response.json();
})
.then(data => {
closeLoading();
switch(data.status) {
case 2: // 处理中
handlePaymentCallback(); // 重查状态
break;
case 3: // 支付成功
if (data.return_url) {
window.location.href = data.return_url; // 自动跳转
}
break;
default: // 其他状态(待支付/失败/关闭)
fetchPaymentMethods();
// window.location.reload();
}
})
.catch(error => {
// closeLoading();
window.location.reload();
});
}
// 获取支付方式列表
function fetchPaymentMethods() {
const id = getQueryParam('no');
if (id) {
fetch(`/pay/front/api/v1/payPage/list?id=${id}`, {
method: 'POST',
})
.then(async response => {
if (response.ok) {
const data = await response.json()
console.log(data)
if (data.code !== 200) {
throw new Error('无效');
} else {
return data;
}
} else {
throw new Error('无效');
}
})
.then(data => {
// 处理返回的数据,例如渲染支付方式列表
if (data === null || data.data.length === 0) {
const pay = document.getElementById('pay');
pay.innerHTML = '<h3>支付环境异常,请检查</h3>';
} else if (data.data.length === 1) {
if(localStorage.getItem('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}`;
} else {
closeLoading();
renderPaymentMethods(data.data);
}
} else {
closeLoading();
// 多种支付方式,展示支付界面
renderPaymentMethods(data.data);
}
})
.catch(error => {
closeLoading();
console.error('获取支付方式失败:', error);
const pay = document.getElementById('pay');
pay.innerHTML = '<h3 style="color: red;">获取支付方式失败,请刷新重试</h3>';
});
} else { } else {
closeLoading(); closeLoading();
// 多种支付方式,展示支付界面 console.error('Order no not found in URL');
renderPaymentMethods(data.data);
} }
}) }
.catch((error) => {
closeLoading(); // 渲染支付方式列表
console.error("获取支付方式失败:", error); function renderPaymentMethods(paymentMethods) {
// const pay = document.getElementById("pay"); const pay = document.getElementById('pay');
// pay.innerHTML = pay.innerHTML = '<h3>请选择支付方式</h3>';
// '<h3 style="color: red;">获取支付方式失败,请刷新重试</h3>';
});
} else {
closeLoading();
console.error("Order no not found in URL");
}
}
// 渲染支付方式列表 const paymentList = document.getElementById('payment-list');
function renderPaymentMethods(paymentMethods) { paymentList.innerHTML = '';
const pay = document.getElementById("pay");
pay.innerHTML = "<h3>请选择支付方式</h3>";
const paymentList = document.getElementById("payment-list"); // 标记是否是第一个支付方式
paymentList.innerHTML = ""; let isFirstMethod = true;
paymentMethods.forEach(method => {
const listItem = document.createElement('li');
listItem.className = 'payment-option';
const radioInput = document.createElement('input');
radioInput.type = 'radio';
radioInput.name = 'paymentMethod';
radioInput.value = method.pay_channel_id;
radioInput.id = `method-${method.pay_channel_id}`;
// 标记是否是第一个支付方式 // 如果是第一个支付方式,默认选中
let isFirstMethod = true; if(isFirstMethod) {
radioInput.checked = true;
listItem.classList.add('selected');
isFirstMethod = false;
}
const label = document.createElement('label');
label.htmlFor = `method-${method.pay_channel_id}`;
label.textContent = method.pay_name;
if (method.icon_url) {
const icon = document.createElement('img');
icon.src = method.icon_url;
icon.style.height = '24px';
icon.style.marginRight = '10px';
label.prepend(icon);
}
listItem.appendChild(radioInput);
listItem.appendChild(label);
paymentList.appendChild(listItem);
// 点击整个区域也可以选择
listItem.addEventListener('click', () => {
// 移除所有选中样式
document.querySelectorAll('.payment-option').forEach(item => {
item.classList.remove('selected');
});
// 添加当前选中样式
listItem.classList.add('selected');
radioInput.checked = true;
});
});
paymentMethods.forEach((method) => { // 添加提交按钮
const listItem = document.createElement("li"); const submitButton = document.createElement('button');
listItem.className = "payment-option"; submitButton.type = 'button';
submitButton.textContent = '立即支付';
const radioInput = document.createElement("input"); submitButton.onclick = function () {
radioInput.type = "radio"; const no = getQueryParam('no');
radioInput.name = "paymentMethod"; const selectedMethod = document.querySelector('input[name="paymentMethod"]:checked');
radioInput.value = method.pay_channel_id; if (selectedMethod) {
radioInput.id = `method-${method.pay_channel_id}`; window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${selectedMethod.value}&no=${no}`;
} else {
// 如果是第一个支付方式,默认选中 alert('请选择支付方式');
if (isFirstMethod) { }
radioInput.checked = true; };
listItem.classList.add("selected");
isFirstMethod = false; const buttonContainer = document.createElement('div');
buttonContainer.style.textAlign = 'center';
buttonContainer.appendChild(submitButton);
paymentList.appendChild(buttonContainer);
} }
const label = document.createElement("label"); // 页面加载时执行
label.htmlFor = `method-${method.pay_channel_id}`; // 监听页面可见性变化
label.textContent = method.pay_name; document.addEventListener('visibilitychange', function() {
if (!document.hidden && localStorage.getItem('auto-redirect') == 2) {
if (method.icon_url) { // 页面从后台返回且处于支付状态
const icon = document.createElement("img"); fetchPaymentMethods();
icon.src = method.icon_url; }
icon.style.height = "24px";
icon.style.marginRight = "10px";
label.prepend(icon);
}
listItem.appendChild(radioInput);
listItem.appendChild(label);
paymentList.appendChild(listItem);
// 点击整个区域也可以选择
listItem.addEventListener("click", () => {
// 移除所有选中样式
document.querySelectorAll(".payment-option").forEach((item) => {
item.classList.remove("selected");
});
// 添加当前选中样式
listItem.classList.add("selected");
radioInput.checked = true;
}); });
});
// 添加提交按钮 window.onload = function() {
const submitButton = document.createElement("button"); if (localStorage.getItem('auto-redirect') && localStorage.getItem('auto-redirect') == 2) {
submitButton.type = "button"; handlePaymentCallback(); // 如果是支付回调且不是自动跳转,处理支付结果
submitButton.textContent = "立即支付"; } else {
localStorage.setItem('auto-redirect', 1); // 设置自动跳转标记
fetchPaymentMethods(); // 获取支付方式
}
};
submitButton.onclick = function () { </script>
const no = getQueryParam("no");
const selectedMethod = document.querySelector(
'input[name="paymentMethod"]:checked'
);
if (selectedMethod) {
window.location.href = `/pay/front/api/v1/payPage/submit?pay_channel_id=${selectedMethod.value}&no=${no}`;
} else {
alert("请选择支付方式");
}
};
const buttonContainer = document.createElement("div"); {{ else}}
buttonContainer.style.textAlign = "center";
buttonContainer.appendChild(submitButton);
paymentList.appendChild(buttonContainer);
}
// 监听页面可见性变化 <body>
document.addEventListener("visibilitychange", function () { <div class="payment-info" style="text-align: center;">
if (!document.hidden && localStorage.getItem("auto-redirect") == 2) { <h2 style="color: #ff0000;">支付异常</h2>
// 按回退键返回,重新获取支付方式 <p>{{.message}}</p>
fetchPaymentMethods(); <button onclick="window.location.href='/'">返回</button>
}
});
// 页面加载时执行
window.onload = function () {
// alert(`return:${getQueryParam("return")}`);
if (getQueryParam("return")) {
// alert("处理支付回调");
handlePaymentCallback(); // 如果是支付回调且不是自动跳转,处理支付结果
} else {
localStorage.setItem("auto-redirect", 1); // 设置自动跳转标记
fetchPaymentMethods(); // 获取支付方式
}
};
</script>
{{ else}}
<body>
<div class="payment-info" style="text-align: center">
<h2 style="color: #ff0000">支付异常</h2>
<p>{{.message}}</p>
</div> </div>
</body> </body>
{{end}} {{end}}
</html>
{{end}} </html>
{{end}}