From 413a57e2524cb0b839d5d83d961de3b59814eb6e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 24 Oct 2025 16:53:11 +0800
Subject: [PATCH] feat(ai): 实现产品依赖解锁功能 - 在AiMemberAnswerServiceImpl中注入AiProductDependencyService和AiMemberProductUnlockService - 修改insure方法，根据答题分数解锁符合条件的产品 - 新增selectListByProductIds和insertList方法到AiMemberProductUnlockService - 实现产品依赖关系查询方法selectListByProductId到AiProductDependencyService- 在AiProductServiceImpl中增加产品状态判断逻辑，支持锁定和解锁状态显示 - 添加memberId字段到ApiProductPageDto用于查询用户已解锁产品 - 在ApiProductVo中新增state字段表示产品锁定/解锁状态
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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 92c616c..6b54e39 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -243,7 +243,7 @@
febs.alert.warn('请选择待发货的订单');
return;
}
- febs.get(ctx + 'admin/order/confirmOrder?orderIds='+ids, null, function () {
+ febs.get(ctx + 'admin/order/confirmLeaderOrder?orderIds='+ids, null, function () {
febs.alert.success('操作成功');
$query.click();
});
@@ -354,11 +354,11 @@
return;
}
window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&orderIds="+ids;
- febs.get(ctx + 'admin/order/deliverOrder?&orderIds='+ids, null, function () {
- febs.alert.success('操作成功');
- $query.click();
-
- });
+ // febs.get(ctx + 'admin/order/deliverOrder?&orderIds='+ids, null, function () {
+ // febs.alert.success('操作成功');
+ // $query.click();
+ //
+ // });
}
if (event == 'exportDeliverTwo') {
@@ -504,11 +504,16 @@
{field: 'memberName', title: '购买人', minWidth: 100,align:'left'},
{field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
{field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
- {field: 'goodsName', 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},
- {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
+ {field: 'deliveryType', title: '提货方式',
+ templet: function (d) {
+ if (d.deliveryType === 1) {
+ return '<span style="color:blue;">自提</span>'
+ } else if (d.deliveryType === 2) {
+ return '<span style="color:green;">快递</span>'
+ }else{
+ return ''
+ }
+ }, minWidth: 100,align:'center'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -529,6 +534,12 @@
return ''
}
}, minWidth: 80,align:'center'},
+ {field: 'goodsName', 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},
+ {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
+
// {field: 'deliveryState', title: '配送状态',
// templet: function (d) {
// if (d.deliveryState === 1) {
--
Gitblit v1.9.1