From 9dfd9506d0743a22d404046ffe7cda6081404a8a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 30 Jun 2026 17:09:36 +0800
Subject: [PATCH] feat(order): 添加XT支付功能和确认收款功能
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index c8c8b7c..93c8c58 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -125,8 +125,8 @@
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="printSelect">自定义打印</button>
<button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="goodsStatistics">统计商品份数</button>
<!-- <button id="printSelect" type="button" class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain">自定义打印</button>-->
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverTwo">导出未发货订单（快递）</button>
- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" lay-event="exportDeliverTwo">导出未发货订单（快递）</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-primary febs-button-blue-plain" id="importDeliver" lay-event="importDeliver">导入发货</button>-->
</div>
</script>
<!-- 表格操作栏 end -->
@@ -357,6 +357,11 @@
cancelOrder(data.id);
});
}
+ if (layEvent === 'insurePay') {
+ febs.modal.confirm('收款', '确认收款？', function () {
+ insurePay(data.id);
+ });
+ }
if (layEvent === 'deliverPdfGoods') {
febs.modal.confirm('一键发货', '确认一键发货？', function (index) {
layer.close(index);
@@ -396,6 +401,13 @@
function cancelOrder(id) {
febs.get(ctx + 'admin/order/cancelOrder/' + id, null, function () {
+ febs.alert.success('操作成功');
+ $query.click();
+ });
+ }
+
+ function insurePay(id) {
+ febs.get(ctx + 'admin/order/insurePay/' + id, null, function () {
febs.alert.success('操作成功');
$query.click();
});
@@ -638,9 +650,9 @@
{field: 'orderNo', title: '订单编号', minWidth: 200,align:'left' ,totalRowText:"合计"},
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
- {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
+ // {field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
- {field: 'remark', title: '备注', minWidth: 160,align:'left'},
+ // {field: 'remark', title: '备注', minWidth: 160,align:'left'},
{field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
{field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
{field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
@@ -677,15 +689,20 @@
// return ''
// }
// }, minWidth: 80,align:'center'},
- {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
+ // {field: 'payMethod', title: '支付方式', minWidth: 100,align:'left'},
{field: 'payTime', title: '支付时间', minWidth: 120,align:'left'},
// {field: 'wxOrderNo', title: '支付订单号', minWidth: 120,align:'left'},
{title: '操作',
templet: function (d) {
- if(d.status === 2){
- return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverPdfGoods" shiro:hasPermission="user:update">一键发货</button>'
+ if(d.status === 1){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="insurePay" shiro:hasPermission="user:update">确认收款</button>'
+ }else if(d.status === 2){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
- // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
+ // +''
+ // return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverPdfGoods" shiro:hasPermission="user:update">一键发货</button>'
+ // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+ // // +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="deliverGoods" shiro:hasPermission="user:update">发货</button>'
}else if(d.status === 3){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="seeOrder" shiro:hasPermission="user:update">详情</button>'
+'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancelDeliver" shiro:hasPermission="user:update">取消发货</button>'
--
Gitblit v1.9.1