root/allLikeMall
1
0
Fork 1
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: root:e406f885d9f9fd0286f6f14eb671345a832f8fd6
Branches Tags
root:master
root:yhy
root:khy-three
root:LCQ
root:main-zjh
root:khy-two
root:hokin
root:hy
root:sjy-three
root:Branch_chensl
root:sjy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy
..
compare: root:566cf302c4278a03e06fcd6f62260cb17f7c55da
Branches Tags
root:yhy
root:khy-three
root:master
root:LCQ
root:main-zjh
root:khy-two
root:hokin
root:hy
root:sjy-three
root:Branch_chensl
root:sjy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy

12 Commits
e406f885d9 ... 566cf302c4

Author SHA1 Message Date
khy
566cf302c4 会员支付优化(现金支付) 2024-10-29 18:29:55 +08:00
root
232976d532 Merge pull request '提交遗漏文件' (#92) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/92
 2024-10-29 13:16:08 +08:00
sonjinyon
547448fc44 提交遗漏文件 2024-10-29 13:13:55 +08:00
root
f2297720fc Merge pull request '会员支付优化' (#91) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/91
 2024-10-29 11:53:15 +08:00
root
f7f702673b Merge pull request '客服话术和素材图片添加分类' (#90) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/90
 2024-10-29 11:30:45 +08:00
sonjinyon
1a0cfaac2b 优化客服话术和图片素材界面 2024-10-29 11:29:11 +08:00
sonjinyon
c6c4dd7693 Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two 2024-10-29 11:01:31 +08:00
sonjinyon
1ca6b87037 客服话术和素材图片添加分类 2024-10-29 10:59:39 +08:00
root
e68b6ed573 Merge pull request '添加客服话术分类，图片素材分类' (#88) from sjy-two into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/88
 2024-10-28 11:34:10 +08:00
root
eadb727812 Merge pull request '会员记录支付状态' (#89) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/89
 2024-10-28 11:14:16 +08:00
sonjinyon
ccbdf82114 添加客服话术分类，图片素材分类 2024-10-28 10:36:25 +08:00
root
5235fae53c Merge pull request 'khy1' (#87) from khy1 into master
All checks were successful
continuous-integration/drone/push Build is passing
Details 
Reviewed-on: http://101.43.112.107:3000/root/allLikeMall/pulls/87
 2024-10-28 10:29:06 +08:00
42 changed files with 1520 additions and 526 deletions
Show Stats Expand all files Collapse all files

7
yudao-admin-vue3/src/api/infra/file/index.ts
View File

@ -6,6 +6,7 @@ export interface FilePageReqVO extends PageParam {
createTime?: Date[]
}
// 文件预签名地址 Response VO
export interface FilePresignedUrlRespVO {
// 文件配置编号
@ -43,3 +44,9 @@ export const createFile = (data: any) => {
export const updateFile = (data: any) => {
return request.upload({ url: '/infra/file/upload', data })
}
export const updatePicType = (id: number , picType: number) => {
return request.get({ url: '/infra/file/updatePicType?id=' + id + `&picType=` + picType })
}

4
yudao-admin-vue3/src/api/mall/promotion/verbaltrick/index.ts
View File

@ -41,7 +41,7 @@ export const VerbalTrickApi = {
},
// 查询客服话术
getVerbalTrickList: async () => {
return await request.get({ url: `/promotion/verbal-trick/getVerbalTrickList` })
getVerbalTrickList: async (id: string) => {
return await request.get({ url: `/promotion/verbal-trick/getVerbalTrickList?id=` +id })
}
}

30
yudao-admin-vue3/src/api/system/dict/dict.data.ts
View File

@ -47,3 +47,33 @@ export const deleteDictData = (id: number) => {
export const exportDictData = (params) => {
return request.download({ url: '/system/dict-data/export', params })
}
// 图片素材管理分类
export const getTypeList = () => {
return request.get({ url: '/system/dict-data/getTypeList' })
}
// 客服话术分类
export const getHuaShuTypeList = () => {
return request.get({ url: '/system/dict-data/getHuaShuTypeList' })
}
// 新增字典数据，客服话术分类
export const createType = (data: DictDataVO) => {
return request.post({ url: '/system/dict-data/createType', data })
}
// 新增字典数据，素材管理图片分类
export const createPicType = (data: DictDataVO) => {
return request.post({ url: '/system/dict-data/createPicType', data })
}
// 新增字典数据，素材管理图片分类
export const updateMenu = (id : number, name : string) => {
return request.get({ url: '/system/dict-data/updateMenu?id='+ id + `&name=` + name })
}
// 删除字典数据
export const deleteMenu = (id: number | undefined) => {
return request.delete({ url: '/system/dict-data/deleteMenu?id=' + id })
}

2
yudao-admin-vue3/src/utils/dict.ts
View File

@ -124,6 +124,8 @@ export enum DICT_TYPE {
TECHNICIAN_STATUS = 'technician_status',
SEX = 'sex',
INFRA_FILE_TYPE = 'infra_file_type',
//预约：项目
SUBSCRIBE_PROJECT_STATUS = 'subscribe_project_status',

535
yudao-admin-vue3/src/views/infra/file/index.vue
View File

@ -1,189 +1,376 @@
<template>
<doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" />
<!-- 搜索 -->
<ContentWrap>
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="文件路径" prop="path">
<el-input
v-model="queryParams.path"
placeholder="请输入文件路径"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="文件类型" prop="type" width="80">
<el-input
v-model="queryParams.type"
placeholder="请输入文件类型"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button type="primary" plain @click="openForm">
<Icon icon="ep:upload" class="mr-5px" /> 上传文件
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<doc-alert title="上传下载" url="https://doc.iocoder.cn/file/" />
<div class="flex-container">
<!-- 菜单区域 -->
<div class="menu-area">
<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;">
<Icon icon="ep:plus" class="mr-5px" /> 新增分类
</el-button>
<el-menu :default-active="targetMenuId" style="width:182px">
<el-menu-item :index="targetMenuId" :key="targetMenuId" @click="clickMenu(targetMenuId)">
全部类型
</el-menu-item>
<el-menu-item v-for="item in typeMenu" :index="item.value" :key="item.value"
@click="clickMenu(item.value)">
{{ item.label }}
<el-icon style="margin-left: 60px;width: 10px;" @mouseover="showActions = item.value"
@mouseleave="showActions = null">
<MoreFilled />
<div v-if="showActions === item.value" class="action-buttons">
<el-button size="small" @click.stop="editItem(item.id,item.label)">编辑</el-button>
<br />
<el-button size="small" @click.stop="deleteItem(item.id)">删除</el-button>
</div>
</el-icon>
</el-menu-item>
</el-menu>
</div>
<!-- 内容区域 -->
<div class="content-wrap">
<ContentWrap>
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<!-- <el-form-item label="文件路径" prop="path">
<el-input
v-model="queryParams.path"
placeholder="请输入文件路径"
clearable
@keyup.enter="handleQuery"
/>
</el-form-item> -->
<el-form-item label="文件类型" prop="type" width="80">
<el-input v-model="queryParams.type" placeholder="请输入文件类型" clearable
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss"
type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" />
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
<el-button type="primary" plain @click="openForm">
<Icon icon="ep:upload" class="mr-5px" /> 上传文件
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column label="文件内容" align="center" prop="url" width="110px">
<template #default="{ row }">
<el-image v-if="row.type.includes('image')" class="h-80px w-80px" lazy :src="row.url"
:preview-src-list="[row.url]" preview-teleported fit="cover" />
<el-link v-else-if="row.type.includes('pdf')" type="primary" :href="row.url"
:underline="false" target="_blank">预览</el-link>
<el-link v-else type="primary" download :href="row.url" :underline="false"
target="_blank">下载</el-link>
</template>
</el-table-column>
<el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
<!-- <el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" /> -->
<el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
<!-- <el-table-column label="文件大小" align="center" prop="size" width="120"
:formatter="fileSizeFormatter" /> -->
<!-- <el-table-column label="文件类型" align="center" prop="type" width="180px" />
<el-table-column label="图片分类" align="center" prop="picType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_FILE_TYPE" :value="scope.row.picType" />
</template>
</el-table-column> -->
<el-table-column label="上传时间" align="center" prop="createTime" width="180"
:formatter="dateFormatter" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary"
@click="updateForm('update', scope.row.id , scope.row.picType)">
更改类型
</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"
v-hasPermi="['infra:file:delete']">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</ContentWrap>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</div>
</div>
<!-- 表单弹窗：添加/修改 -->
<FileForm ref="formRef" @success="getList" />
<UpdateForm ref="forRef" @success="getList" />
<Dialog v-model="dialogVisibles" :title="dialogTitles">
<el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
<el-form-item label="数据标签" prop="label">
<el-input v-model="formData.label" placeholder="请输入数据标签" />
</el-form-item>
<el-form-item label="显示排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" controls-position="right" />
</el-form-item>
</el-form>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="dialogVisibles = false">取 消</el-button>
</template>
</Dialog>
<Dialog v-model="dialogVisible" :title="dialogTitle">
<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
<el-form-item label="数据标签" prop="label">
<el-input v-model="updateLabel" placeholder="请输入数据标签" />
</el-form-item>
</el-form>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForms">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list">
<el-table-column label="文件名" align="center" prop="name" :show-overflow-tooltip="true" />
<el-table-column label="文件路径" align="center" prop="path" :show-overflow-tooltip="true" />
<el-table-column label="URL" align="center" prop="url" :show-overflow-tooltip="true" />
<el-table-column
label="文件大小"
align="center"
prop="size"
width="120"
:formatter="fileSizeFormatter"
/>
<el-table-column label="文件类型" align="center" prop="type" width="180px" />
<el-table-column label="文件内容" align="center" prop="url" width="110px">
<template #default="{ row }">
<el-image
v-if="row.type.includes('image')"
class="h-80px w-80px"
lazy
:src="row.url"
:preview-src-list="[row.url]"
preview-teleported
fit="cover"
/>
<el-link
v-else-if="row.type.includes('pdf')"
type="primary"
:href="row.url"
:underline="false"
target="_blank"
>预览</el-link
>
<el-link v-else type="primary" download :href="row.url" :underline="false" target="_blank"
>下载</el-link
>
</template>
</el-table-column>
<el-table-column
label="上传时间"
align="center"
prop="createTime"
width="180"
:formatter="dateFormatter"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['infra:file:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
<FileForm ref="formRef" @success="getList" />
</template>
<script lang="ts" setup>
import { fileSizeFormatter } from '@/utils'
import { dateFormatter } from '@/utils/formatTime'
import * as FileApi from '@/api/infra/file'
import FileForm from './FileForm.vue'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { fileSizeFormatter } from '@/utils'
import { Search, MoreFilled } from '@element-plus/icons-vue';
import { dateFormatter } from '@/utils/formatTime'
// import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import * as FileApi from '@/api/infra/file'
import FileForm from './FileForm.vue'
import UpdateForm from './updateForm.vue'
import * as DictDataApi from '@/api/system/dict/dict.data'
const typeMenu = ref<DictDataApi.DictDataVO[]>([]) //
const targetMenuId = ref('0')
defineOptions({ name: 'InfraFile' })
const showActions = ref(null);
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const dialogVisibles = ref(false) // 弹窗的是否展示
const dialogTitles = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formData = ref({
id: undefined,
sort: undefined,
label: '',
value: '',
dictType: '',
// status: CommonStatusEnum.ENABLE,
colorType: '',
cssClass: '',
remark: ''
})
const formRules = reactive({
label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
})
const updateLabel = ref('')
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
defineOptions({ name: 'InfraFile' })
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的
const menuId = ref()
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
type: undefined,
picType: '',
path: undefined,
createTime: [],
})
const queryFormRef = ref() // 搜索的表单
const loading = ref(true) // 列表的加载中
const total = ref(0) // 列表的总页数
const list = ref([]) // 列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
name: undefined,
type: undefined,
path: undefined,
createTime: []
})
const queryFormRef = ref() // 搜索的表单
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await FileApi.getFilePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await FileApi.getFilePage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
//新增分类
const createType = () => {
dialogVisibles.value = true
dialogTitles.value = '新增分类'
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加分类菜单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
// 提交请求
formLoading.value = true
try {
const data = formData.value as DictDataApi.DictDataVO
await DictDataApi.createPicType(data)
message.success(t('common.createSuccess'))
dialogVisibles.value = false
// 发送操作成功的事件
emit('success')
getTypeList()
/** 添加/修改操作 */
const formRef = ref()
const openForm = () => {
formRef.value.open()
}
} finally {
formLoading.value = false
}
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await FileApi.deleteFile(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
}
//修改分类菜单
const submitForms = async () => {
// 校验表单
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
// 提交请求
formLoading.value = true
try {
/** 初始化 **/
onMounted(() => {
getList()
})
await DictDataApi.updateMenu(menuId.value, updateLabel.value)
message.success(t('common.createSuccess'))
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
getTypeList()
} finally {
formLoading.value = false
}
}
//分类菜单修改按钮
const editItem = (id : number | undefined, lable : string) => {
dialogVisible.value = true
dialogTitle.value = '菜单编辑'
menuId.value = id
updateLabel.value = lable
// 处理编辑事件
console.log('编辑:',);
};
//分类菜单删除按钮
const deleteItem = async (id : number | undefined) => {
// 处理删除事件
// 删除的二次确认
await message.delConfirm()
await DictDataApi.deleteMenu(id)
message.success(t('common.delSuccess'))
getTypeList()
};
//图片素材管理分类菜单
const getTypeList = async () => {
const data = await DictDataApi.getTypeList()
typeMenu.value = data
console.log('1111111111', typeMenu)
}
/** */
const clickMenu = (id : string) => {
queryParams.picType = id
queryParams.pageNo = 1
getList()
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
const formRef = ref()
const openForm = () => {
formRef.value.open()
}
const forRef = ref()
/** 修改操作 */
const updateForm = (type : string, id : number, picType : number) => {
forRef.value.open(type, id, picType)
}
/** 删除按钮操作 */
const handleDelete = async (id : number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await FileApi.deleteFile(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch { }
}
/** 初始化 **/
onMounted(() => {
queryParams.picType = targetMenuId.value
getTypeList()
getList()
})
</script>
<style scoped>
.flex-container {
height: 100vh;
/* 使容器填满视口高度 */
display: flex;
}
.menu-area {
padding: 25px;
background-color: white;
width: 180px;
height: 1000px;
/* 固定高度 */
overflow-y: hidden;
/* 禁止滚动 */
border-right: 1px solid #e0e0e0;
/* 可选：添加分隔线 */
}
.content-wrap {
flex-grow: 1;
/* 使内容区域占据剩余空间 */
overflow-y: auto;
/* 允许内容区域滚动 */
}
</style>

134
yudao-admin-vue3/src/views/infra/file/updateForm.vue Normal file
View File

@ -0,0 +1,134 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="forRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<!-- <el-form-item label="配置编号" prop="configId">
<el-input v-model="formData.configId" placeholder="请输入配置编号" />
</el-form-item> -->
<el-form-item label="图片类型" prop="picType">
<el-select v-model="picType" placeholder="请选择图片类型">
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_FILE_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="文件名" prop="name">
<el-input v-model="formData.name" placeholder="请输入文件名" />
</el-form-item>
<el-form-item label="文件路径" prop="path">
<el-input v-model="formData.path" placeholder="请输入文件路径" />
</el-form-item>
<el-form-item label="文件 URL" prop="url">
<el-input v-model="formData.url" placeholder="请输入文件 URL" />
</el-form-item>
<el-form-item label="文件类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择文件类型">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="文件大小" prop="size">
<el-input v-model="formData.size" placeholder="请输入文件大小" />
</el-form-item> -->
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import * as FileApi from '@/api/infra/file'
import { number } from 'echarts';
import { NumberFormat } from 'vue-i18n';
/** 文件 表单 */
defineOptions({ name: 'FileForm' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息弹窗
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined,
configId: undefined,
picType: undefined,
name: undefined,
path: undefined,
url: undefined,
type: undefined,
size: undefined
})
const id = ref(0)
const picType = ref(0)
const formRules = reactive({
path: [{ required: true, message: '文件路径不能为空', trigger: 'blur' }],
url: [{ required: true, message: '文件 URL不能为空', trigger: 'blur' }],
size: [{ required: true, message: '文件大小不能为空', trigger: 'blur' }]
})
const forRef = ref() // 表单 Ref
/** 打开弹窗 */
const open = async (type: string, ids: number, picTypes: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
id.value = 0
picType.value = 0
// 修改时，设置数据
if (id) {
formLoading.value = true
id.value = ids
picType.value = picTypes
console.log('11111',ids)
console.log('2222',picType.value)
formLoading.value = false
}
}
defineExpose({ open }) // 提供 open 方法，用于打开弹窗
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
await forRef.value.validate()
// 提交请求
formLoading.value = true
try {
await FileApi.updatePicType(id.value,picType.value)
message.success(t('common.updateSuccess'))
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
configId: undefined,
picType: undefined,
name: undefined,
path: undefined,
url: undefined,
type: undefined,
size: undefined
}
forRef.value?.resetFields()
}
</script>

33
yudao-admin-vue3/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
View File

@ -118,8 +118,10 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
<div style="display: flex; width: 100%; height: 400px;">
<!-- 左边占 30% -->
<div style="flex: 0 0 20%; background-color: #f0f0f0; padding: 10px;">
左边的内容
<div style="flex: 0 0 20%; padding: 10px;">
<el-menu :default-active="targetMenuId">
<el-menu-item v-for="item in huashuType" :index="item.value" :key="item.value" @click="clickMenu(item.value)">{{item.label}}</el-menu-item>
</el-menu>
</div>
<!-- 右边占 70% -->
<div style="flex: 1; padding: 5px; overflow-y: auto; max-height: 400px;">
@ -156,7 +158,11 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
import { getStaffToken, setStaffToken} from '@/utils/auth'
import type { DropdownInstance } from 'element-plus'
import { ref } from 'vue'
import * as DictDataApi from '@/api/system/dict/dict.data'
const huashuType = ref<DictDataApi.DictDataVO[]>([]) //
const targetMenuId = ref('0')
dayjs.extend(relativeTime)
defineOptions({ name: 'KeFuMessageList' })
@ -175,6 +181,7 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
import { KeFuConversationApi} from '@/api/mall/promotion/kefu/conversation'
import { number } from 'vue-types'
const onlineStaffList = ref<SupportStaffVO[]>([]) // 在线客服列表的数据
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
@ -285,10 +292,16 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
/*点击话术库*/
const huashu = async () => {
dialogVisible.value = true;
getVerbalTrickList(targetMenuId.value)
}
const getVerbalTrickList = async () => {
const response = await VerbalTrickApi.getVerbalTrickList();
//话术分类菜单
const getHuaShuTypeList = async () => {
const data = await DictDataApi.getHuaShuTypeList()
huashuType.value = data
}
//话术内容
const getVerbalTrickList = async (id: string) => {
const response = await VerbalTrickApi.getVerbalTrickList(id);
verbalTrickList.value = response; // 将数据部分赋值给 verbalTrickList
}
@ -298,6 +311,11 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
message.value = content;
dialogVisible.value = false;
}
const clickMenu = (id: string) => {
console.log('1111111111',id)
getVerbalTrickList(id)
}
/** 发送文本消息 */
const handleSendMessage = async () => {
@ -416,7 +434,8 @@ v-show="showNewMessageTip" class="newMessageTip flex items-center cursor-pointer
}
/** 初始化 **/
onMounted(() => {
getVerbalTrickList()
getHuaShuTypeList()
getVerbalTrickList(targetMenuId.value)
})
</script>

475
yudao-admin-vue3/src/views/mall/promotion/verbaltrick/index.vue
View File

@ -1,211 +1,298 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="分类" prop="type">
<el-select
v-model="queryParams.type"
placeholder="请选择分类"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.KEFU_VERBAL_TRICK_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入标题"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['promotion:verbal-trick:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['promotion:verbal-trick:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="分类" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.KEFU_VERBAL_TRICK_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="详情" align="center" prop="details" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['promotion:verbal-trick:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['promotion:verbal-trick:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<div class="flex-container">
<!-- 菜单区域 -->
<div class="menu-area">
<el-button type="primary" plain @click="createType" style="width: 90;font-size: 12px;">
<Icon icon="ep:plus" class="mr-5px" /> 新增分类
</el-button>
<el-menu :default-active="targetMenuId" style="width:183px">
<el-menu-item v-for="item in huashuType" :index="item.value" :key="item.value"
@click="clickMenu(item.value)">{{item.label}}</el-menu-item>
</el-menu>
</div>
<!-- 内容区域 -->
<div class="content-wrap">
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<!-- <el-form-item label="分类" prop="type">
<el-select v-model="queryParams.type" placeholder="请选择分类" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.KEFU_VERBAL_TRICK_TYPE)"
:key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item> -->
<el-form-item label="标题" prop="title">
<el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="创建时间" prop="createTime">
<el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss"
type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
</el-form-item>
<el-form-item>
<el-button @click="handleQuery">
<Icon icon="ep:search" class="mr-5px" /> 搜索
</el-button>
<el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置
</el-button>
<el-button type="primary" plain @click="openForm('create')"
v-hasPermi="['promotion:verbal-trick:create']">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button type="success" plain @click="handleExport" :loading="exportLoading"
v-hasPermi="['promotion:verbal-trick:export']">
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="分类" align="center" prop="type">
<template #default="scope">
<dict-tag :type="DICT_TYPE.KEFU_VERBAL_TRICK_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="详情" align="center" prop="details" />
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter"
width="180px" />
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button link type="primary" @click="openForm('update', scope.row.id)"
v-hasPermi="['promotion:verbal-trick:update']">
编辑
</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"
v-hasPermi="['promotion:verbal-trick:delete']">
删除
</el-button>
</template>
</el-table-column>
</el-table>
</ContentWrap>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</div>
</div>
<!-- 表单弹窗：添加/修改 -->
<VerbalTrickForm ref="formRef" @success="getList" />
<Dialog v-model="dialogVisible" :title="dialogTitle">
<el-form ref="formRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="80px">
<el-form-item label="数据标签" prop="label">
<el-input v-model="formData.label" placeholder="请输入数据标签" />
</el-form-item>
<el-form-item label="显示排序" prop="sort">
<el-input-number v-model="formData.sort" :min="0" controls-position="right" />
</el-form-item>
</el-form>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="dialogVisible = false">取 消</el-button>
</template>
</Dialog>
<!-- 表单弹窗：添加/修改 -->
<VerbalTrickForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { VerbalTrickApi, VerbalTrickVO } from '@/api/mall/promotion/verbaltrick'
import VerbalTrickForm from './VerbalTrickForm.vue'
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { VerbalTrickApi, VerbalTrickVO } from '@/api/mall/promotion/verbaltrick'
import VerbalTrickForm from './VerbalTrickForm.vue'
import * as DictDataApi from '@/api/system/dict/dict.data'
const huashuType = ref<DictDataApi.DictDataVO[]>([]) //
const targetMenuId = ref('0')
/** 客服话术 列表 */
defineOptions({ name: 'VerbalTrick' })
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('新增分类') // 弹窗的标题
const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
const formData = ref({
id: undefined,
sort: undefined,
label: '',
value: '',
dictType: '',
// status: CommonStatusEnum.ENABLE,
colorType: '',
cssClass: '',
remark: ''
})
const formRules = reactive({
label: [{ required: true, message: '数据标签不能为空', trigger: 'blur' }],
sort: [{ required: true, message: '数据顺序不能为空', trigger: 'blur' }],
})
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
/** 客服话术 列表 */
defineOptions({ name: 'VerbalTrick' })
const loading = ref(true) // 列表的加载中
const list = ref<VerbalTrickVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
type: undefined,
title: undefined,
details: undefined,
createTime: []
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await VerbalTrickApi.getVerbalTrickPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
const loading = ref(true) // 列表的加载中
const list = ref<VerbalTrickVO[]>([]) // 列表的数据
const total = ref(0) // 列表的总页数
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
type: '',
title: undefined,
details: undefined,
createTime: []
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await VerbalTrickApi.getVerbalTrickPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
//新增分类
const createType = () => {
dialogVisible.value = true
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 提交表单 */
const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
const submitForm = async () => {
// 校验表单
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
// 提交请求
formLoading.value = true
try {
const data = formData.value as DictDataApi.DictDataVO
await DictDataApi.createType(data)
message.success(t('common.createSuccess'))
dialogVisible.value = false
// 发送操作成功的事件
emit('success')
queryParams.type = targetMenuId.value
getList()
getHuaShuTypeList()
} finally {
formLoading.value = false
}
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await VerbalTrickApi.deleteVerbalTrick(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await VerbalTrickApi.exportVerbalTrick(queryParams)
download.excel(data, '客服话术.xls')
} catch {
} finally {
exportLoading.value = false
}
}
const clickMenu = (id : string) => {
console.log('1111111111', id)
queryParams.type = id
getList()
}
/** 初始化 **/
onMounted(() => {
getList()
})
//话术分类菜单
const getHuaShuTypeList = async () => {
const data = await DictDataApi.getHuaShuTypeList()
huashuType.value = data
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type : string, id ?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id : number) => {
try {
// 删除的二次确认
await message.delConfirm()
// 发起删除
await VerbalTrickApi.deleteVerbalTrick(id)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch { }
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
// 导出的二次确认
await message.exportConfirm()
// 发起导出
exportLoading.value = true
const data = await VerbalTrickApi.exportVerbalTrick(queryParams)
download.excel(data, '客服话术.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
queryParams.type = targetMenuId.value
getList()
getHuaShuTypeList()
})
</script>
<style scoped>
.flex-container {
height: 100vh;
/* 使容器填满视口高度 */
display: flex;
}
.menu-area {
padding: 25px;
background-color: white;
width: 180px;
height: 1000px;
/* 固定高度 */
overflow-y: hidden;
/* 禁止滚动 */
border-right: 1px solid #e0e0e0;
/* 可选：添加分隔线 */
}
.content-wrap {
flex-grow: 1;
/* 使内容区域占据剩余空间 */
overflow-y: auto;
/* 允许内容区域滚动 */
}
</style>

19
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
View File

@ -9,6 +9,8 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.*;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.service.file.FileService;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -25,6 +27,9 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.module.infra.framework.file.core.utils.FileTypeUtils.writeAttachment;
@ -38,6 +43,7 @@ public class FileController {
@Resource
private FileService fileService;
@PostMapping("/upload")
@Operation(summary = "上传文件", description = "模式一：后端上传文件")
public CommonResult<String> uploadFile(FileUploadReqVO uploadReqVO) throws Exception {
@ -96,8 +102,21 @@ public class FileController {
@Operation(summary = "获得文件分页")
@PreAuthorize("@ss.hasPermission('infra:file:query')")
public CommonResult<PageResult<FileRespVO>> getFilePage(@Valid FilePageReqVO pageVO) {
if (pageVO.getPicType() == 0){
pageVO.setPicType(null);
}
PageResult<FileDO> pageResult = fileService.getFilePage(pageVO);
return success(BeanUtils.toBean(pageResult, FileRespVO.class));
}
@GetMapping("/updatePicType")
public CommonResult<Long> updatePicType(Integer id,Integer picType){
return success(fileService.updatePicType(id,picType));
}
}

3
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java
View File

@ -28,6 +28,9 @@ public class FileCreateReqVO {
@Schema(description = "文件 MIME 类型", example = "application/octet-stream")
private String type;
@Schema(description = "图片类型")
private Integer picType;
@Schema(description = "文件大小", example = "2048", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer size;

5
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java
View File

@ -23,6 +23,11 @@ public class FilePageReqVO extends PageParam {
@Schema(description = "文件类型，模糊匹配", example = "jpg")
private String type;
@Schema(description = "图片类型", example = "jpg")
private Integer picType;
@Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

3
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java
View File

@ -27,6 +27,9 @@ public class FileRespVO {
@Schema(description = "文件MIME类型", example = "application/octet-stream")
private String type;
@Schema(description = "图片类型")
private Integer picType;
@Schema(description = "文件大小", example = "2048", requiredMode = Schema.RequiredMode.REQUIRED)
private Integer size;

2
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java
View File

@ -47,6 +47,8 @@ public class FileDO extends BaseDO {
* 文件的 MIME 类型，例如 "application/octet-stream"
*/
private String type;
private Integer picType;
/**
* 文件大小
*/

1
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java
View File

@ -18,6 +18,7 @@ public interface FileMapper extends BaseMapperX<FileDO> {
default PageResult<FileDO> selectPage(FilePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<FileDO>()
.likeIfPresent(FileDO::getPath, reqVO.getPath())
.eqIfPresent(FileDO::getPicType, reqVO.getPicType())
.likeIfPresent(FileDO::getType, reqVO.getType())
.betweenIfPresent(FileDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(FileDO::getId));

4
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
View File

@ -63,4 +63,8 @@ public interface FileService {
*/
FilePresignedUrlRespVO getFilePresignedUrl(String path) throws Exception;
Long updatePicType(Integer id,Integer picType);
boolean deleteMenu(Long id);
}

25
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
View File

@ -13,11 +13,14 @@ import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePageReqVO
import cn.iocoder.yudao.module.infra.controller.admin.file.vo.file.FilePresignedUrlRespVO;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileDO;
import cn.iocoder.yudao.module.infra.dal.mysql.file.FileMapper;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import lombok.SneakyThrows;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS;
@ -35,6 +38,9 @@ public class FileServiceImpl implements FileService {
@Resource
private FileMapper fileMapper;
@Resource
private DictDataApi dictDataApi;
@Override
public PageResult<FileDO> getFilePage(FilePageReqVO pageReqVO) {
return fileMapper.selectPage(pageReqVO);
@ -114,4 +120,23 @@ public class FileServiceImpl implements FileService {
object -> object.setConfigId(fileClient.getId()));
}
@Override
public Long updatePicType(Integer id, Integer picType) {
FileDO fileDO = fileMapper.selectOne("id", id);
if (picType != null){
fileDO.setPicType(picType);
}
return (long)fileMapper.updateById(fileDO);
}
@Override
public boolean deleteMenu(Long id) {
List<FileDO> pic_type = fileMapper.selectList("pic_type", id);
if (pic_type.isEmpty()){
dictDataApi.deleteMenu(id);
return true;
}
return false;
}
}

5
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/verbaltrick/VerbalTrickController.java
View File

@ -101,9 +101,8 @@ public class VerbalTrickController {
@GetMapping("/getVerbalTrickList")
@Operation(summary = "获得客服话术数据")
@PreAuthorize("@ss.hasPermission('promotion:verbal-trick:query')")
public CommonResult<List<VerbalTrickDO>> getVerbalTrickList() {
List<VerbalTrickDO> result = verbalTrickService.getVerbalTrickList();
public CommonResult<List<VerbalTrickDO>> getVerbalTrickList(String id) {
List<VerbalTrickDO> result = verbalTrickService.getVerbalTrickList(id);
return success(result);
}

2
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickService.java
View File

@ -56,6 +56,6 @@ public interface VerbalTrickService {
* 获取话术数据
* @return
*/
List<VerbalTrickDO> getVerbalTrickList();
List<VerbalTrickDO> getVerbalTrickList(String id);
}

5
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickServiceImpl.java
View File

@ -72,8 +72,9 @@ public class VerbalTrickServiceImpl implements VerbalTrickService {
}
@Override
public List<VerbalTrickDO> getVerbalTrickList() {
return verbalTrickMapper.selectList();
public List<VerbalTrickDO> getVerbalTrickList(String id) {
return verbalTrickMapper.selectList("type",id);
}
}

55
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/type/TradePaidMemberCardTypeDO.java Normal file
View File

@ -0,0 +1,55 @@
package cn.iocoder.yudao.module.trade.dal.dataobject.type;
import cn.iocoder.yudao.framework.tenant.core.db.TenantBaseDO;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.*;
import java.math.BigDecimal;
/**
* 会员卡类型 DO
*
* @author 芋道源码
*/
@TableName("paid_member_card_type")
@KeySequence("paid_member_card_type_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TradePaidMemberCardTypeDO extends TenantBaseDO {
/**
* id
*/
@TableId
private Long id;
/**
* 会员名
*/
private String name;
/**
* 有效期
*/
private String vid;
/**
* 原价
*/
private BigDecimal originalPrice;
/**
* 优惠价
*/
private BigDecimal specialPrice;
/**
* 排序
*/
private String sort;
/**
* 是否禁用
*/
private Boolean status;
}

32
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/type/TradePaidMemberCardTypeMapper.java Normal file
View File

@ -0,0 +1,32 @@
package cn.iocoder.yudao.module.trade.dal.mysql.type;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.trade.dal.dataobject.type.TradePaidMemberCardTypeDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 会员卡类型 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface TradePaidMemberCardTypeMapper extends BaseMapperX<TradePaidMemberCardTypeDO> {
default List<TradePaidMemberCardTypeDO> selectListByStatus(Integer status){
return selectList(TradePaidMemberCardTypeDO::getStatus, status);
}
default List<TradePaidMemberCardTypeDO> selectListByIsActivate(Integer status){
return selectList(new LambdaQueryWrapperX<TradePaidMemberCardTypeDO>()
.eqIfPresent(TradePaidMemberCardTypeDO::getStatus,status)
.neIfPresent(TradePaidMemberCardTypeDO::getName,"试用")
.orderByAsc(TradePaidMemberCardTypeDO::getId));
}
}

6
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradePaidMemberUserService.java
View File

@ -14,7 +14,7 @@ public interface TradePaidMemberUserService {
LocalDateTime getDeadLineDay(String cardName);
LocalDateTime getDeadLineDay(String cardName,Long userId);
TradePaidMemberUserDO getPaidMemberUserByOrderNo(String orderNO);
@ -34,4 +34,8 @@ public interface TradePaidMemberUserService {
TradePaidMemberUserDO getByPayOrderId(Long payOrderId);
/*
* 现金支付后更新会员记录状态
* */
void updateStatus(TradePaidMemberUserDO tradePaidMemberUserDO,String channelCode);
}

151
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradePaidMemberUserServiceImpl.java Normal file
View File

@ -0,0 +1,151 @@
package cn.iocoder.yudao.module.trade.service.member;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.trade.dal.dataobject.member.TradeMemberUserDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.member.TradePaidMemberUserDO;
import cn.iocoder.yudao.module.trade.dal.dataobject.type.TradePaidMemberCardTypeDO;
import cn.iocoder.yudao.module.trade.dal.mysql.member.TradePaidMemberUserMapper;
import cn.iocoder.yudao.module.trade.service.type.TradePaidMemberCardTypeService;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.PAID_MEMBER_ORDER_NOT_EXISTS;
/**
* 会员 Service 实现类
*
* @author 管理员
*/
@Service
@Validated
public class TradePaidMemberUserServiceImpl implements TradePaidMemberUserService {
@Resource
private TradePaidMemberUserMapper tradePaidMemberUserMapper;
@Resource
private TradeMemberUserService tradeMemberUserService;
@Resource
private TradePaidMemberCardTypeService tradePaidMemberCardTypeService;
private void validateMemberUserExists(Long id) {
if (tradePaidMemberUserMapper.selectById(id) == null) {
throw exception(PAID_MEMBER_ORDER_NOT_EXISTS);
}
}
//获取会员类型对应的过期时间
@Override
public LocalDateTime getDeadLineDay(String cardName,Long userId) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime deadlineDay;
TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(userId);
//判断是否为会员，是否需要续期
if(tradeMemberUserDO.getActivate() !=1
&& tradeMemberUserDO.getActivate() != 2
&& tradeMemberUserDO.getActivate() != 3){
deadlineDay = getDay(cardName,now);
}
else {
List<TradePaidMemberUserDO> list = tradePaidMemberUserMapper.selectList(new LambdaQueryWrapperX<TradePaidMemberUserDO>()
.eqIfPresent(TradePaidMemberUserDO::getUid, userId)
.isNotNull(TradePaidMemberUserDO::getCardExpirationTime)
.orderByDesc(TradePaidMemberUserDO::getId));
now = CollUtil.getFirst(list).getCardExpirationTime();
deadlineDay = getDay(cardName,now);
}
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(FORMAT_YEAR_MONTH_DAY);
String dayStr = deadlineDay.format(formatter);
LocalDate expireDate = LocalDate.parse(dayStr,formatter);
deadlineDay = expireDate.atStartOfDay();
return deadlineDay;
}
public LocalDateTime getDay(String cardName,LocalDateTime dateTime) {
LocalDateTime deadlineDay;
TradePaidMemberCardTypeDO paidMemberCardTypeDO = tradePaidMemberCardTypeService.selectByName(cardName);
if (cardName.equals("试用")){
deadlineDay = dateTime.plus(Long.parseLong(paidMemberCardTypeDO.getVid()), ChronoUnit.DAYS);
} else if (cardName.equals("月卡")) {
deadlineDay = dateTime.plus(1,ChronoUnit.MONTHS);
} else if (cardName.equals("季卡")) {
deadlineDay = dateTime.plus(3,ChronoUnit.MONTHS);
} else if (cardName.equals("年卡")) {
deadlineDay = dateTime.plus(1,ChronoUnit.YEARS);
} else {
//永久设置为一个非常远的的日期
deadlineDay = LocalDateTime.of(9999,12,31,23,59,59);
}
return deadlineDay;
}
@Override
public TradePaidMemberUserDO getPaidMemberUserByOrderNo(String orderNO) {
TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserMapper.selectOne(TradePaidMemberUserDO::getOrderNo,orderNO);
return tradePaidMemberUserDO;
}
@Override
public String currentPayType(String payChannel) {
String payType = null;
if (payChannel.equals("wallet")){
payType = "余额";
} else if(payChannel.startsWith("wx")){
payType = "微信";
} else if (payChannel.startsWith("alipay")) {
payType = "支付宝";
} else {
payType = "模拟支付";
}
return payType;
}
@Override
public void update(TradePaidMemberUserDO updateReqVO) {
// 校验存在
validateMemberUserExists(updateReqVO.getId());
tradePaidMemberUserMapper.updateById(updateReqVO);
}
@Override
public TradePaidMemberUserDO getByPayOrderId(Long payOrderId) {
TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserMapper.selectOne(
new LambdaQueryWrapperX<TradePaidMemberUserDO>().eqIfPresent(TradePaidMemberUserDO::getPayOrderId,payOrderId));
return tradePaidMemberUserDO;
}
@Override
public void updateStatus(TradePaidMemberUserDO tradePaidMemberUserDO,String channelCode) {
tradePaidMemberUserDO.setPayTime(LocalDateTime.now());
tradePaidMemberUserDO.setPaid(true);
//过期时间
LocalDateTime cardExpirationTime = getDeadLineDay(tradePaidMemberUserDO.getPayMemberType(),tradePaidMemberUserDO.getUid());
tradePaidMemberUserDO.setCardExpirationTime(cardExpirationTime);
tradePaidMemberUserDO.setPayChannel(channelCode);
//支付方式
String payType = currentPayType(channelCode);
tradePaidMemberUserDO.setPayType(payType);
//更新会员订单
update(tradePaidMemberUserDO);
System.out.println("成功更新会员订单paid："+tradePaidMemberUserDO);
//更新用户会员状态
tradeMemberUserService.updateActivate(tradePaidMemberUserDO.getPayMemberType(),tradePaidMemberUserDO.getUid());
}
}

94
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeTradePaidMemberUserServiceImpl.java
View File

@ -1,94 +0,0 @@
package cn.iocoder.yudao.module.trade.service.member;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.trade.dal.dataobject.member.TradePaidMemberUserDO;
import cn.iocoder.yudao.module.trade.dal.mysql.member.TradePaidMemberUserMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.PAID_MEMBER_ORDER_NOT_EXISTS;
/**
* 会员 Service 实现类
*
* @author 管理员
*/
@Service
@Validated
public class TradeTradePaidMemberUserServiceImpl implements TradePaidMemberUserService {
@Resource
private TradePaidMemberUserMapper tradePaidMemberUserMapper;
private void validateMemberUserExists(Long id) {
if (tradePaidMemberUserMapper.selectById(id) == null) {
throw exception(PAID_MEMBER_ORDER_NOT_EXISTS);
}
}
//获取会员类型对应的过期时间
@Override
public LocalDateTime getDeadLineDay(String cardName) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime deadlineDay;
//判断是否具有过期时间，该操作为续费
if (cardName.equals("试用")){
deadlineDay = now.plus(1, ChronoUnit.DAYS);
} else if (cardName.equals("月卡")) {
deadlineDay = now.plus(1,ChronoUnit.MONTHS);
} else if (cardName.equals("季卡")) {
deadlineDay = now.plus(3,ChronoUnit.MONTHS);
} else if (cardName.equals("年卡")) {
deadlineDay = now.plus(1,ChronoUnit.YEARS);
} else {
//永久设置为一个非常远的的日期
deadlineDay = LocalDateTime.of(9999,12,31,23,59,59);
}
return deadlineDay;
}
@Override
public TradePaidMemberUserDO getPaidMemberUserByOrderNo(String orderNO) {
TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserMapper.selectOne(TradePaidMemberUserDO::getOrderNo,orderNO);
return tradePaidMemberUserDO;
}
@Override
public String currentPayType(String payChannel) {
String payType = null;
if (payChannel.equals("wallet")){
payType = "余额";
} else if(payChannel.startsWith("wx")){
payType = "微信";
} else if (payChannel.startsWith("alipay")) {
payType = "支付宝";
} else {
payType = "模拟支付";
}
return payType;
}
@Override
public void update(TradePaidMemberUserDO updateReqVO) {
// 校验存在
validateMemberUserExists(updateReqVO.getId());
tradePaidMemberUserMapper.updateById(updateReqVO);
}
@Override
public TradePaidMemberUserDO getByPayOrderId(Long payOrderId) {
TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserMapper.selectOne(
new LambdaQueryWrapperX<TradePaidMemberUserDO>().eqIfPresent(TradePaidMemberUserDO::getPayOrderId,payOrderId));
return tradePaidMemberUserDO;
}
}

23
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
View File

@ -337,25 +337,14 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
PayOrderRespDTO payOrder = orderResult.getValue();
System.out.println("交易订单成功id："+id+"和payOrderId："+payOrderId);
//会员用户信息，支付状态修改
TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(order.getUserId());
TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserService.getByPayOrderId(payOrderId);
if(tradePaidMemberUserDO != null ){
System.out.println("进入会员支付修改操作paid："+tradePaidMemberUserDO+"和member："+tradeMemberUserDO);
tradePaidMemberUserDO.setPayTime(LocalDateTime.now());
tradePaidMemberUserDO.setPaid(true);
//过期时间
LocalDateTime cardExpirationTime = tradePaidMemberUserService.getDeadLineDay(tradePaidMemberUserDO.getPayMemberType());
tradePaidMemberUserDO.setCardExpirationTime(cardExpirationTime);
tradePaidMemberUserDO.setPayChannel(payOrder.getChannelCode());
//支付方式
String payType = tradePaidMemberUserService.currentPayType(payOrder.getChannelCode());
tradePaidMemberUserDO.setPayType(payType);
//更新会员订单
tradePaidMemberUserService.update(tradePaidMemberUserDO);
System.out.println("成功更新会员订单paid："+tradePaidMemberUserDO);
//更新用户会员状态
tradeMemberUserService.updateActivate(tradePaidMemberUserDO.getPayMemberType(),order.getUserId());
System.out.println("成功更新用户的会员状态member："+tradeMemberUserDO);
System.out.println("进入会员支付修改操作paid："+tradePaidMemberUserDO);
//更新会员状态
tradePaidMemberUserService.updateStatus(tradePaidMemberUserDO,order.getPayChannelCode());
//查询最新的用户信息
TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(order.getUserId());
System.out.println("成功更新用户的会员状态member："+ tradeMemberUserDO);
}
System.out.println("会员修改操作结束!!!");
// 2. 更新 TradeOrderDO 状态为已支付，等待发货

52
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/type/TradePaidMemberCardTypeService.java Normal file
View File

@ -0,0 +1,52 @@
package cn.iocoder.yudao.module.trade.service.type;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.trade.dal.dataobject.type.TradePaidMemberCardTypeDO;
import javax.validation.Valid;
import java.util.List;
/**
* 会员卡类型 Service 接口
*
* @author 芋道源码
*/
public interface TradePaidMemberCardTypeService {
/**
* 删除会员卡类型
*
* @param id 编号
*/
void deletecard(Long id);
/**
* 获得会员卡类型
*
* @param id 编号
* @return 会员卡类型
*/
TradePaidMemberCardTypeDO getcard(Long id);
/**
* 根据用户是否使用试用会员
* 查询会员类型列表
* @param activate
* @return
*/
List<TradePaidMemberCardTypeDO> getCardTypeList (Integer activate);
/**
* 根据会员卡名查询
*/
TradePaidMemberCardTypeDO selectByName(String cardName);
}

78
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/type/TradePaidMemberCardTypeServiceImpl.java Normal file
View File

@ -0,0 +1,78 @@
package cn.iocoder.yudao.module.trade.service.type;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.trade.dal.dataobject.type.TradePaidMemberCardTypeDO;
import cn.iocoder.yudao.module.trade.dal.mysql.type.TradePaidMemberCardTypeMapper;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.CARD_NOT_EXISTS;
/**
* 会员卡类型 Service 实现类
*
* @author 芋道源码
*/
@Service
@Validated
public class TradePaidMemberCardTypeServiceImpl implements TradePaidMemberCardTypeService {
@Resource
private TradePaidMemberCardTypeMapper cardMapper;
@Override
public void deletecard(Long id) {
// 校验存在
validatecardExists(id);
// 删除
cardMapper.deleteById(id);
}
private void validatecardExists(Long id) {
if (cardMapper.selectById(id) == null) {
throw exception(CARD_NOT_EXISTS);
}
}
@Override
public TradePaidMemberCardTypeDO getcard(Long id) {
return cardMapper.selectById(id);
}
@Override
public List<TradePaidMemberCardTypeDO> getCardTypeList(Integer activate) {
List<TradePaidMemberCardTypeDO> list = new ArrayList<>();
Integer status = 1;
if(activate == 0){
list = cardMapper.selectListByStatus(status);
}
else {
list = cardMapper.selectListByIsActivate(status);
}
return list;
}
@Override
public TradePaidMemberCardTypeDO selectByName(String cardName) {
TradePaidMemberCardTypeDO paidMemberCardTypeDO = cardMapper.selectOne(new LambdaQueryWrapperX<TradePaidMemberCardTypeDO>()
.eqIfPresent(TradePaidMemberCardTypeDO::getName,cardName));
validatecardExists(paidMemberCardTypeDO.getId());
return paidMemberCardTypeDO;
}
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
View File

@ -143,7 +143,7 @@ public class MemberUserDO extends TenantBaseDO {
private Long groupId;
/**
* 是否绑过卡,是否开通过会员(0：未开通,1：试用,2：有效期,3：永久)
* 是否绑过卡,是否开通过会员(0：未开通,1：试用,2：有效期,3：永久,4：过期)
*/
private Integer activate;

12
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/PaidMemberUserMapper.java
View File

@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.member.dal.dataobject.user.PaidMemberUserDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.member.controller.admin.user.vo.*;
import org.apache.ibatis.annotations.Select;
/**
* 会员 Mapper
@ -25,4 +26,15 @@ public interface PaidMemberUserMapper extends BaseMapperX<PaidMemberUserDO> {
.likeIfPresent(PaidMemberUserDO::getNickname,reqVO.getNickname())
.orderByDesc(PaidMemberUserDO::getId));
}
@Select("SELECT * FROM paid_member_user pmu " +
"INNER JOIN (" +
" SELECT uid, MAX(card_expiration_time) AS max_card_expiration_time " +
" FROM paid_member_user " +
" WHERE paid = TRUE " +
" GROUP BY uid" +
") latest " +
"ON pmu.uid = latest.uid AND pmu.card_expiration_time = latest.max_card_expiration_time " +
"WHERE pmu.paid = TRUE")
List<PaidMemberUserDO> selectLatestPaidMemberUsers();
}

26
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/user/PaidMemberUserExpireJob.java Normal file
View File

@ -0,0 +1,26 @@
package cn.iocoder.yudao.module.member.job.user;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
import cn.iocoder.yudao.module.member.service.user.PaidMemberUserService;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@Component
public class PaidMemberUserExpireJob implements JobHandler {
@Resource
private PaidMemberUserService paidMemberUserService;
@Override
@TenantJob
public String execute(String param) throws Exception {
int count = paidMemberUserService.expireMemberUser();
return StrUtil.format("会员过期{}个",count);
}
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
View File

@ -108,7 +108,7 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
}
MemberPointRecordDO memberPointRecordDO = new MemberPointRecordDO();
memberPointRecordDO.setAddUp(addUp);
memberPointRecordDO.setReduce(reduce);
memberPointRecordDO.setReduce(Math.abs(reduce));
return memberPointRecordDO;
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java
View File

@ -101,5 +101,5 @@ public interface PaidMemberUserService {
PaidMemberUserSaveReqVO createPaidMemberUserSaveReqVO(MemberUserDO memberUserDO, String cardName);
// int expireMemberUser();
int expireMemberUser();
}

36
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java
View File

@ -1,16 +1,10 @@
package cn.iocoder.yudao.module.member.service.user;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.iocoder.yudao.framework.common.util.date.DateUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.member.api.address.MemberAddressApi;
import cn.iocoder.yudao.module.member.api.address.dto.MemberAddressRespDTO;
import cn.iocoder.yudao.module.member.dal.dataobject.membercardtype.PaidMemberCardTypeDO;
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
import cn.iocoder.yudao.module.member.service.membercardtype.PaidMemberCardTypeService;
import cn.iocoder.yudao.module.pay.api.order.dto.PayOrderCreateReqDTO;
import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;
import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper;
import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
@ -121,7 +115,7 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
@Override
public int getPriceByTtype(Integer activate, String cardName) {
int price = 0;
if(activate == 0){
if(activate == 0 || activate == 4){
BigDecimal payprice = memberCardTypeService.selectByName(cardName).getOriginalPrice();
price = payprice.multiply(new BigDecimal("100")).intValue();
}
@ -137,7 +131,6 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
public LocalDateTime getDeadLineDay(String cardName,Long userId) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime deadlineDay;
PaidMemberCardTypeDO paidMemberCardTypeDO = memberCardTypeService.selectByName(cardName);
MemberUserDO memberUserDO = memberUserService.getUser(userId);
//判断是否为会员，是否需要续期
if(memberUserDO.getActivate() !=1
@ -281,12 +274,25 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
return paidMemberUserSaveReqVO;
}
// @Override
// public int expireMemberUser() {
// List<PaidMemberUserDO> list = paidMemberUserMapper.selectList
// (new LambdaQueryWrapperX<PaidMemberUserDO>().le(PaidMemberUserDO::getCardExpirationTime,LocalDateTime.now())
// .)
// return 0;
// }
@Override
public int expireMemberUser() {
//1.查询当前会员记录里最新的会员记录
List<PaidMemberUserDO> list = paidMemberUserMapper.selectLatestPaidMemberUsers();
if(CollUtil.isEmpty(list)){
return 0;
}
//2.遍历执行
int count = 0;
for (PaidMemberUserDO paidMemberUserDO : list){
MemberUserDO memberUserDO = memberUserService.getUser(paidMemberUserDO.getUid());
if(paidMemberUserDO.getCardExpirationTime().isBefore(LocalDateTime.now())
&& memberUserDO.getActivate() != 4){
memberUserDO.setActivate(4);
memberUserService.updateUserDo(memberUserDO);
count++;
}
}
return count;
}
}

35
yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/configuration/ConfigurationController.java
View File

@ -41,6 +41,29 @@ public class ConfigurationController {
@Resource
private ConfigurationService configurationService;
//根据项目预约天id查找预约套餐时间段
@GetMapping("/getConfiguration")
public CommonResult<List<ServiceTimeVO>> getConfiguration(Integer id) {
List<ServiceTimeVO> serviceTimeVOS = configurationService.getConfiguration(id);
return success(serviceTimeVOS);
}
//添加预约套餐时间段配置
@PostMapping("/addUpdConfiguration")
public CommonResult<Integer> addConfiguration(@RequestBody ConfigurationDO pageReqVO) {
Integer aLong = configurationService.addUpdConfiguration(pageReqVO);
return success(aLong);
}
@PostMapping("/create")
@Operation(summary = "创建预约配置")
@PreAuthorize("@ss.hasPermission('subscribe:configuration:create')")
@ -96,18 +119,6 @@ public class ConfigurationController {
}
//根据项目预约天id查找预约套餐时间段
@GetMapping("/getConfiguration")
public CommonResult<List<ServiceTimeVO>> getConfiguration(Integer id) {
List<ServiceTimeVO> serviceTimeVOS = configurationService.getConfiguration(id);
return success(serviceTimeVOS);
}
//添加预约套餐时间段配置
@PostMapping("/addUpdConfiguration")
public CommonResult<Integer> addConfiguration(@RequestBody ConfigurationDO pageReqVO) {
Integer aLong = configurationService.addUpdConfiguration(pageReqVO);
return success(aLong);
}
}

2
yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/configuration/ConfigurationServiceImpl.java
View File

@ -149,7 +149,7 @@ public class ConfigurationServiceImpl implements ConfigurationService {
for (int j = 0; j < serviceTimeVOS.size(); j++) {
ServiceTimeVO serviceTimeVO = serviceTimeVOS.get(j);
String serviceTime = serviceTimeVO.getStart() + " - " + serviceTimeVO.getEnd();
String serviceTime = serviceTimeVO.getStart() + " ~ " + serviceTimeVO.getEnd();
//判断时间段是否存在
/**

4
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
View File

@ -81,4 +81,8 @@ public interface DictDataApi {
Long createDictDataApi(DictDataSaveReqApiVO createReqVO);
int updateMenu(Integer id,String name);
void deleteMenu(Long id);
}

1
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java
View File

@ -10,6 +10,7 @@ import lombok.Data;
*/
@Data
public class DictDataRespDTO {
private Integer id;
/**
* 字典标签

12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
View File

@ -50,4 +50,16 @@ public class DictDataApiImpl implements DictDataApi {
return dictDataService.createDictDataApi(createReqVO);
}
@Override
public int updateMenu(Integer id, String name) {
int i = dictDataService.updateMenu(id, name);
return i;
}
@Override
public void deleteMenu(Long id) {
dictDataService.deleteDictData(id);
}
}

60
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
View File

@ -7,6 +7,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.system.api.dict.DictDataApi;
import cn.iocoder.yudao.module.system.api.dict.dto.DictDataRespDTO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataRespVO;
import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataSaveReqVO;
@ -38,6 +40,10 @@ public class DictDataController {
@Resource
private DictDataService dictDataService;
@Resource
public DictDataApi dictDataApi;
@PostMapping("/create")
@Operation(summary = "新增字典数据")
@PreAuthorize("@ss.hasPermission('system:dict:create')")
@ -101,4 +107,58 @@ public class DictDataController {
BeanUtils.toBean(list, DictDataRespVO.class));
}
/**
* 根据字典类型查询字典数据信息：图片素材管理分类
*/
@GetMapping(value = "/getTypeList")
public CommonResult<List<DictDataRespDTO>> getTypeList() {
List<DictDataRespDTO> dictDataList = dictDataApi.getDictDataList("infra_file_type");
return success(dictDataList);
}
/**
* 根据字典类型查询字典数据信息：客服素材分类
*/
@GetMapping(value = "/getHuaShuTypeList")
public CommonResult<List<DictDataRespDTO>> getHuaShuTypeList() {
List<DictDataRespDTO> dictDataList = dictDataApi.getDictDataList("kefu_verbal_trick_type");
return success(dictDataList);
}
//添加客服话术分类字典数据
@PostMapping("/createType")
public CommonResult<Long> createType( @RequestBody DictDataDO createReqVO) {
Long dictDataId = dictDataService.createType(createReqVO);
return success(dictDataId);
}
//添加客服话术分类字典数据
@PostMapping("/createPicType")
public CommonResult<Long> createPicType( @RequestBody DictDataDO createReqVO) {
Long dictDataId = dictDataService.createPicType(createReqVO);
return success(dictDataId);
}
/**
* 素材管理菜单编辑
*/
@GetMapping(value = "/updateMenu")
public CommonResult<Integer> updateMenu(Integer id,String name) {
int i = dictDataApi.updateMenu(id, name);
return success(i);
}
@DeleteMapping("/deleteMenu")
public CommonResult<Boolean> deleteMenu(Long id) {
dictDataService.deleteDictData(id);
return success(true);
}
}

7
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
View File

@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.system.controller.admin.dict.vo.data.DictDataPage
import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import java.util.Arrays;
import java.util.Collection;
@ -46,4 +47,10 @@ public interface DictDataMapper extends BaseMapperX<DictDataDO> {
.eqIfPresent(DictDataDO::getDictType, dictType));
}
@Select(" SELECT MAX(value) FROM system_dict_data where dict_type = 'kefu_verbal_trick_type' ")
int getMaxValue();
@Select(" SELECT MAX(value) FROM system_dict_data where dict_type = 'infra_file_type' ")
int getPicTypeMaxValue();
}

18
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
View File

@ -39,6 +39,8 @@ public interface DictDataService {
*/
void deleteDictData(Long id);
/**
* 获得字典数据列表
*
@ -109,4 +111,20 @@ public interface DictDataService {
List<DictDataDO> getDictDataListByDictType(String dictType);
Long createDictDataApi(DictDataSaveReqApiVO createReqVO);
/**
* 添加客服话术分类
* @param createReqVO
* @return
*/
Long createType(DictDataDO createReqVO);
/**
* 添加图片类型字典数据
* @param createReqVO
* @return
*/
Long createPicType(DictDataDO createReqVO);
int updateMenu(Integer id, String name);
}

42
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
View File

@ -99,6 +99,8 @@ public class DictDataServiceImpl implements DictDataService {
dictDataMapper.deleteById(id);
}
@Override
public long getDictDataCountByDictType(String dictType) {
return dictDataMapper.selectCountByDictType(dictType);
@ -190,4 +192,44 @@ public class DictDataServiceImpl implements DictDataService {
return dictData.getId();
}
@Override
public Long createType(DictDataDO createReqVO) {
List<DictDataDO> dictDataDOS = dictDataMapper.selectList("dict_type", "infra_file_type");
int maxValue = 0;
if (!dictDataDOS.isEmpty()){
maxValue = dictDataMapper.getMaxValue();
}
createReqVO.setValue( String.valueOf( maxValue + 1 ) );
createReqVO.setDictType("kefu_verbal_trick_type");
createReqVO.setStatus(0);
// 插入字典类型
dictDataMapper.insert(createReqVO);
return createReqVO.getId();
}
@Override
public Long createPicType(DictDataDO createReqVO) {
List<DictDataDO> dictDataDOS = dictDataMapper.selectList("dict_type", "infra_file_type");
int maxValue = 0;
if (!dictDataDOS.isEmpty()){
maxValue = dictDataMapper.getPicTypeMaxValue();
}
createReqVO.setValue( String.valueOf( maxValue + 1 ) );
createReqVO.setDictType("infra_file_type");
createReqVO.setStatus(0);
// 插入字典类型
dictDataMapper.insert(createReqVO);
return createReqVO.getId();
}
@Override
public int updateMenu(Integer id, String name) {
DictDataDO id1 = dictDataMapper.selectOne("id", id);
id1.setLabel(name);
return dictDataMapper.updateById(id1);
}
}