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 | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 2216d97..6b54e39 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -506,19 +506,14 @@
{field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'deliveryType', title: '提货方式',
templet: function (d) {
- if (d.status === 1) {
+ if (d.deliveryType === 1) {
return '<span style="color:blue;">自提</span>'
- } else if (d.status === 2) {
+ } else if (d.deliveryType === 2) {
return '<span style="color:green;">快递</span>'
}else{
return ''
}
}, minWidth: 100,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: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -539,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