Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw

新增vue3构建脚本
Merge pull request '活动商品接口' (#94 ) from sjy-two into master
2024-10-30 11:12:42 +08:00 · 2024-10-30 11:12:27 +08:00 · 2024-10-29 18:39:55 +08:00 · 2024-10-29 18:36:11 +08:00 · 2024-10-29 18:34:46 +08:00 · 2024-10-29 18:29:55 +08:00
78 changed files with 2427 additions and 809 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -8,7 +8,28 @@ clone:
  disable: true
 steps: # 定义流水线执行步骤，这些步骤将顺序执行

-  - name: build-start
+  - name: build-copy-vue
+
+    image: appleboy/drone-ssh # SSH工具镜像
+
+    settings:
+
+      host: 101.43.112.107 # 远程连接地址
+
+      username: root # 远程连接账号
+
+      password:
+
+        from_secret: ssh_password
+
+      port: 22 # 远程连接端口
+      command_timeout: 20m # 远程执行命令超时时间
+
+      script:
+        - ssh root@47.118.40.3 "sh -c 'cd /build_project/allLikeMall/yudao-admin-vue3 && git pull origin master && /usr/bin/pnpm install && /usr/bin/pnpm run build:prod && zip -r dist-prod.zip dist-prod'"
+        - scp root@47.118.40.3:/build_project/allLikeMall/yudao-admin-vue3/dist-prod.zip /build_package/
+        - scp /build_package/dist-prod.zip root@1.14.205.126:/build_package/
+  - name: build-java-and-vue
 
    image: appleboy/drone-ssh # SSH工具镜像
 
@ -27,6 +48,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
      command_timeout: 30m # 远程执行命令超时时间
 
      script:
+        - echo "build-java......"
        - cd /root/allLikeMall
        - git fetch origin
        - git reset --hard origin/master
@ -35,4 +57,10 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
        - cd yudao-server
        - chmod +x all.sh
        - ./all.sh
+        - echo "build-vue......"
+        - cd /build_package
+        - rm -rf dist-prod
+        - unzip dist-prod.zip
+        - rm -rf /root/nginx/html/mall
+        - mv dist-prod /root/nginx/html/mall

--- a/yudao-admin-vue3/src/api/infra/file/index.ts
+++ b/yudao-admin-vue3/src/api/infra/file/index.ts
@ -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 })
+}
+
+
--- a/yudao-admin-vue3/src/api/mall/promotion/verbaltrick/index.ts
+++ b/yudao-admin-vue3/src/api/mall/promotion/verbaltrick/index.ts
@ -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 })
  }
 }
--- a/yudao-admin-vue3/src/api/member/memberagree/index.ts
+++ b/yudao-admin-vue3/src/api/member/memberagree/index.ts
@ -0,0 +1,21 @@
+import request from '@/config/axios'
+
+// 会员协议 VO
+export interface PaidMemberAgreeVO {
+  id: number // 编号
+  content: string // 内容
+}
+
+// 会员协议 API
+export const PaidMemberAgreeApi = {
+  // 查询会员协议
+  getPaidMemberAgree: async () => {
+    return await request.get({ url: `/member/paid-member-agree/get`})
+  },
+
+  
+  // 保存会员协议
+  savePaidMemberAgree: async (data: PaidMemberAgreeVO) => {
+    return await request.put({ url: `/member/paid-member-agree/save`, data })
+  }
+}
--- a/yudao-admin-vue3/src/api/system/dict/dict.data.ts
+++ b/yudao-admin-vue3/src/api/system/dict/dict.data.ts
@ -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 })
+}
--- a/yudao-admin-vue3/src/utils/dict.ts
+++ b/yudao-admin-vue3/src/utils/dict.ts
@ -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',
  
@ -219,6 +221,8 @@ export enum DICT_TYPE {

  PAID_MEMBER_USER_PAID = 'paid_member_user_paid', //付费会员支付状态

+  MEMBER_USER_PAID = 'member_user_paid', //会员支付状态
+
  MEMBER_USER_PAY_TYPE = 'member_user_pay_type',// 会员记录支付方式

  // ========== MALL - 商品模块 ==========
--- a/yudao-admin-vue3/src/views/infra/file/index.vue
+++ b/yudao-admin-vue3/src/views/infra/file/index.vue
@ -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>
--- a/yudao-admin-vue3/src/views/infra/file/updateForm.vue
+++ b/yudao-admin-vue3/src/views/infra/file/updateForm.vue
@ -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>
--- a/yudao-admin-vue3/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
+++ b/yudao-admin-vue3/src/views/mall/promotion/kefu/components/KeFuMessageList.vue
@ -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>

--- a/yudao-admin-vue3/src/views/mall/promotion/verbaltrick/index.vue
+++ b/yudao-admin-vue3/src/views/mall/promotion/verbaltrick/index.vue
@ -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>
--- a/yudao-admin-vue3/src/views/member/memberagree/index.vue
+++ b/yudao-admin-vue3/src/views/member/memberagree/index.vue
@ -0,0 +1,96 @@
+<template>
+   <ContentWrap>
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+
+      <el-tabs>
+        <el-tab-pane label="付费会员协议">
+          <el-form-item  prop="content">
+          <Editor v-model="formData.content" />
+          </el-form-item>
+        </el-tab-pane>
+      </el-tabs>
+
+  <div class="center-container">
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">保存</el-button>
+      </el-form-item>
+  </div>
+      
+    </el-form>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { PaidMemberAgreeApi, PaidMemberAgreeVO } from '@/api/member/memberagree'
+
+/** 会员协议 列表 */
+defineOptions({ name: 'PaidMemberAgree' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  id: undefined,
+  content: undefined
+})
+const formRef = ref() //表单 Ref
+
+const formRules = reactive({})
+/** 查询付费会员协议 */
+const getPaidMemberAgree = async () => {
+  try {
+    const data = await PaidMemberAgreeApi.getPaidMemberAgree()
+    if(data == null){
+      return
+    }
+    formData.value = data
+  } finally {
+  }
+}
+
+const onSubmit = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as PaidMemberAgreeVO
+    await PaidMemberAgreeApi.savePaidMemberAgree(data)
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+  } finally {
+    formLoading.value = false
+  }
+}
+
+
+/** 初始化 **/
+onMounted(() => {
+  getPaidMemberAgree()
+})
+
+
+</script>
+<style scoped>  
+.center-container {  
+  display: flex;  
+  justify-content: center; /* 水平居中 */  
+  /* 如果需要垂直居中，并且父容器允许，可以尝试添加以下行（但通常不是必需的）*/  
+  /* align-items: center; */  
+  width: 100%; /* 或设置一个具体的宽度 */  
+  /* 可能需要添加其他样式来确保容器没有其他默认的 padding 或 margin */  
+  box-sizing: border-box;  
+}  
+</style>
--- a/yudao-admin-vue3/src/views/member/memberconfig/index.vue
+++ b/yudao-admin-vue3/src/views/member/memberconfig/index.vue
@ -102,7 +102,6 @@ watch(
    if (!newVal) {
      formData.value.paidMemberPrice = false; // 当 openPaidMember 变为 false 时，重置 paidMemberPriceStatus
    }
-    // 注意：这里不需要处理 newVal 为 true 的情况，因为表单项会根据 v-if 指令的条件渲染
  },
  { immediate: true } // 立即执行一次观察者回调，以确保初始状态正确
 );
--- a/yudao-admin-vue3/src/views/member/memberuser/PaidMemberUserForm.vue
+++ b/yudao-admin-vue3/src/views/member/memberuser/PaidMemberUserForm.vue
@ -1,195 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="手机号" prop="mobile">
-        <el-input v-model="formData.mobile" placeholder="请输入手机号" />
-      </el-form-item>
-      <el-form-item label="密码" prop="password">
-        <el-input v-model="formData.password" placeholder="请输入密码" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio label="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="注册 IP" prop="registerIp">
-        <el-input v-model="formData.registerIp" placeholder="请输入注册 IP" />
-      </el-form-item>
-      <el-form-item label="注册终端" prop="registerTerminal">
-        <el-input v-model="formData.registerTerminal" placeholder="请输入注册终端" />
-      </el-form-item>
-      <el-form-item label="最后登录IP" prop="loginIp">
-        <el-input v-model="formData.loginIp" placeholder="请输入最后登录IP" />
-      </el-form-item>
-      <el-form-item label="最后登录时间" prop="loginDate">
-        <el-date-picker
-          v-model="formData.loginDate"
-          type="date"
-          value-format="x"
-          placeholder="选择最后登录时间"
-        />
-      </el-form-item>
-      <el-form-item label="用户昵称" prop="nickname">
-        <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
-      </el-form-item>
-      <el-form-item label="头像" prop="avatar">
-        <el-input v-model="formData.avatar" placeholder="请输入头像" />
-      </el-form-item>
-      <el-form-item label="真实名字" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入真实名字" />
-      </el-form-item>
-      <el-form-item label="性别" prop="sex">
-        <el-radio-group v-model="formData.sex">
-          <el-radio label="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="出生日期" prop="birthday">
-        <el-date-picker
-          v-model="formData.birthday"
-          type="date"
-          value-format="x"
-          placeholder="选择出生日期"
-        />
-      </el-form-item>
-      <el-form-item label="所在地" prop="areaId">
-        <el-input v-model="formData.areaId" placeholder="请输入所在地" />
-      </el-form-item>
-      <el-form-item label="用户备注" prop="mark">
-        <el-input v-model="formData.mark" placeholder="请输入用户备注" />
-      </el-form-item>
-      <el-form-item label="积分" prop="point">
-        <el-input v-model="formData.point" placeholder="请输入积分" />
-      </el-form-item>
-      <el-form-item label="用户标签编号列表,以逗号分隔" prop="tagIds">
-        <el-input v-model="formData.tagIds" placeholder="请输入用户标签编号列表,以逗号分隔" />
-      </el-form-item>
-      <el-form-item label="等级编号" prop="levelId">
-        <el-input v-model="formData.levelId" placeholder="请输入等级编号" />
-      </el-form-item>
-      <el-form-item label="经验" prop="experience">
-        <el-input v-model="formData.experience" placeholder="请输入经验" />
-      </el-form-item>
-      <el-form-item label="用户分组编号" prop="groupId">
-        <el-input v-model="formData.groupId" 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 { PaidMemberUserApi, PaidMemberUserVO } from '@/api/member/memberuser'
-
-/** 付费会员 表单 */
-defineOptions({ name: 'PaidMemberUserForm' })
-
-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,
-  mobile: undefined,
-  password: undefined,
-  status: undefined,
-  registerIp: undefined,
-  registerTerminal: undefined,
-  loginIp: undefined,
-  loginDate: undefined,
-  nickname: undefined,
-  avatar: undefined,
-  name: undefined,
-  sex: undefined,
-  birthday: undefined,
-  areaId: undefined,
-  mark: undefined,
-  point: undefined,
-  tagIds: undefined,
-  levelId: undefined,
-  experience: undefined,
-  groupId: undefined,
-})
-const formRules = reactive({
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await PaidMemberUserApi.getPaidMemberUser(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as PaidMemberUserVO
-    if (formType.value === 'create') {
-      await PaidMemberUserApi.createPaidMemberUser(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await PaidMemberUserApi.updatePaidMemberUser(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    mobile: undefined,
-    password: undefined,
-    status: undefined,
-    registerIp: undefined,
-    registerTerminal: undefined,
-    loginIp: undefined,
-    loginDate: undefined,
-    nickname: undefined,
-    avatar: undefined,
-    name: undefined,
-    sex: undefined,
-    birthday: undefined,
-    areaId: undefined,
-    mark: undefined,
-    point: undefined,
-    tagIds: undefined,
-    levelId: undefined,
-    experience: undefined,
-    groupId: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>
--- a/yudao-admin-vue3/src/views/member/memberuser/index.vue
+++ b/yudao-admin-vue3/src/views/member/memberuser/index.vue
@ -9,13 +9,6 @@
      label-width="68px"
    >
      <el-form-item label="会员类型" prop="payMemberType">
-<!--        <el-input-->
-<!--          v-model="queryParams.payMemberType"-->
-<!--          placeholder="请输入用户会员类型"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
        <el-select v-model ="queryParams.payMemberType" placeholder="请选择会员类型" @keyup.enter="handleQuery" class="!w-240px">
          <el-option v-for ="item in cardlist"
                     :key="item.id"
@ -24,13 +17,6 @@
        </el-select>
      </el-form-item>
      <el-form-item label="支付方式" prop="payType">
-<!--        <el-input-->
-<!--          v-model="queryParams.payType"-->
-<!--          placeholder="请输入支付方式"-->
-<!--          clearable-->
-<!--          @keyup.enter="handleQuery"-->
-<!--          class="!w-240px"-->
-<!--        />-->
        <el-select v-model="queryParams.payType" class="!w-240px" clearable placeholder="请选择状态">
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.MEMBER_USER_PAY_TYPE)"
@ -40,6 +26,16 @@
          />
        </el-select>
      </el-form-item>
+      <el-form-item label="支付状态" prop="paid">
+        <el-select v-model="queryParams.paid" class="!w-240px" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.PAID_MEMBER_USER_PAID)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
      <el-form-item label="支付时间" prop="payTime">
        <el-date-picker
          v-model="queryParams.payTime"
@ -76,17 +72,17 @@
      <el-table-column label="会员类型" align="center" prop="payMemberType" />
      <el-table-column label="是否支付" align="center" prop="paid">
        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PAID_MEMBER_USER_PAID" :value="scope.row.paid"/>
+          <dict-tag :type="DICT_TYPE.MEMBER_USER_PAID" :value="scope.row.paid"/>
        </template>
      </el-table-column>
      <el-table-column label="有效期限(天)" align="center" prop="deadlineDay" />
-      <el-table-column label="支付金额(分)" align="center" prop="price" />
+      <el-table-column label="支付金额(元)" align="center" prop="price" :formatter="formPriceInYuan"/>
      <el-table-column label="支付方式" align="center" prop="payType" />
      <el-table-column
        label="购买时间"
        align="center"
        prop="payTime"
-        :formatter="dateFormatter"
+        :formatter="dateFormatter2"
        width="180px"
      />
    </el-table>
@ -99,17 +95,15 @@
    />
  </ContentWrap>

-  <!-- 表单弹窗：添加/修改 -->
-  <PaidMemberUserForm ref="formRef" @success="getList" />
 </template>

 <script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PaidMemberUserApi, PaidMemberUserVO } from '@/api/member/memberuser'
 import * as CardVoApid from '@/api/member/type'
-import PaidMemberUserForm from './PaidMemberUserForm.vue'
+import { column } from 'element-plus/es/components/table-v2/src/common'

 /** 付费会员 列表 */
 defineOptions({ name: 'PaidMemberUser' })
@ -163,6 +157,7 @@ const getList = async () => {
  loading.value = true
  try {
    const data = await PaidMemberUserApi.getPaidMemberUserPage(queryParams)
+    console.log("query：",queryParams)
    list.value = data.list
    total.value = data.total
  } finally {
@ -170,6 +165,10 @@ const getList = async () => {
  }
 }

+/** 将金额单位分转为元 */
+const formPriceInYuan = (row,column,cellValue) =>{
+  return (cellValue / 100).toFixed(2)
+}

 /** 搜索按钮操作 */
 const handleQuery = () => {
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
@ -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));
+    }
+
+
+
+
+
 }
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileCreateReqVO.java
@ -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;

--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java
@ -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;
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FileRespVO.java
@ -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;

--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/dataobject/file/FileDO.java
@ -47,6 +47,8 @@ public class FileDO extends BaseDO {
     * 文件的 MIME 类型，例如 "application/octet-stream"
     */
    private String type;
+
+    private Integer picType;
    /**
     * 文件大小
     */
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java
@ -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));
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
@ -63,4 +63,8 @@ public interface FileService {
     */
    FilePresignedUrlRespVO getFilePresignedUrl(String path) throws Exception;

+    Long updatePicType(Integer id,Integer picType);
+
+    boolean deleteMenu(Long id);
+
 }
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
@ -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;
+    }
+
 }
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
@ -201,4 +201,23 @@ public class AppProductSpuController {
        return pageResult;
    }
    // TODO 芋艿：商品的浏览记录；
-}
+
+
+    @GetMapping("/getActivityGoods")
+    public CommonResult<List<AppProductSpuRespVO>> getActivityGoods(String activityType) {
+        List<ProductSpuDO> list = productSpuService.getActivityGoods(activityType);
+        if (CollUtil.isEmpty(list)) {
+            return success(Collections.emptyList());
+        }
+
+        // 拼接返回
+        list.forEach(spu -> spu.setSalesCount(spu.getSalesCount() + spu.getVirtualSalesCount()));
+        List<AppProductSpuRespVO> voList = BeanUtils.toBean(list, AppProductSpuRespVO.class);
+        // 处理 vip 价格
+        MemberLevelRespDTO memberLevel = getMemberLevel();
+        voList.forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
+        return success(voList);
+    }
+
+
+}
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuService.java
@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuSaveReq
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateStatusReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuRecommendPageReqVo;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import org.springframework.scheduling.annotation.Async;

@ -138,4 +139,7 @@ public interface ProductSpuService {
     * @return
     */
    List<ProductSpuDO> getRecommendProductIdList(AppProductSpuRecommendPageReqVo pageVo);
+
+
+    List<ProductSpuDO> getActivityGoods(String activityType);
 }
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/spu/ProductSpuServiceImpl.java
@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuSaveReq
 import cn.iocoder.yudao.module.product.controller.admin.spu.vo.ProductSpuUpdateStatusReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageReqVO;
 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuRecommendPageReqVo;
+import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuRespVO;
 import cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO;
 import cn.iocoder.yudao.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.yudao.module.product.dal.mysql.spu.ProductSpuMapper;
@ -22,6 +23,7 @@ import cn.iocoder.yudao.module.product.enums.spu.ProductSpuStatusEnum;
 import cn.iocoder.yudao.module.product.service.brand.ProductBrandService;
 import cn.iocoder.yudao.module.product.service.category.ProductCategoryService;
 import cn.iocoder.yudao.module.product.service.sku.ProductSkuService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Maps;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@ -194,6 +196,8 @@ public class ProductSpuServiceImpl implements ProductSpuService {
        return productSpuMapper.selectList(wrapperX);
    }

+
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void deleteSpu(Long id) {
@ -308,4 +312,31 @@ public class ProductSpuServiceImpl implements ProductSpuService {
        return productSpuMapper.selectCount(ProductSpuDO::getCategoryId, categoryId);
    }

+
+    @Override
+    public List<ProductSpuDO> getActivityGoods(String activityType) {
+
+        String activity = "";
+        if (activityType.equals("recommendHot")){
+            activity = "recommend_hot";
+        }
+        if (activityType.equals("recommendBenefit")){
+             activity = "recommend_benefit";
+        }
+        if (activityType.equals("recommendBest")){
+             activity = "recommend_best";
+        }
+        if (activityType.equals("recommendNew")){
+             activity = "recommend_new";
+        }
+        if (activityType.equals("recommendGood")){
+             activity = "recommend_good";
+        }
+
+        QueryWrapper<ProductSpuDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(activity,1).eq("status",1);
+
+        return productSpuMapper.selectList(queryWrapper);
+    }
+
 }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/verbaltrick/VerbalTrickController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/verbaltrick/VerbalTrickController.java
@ -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);
    }

--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickService.java
@ -56,6 +56,6 @@ public interface VerbalTrickService {
     * 获取话术数据
     * @return
     */
-    List<VerbalTrickDO> getVerbalTrickList();
+    List<VerbalTrickDO> getVerbalTrickList(String id);

 }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/verbaltrick/VerbalTrickServiceImpl.java
@ -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);
    }

 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/type/TradePaidMemberCardTypeDO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/type/TradePaidMemberCardTypeDO.java
@ -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;
+}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
@ -72,6 +72,7 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                .eq(TradeOrderDO::getUserId, userId)
                .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
                .eqIfPresent(TradeOrderDO::getCommentStatus, reqVO.getCommentStatus())
+                .notLike(TradeOrderDO::getNo,"M")
                .orderByDesc(TradeOrderDO::getId)); // TODO 芋艿：未来不同的 status，不同的排序
    }

@ -79,7 +80,8 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
        return selectCount(new LambdaQueryWrapperX<TradeOrderDO>()
                .eq(TradeOrderDO::getUserId, userId)
                .eqIfPresent(TradeOrderDO::getStatus, status)
-                .eqIfPresent(TradeOrderDO::getCommentStatus, commentStatus));
+                .eqIfPresent(TradeOrderDO::getCommentStatus, commentStatus)
+                .notLike(TradeOrderDO::getNo,"M"));
    }

    default TradeOrderDO selectOrderByIdAndUserId(Long orderId, Long loginUserId) {
@ -132,10 +134,10 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
        return selectList(wrapperX);
    }

-    @Select(" SELECT a.status,d.label,a.create_time,a.pay_price,a.use_point,c.name,c.pic_url,b.count FROM trade_order a  " +
+    @Select(" SELECT a.id,a.status,d.label,a.create_time,a.pay_price,a.use_point,c.name,c.pic_url,b.count FROM trade_order a  " +
            " inner join trade_order_item b on a.id = b.order_id " +
            " inner join (SELECT sort, label, value, dict_type, css_class FROM system_dict_data WHERE dict_type = 'trade_order_status') d on d.sort = a.status "+
            " inner join product_spu c on b.spu_id = c.id " +
-            " where a.user_id = #{userId} and a.use_point > 0 order by a.create_time ASC ")
+            " where a.user_id = #{userId} and a.use_point > 0 order by a.create_time DESC ")
    List<AppPointOrderVO> getPointOrder(Long userId);
 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/type/TradePaidMemberCardTypeMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/type/TradePaidMemberCardTypeMapper.java
@ -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));
+    }
+
+
+
+}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeMemberUserService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeMemberUserService.java
@ -21,6 +21,6 @@ public interface TradeMemberUserService {

    void updateUserDo(TradeMemberUserDO user);

-    void updateActivate(String cardName);
+    void updateActivate(String cardName,Long userId);

 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeMemberUserServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeMemberUserServiceImpl.java
@ -93,8 +93,8 @@ public class TradeMemberUserServiceImpl implements TradeMemberUserService {
    }

    @Override
-    public void updateActivate(String cardName) {
-        TradeMemberUserDO tradeMemberUserDO = getUser(getLoginUserId());
+    public void updateActivate(String cardName,Long userId) {
+        TradeMemberUserDO tradeMemberUserDO = getUser(userId);
        //设置个人信息的会员状态，0：未开通，1试用，2有效期，3永久
        if(cardName.equals("永久")){
            tradeMemberUserDO.setActivate(3);
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradePaidMemberUserService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradePaidMemberUserService.java
@ -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);
 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradePaidMemberUserServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradePaidMemberUserServiceImpl.java
@ -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());
+    }
+
+
+}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeTradePaidMemberUserServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/member/TradeTradePaidMemberUserServiceImpl.java
@ -1,97 +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));
-        if (tradePaidMemberUserDO == null) {
-            throw exception(PAID_MEMBER_ORDER_NOT_EXISTS);
-        }
-        return tradePaidMemberUserDO;
-    }
-
-}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
@ -78,7 +78,6 @@ import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionU
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.minusTime;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.ORDER_NOT_FOUND;
@ -338,25 +337,14 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
        PayOrderRespDTO payOrder = orderResult.getValue();
        System.out.println("交易订单成功id："+id+"和payOrderId："+payOrderId);
        //会员用户信息，支付状态修改
-        TradeMemberUserDO tradeMemberUserDO = tradeMemberUserService.getUser(getLoginUserId());
        TradePaidMemberUserDO tradePaidMemberUserDO = tradePaidMemberUserService.getByPayOrderId(payOrderId);
-        if(tradePaidMemberUserDO != null && tradeMemberUserDO != 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());
-            System.out.println("成功更新用户的会员状态member："+tradeMemberUserDO);
+        if(tradePaidMemberUserDO != null ){
+            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 状态为已支付，等待发货
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/type/TradePaidMemberCardTypeService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/type/TradePaidMemberCardTypeService.java
@ -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);
+
+
+}
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/type/TradePaidMemberCardTypeServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/type/TradePaidMemberCardTypeServiceImpl.java
@ -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;
+    }
+
+
+
+}
--- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
+++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
@ -72,6 +72,7 @@ public interface ErrorCodeConstants {
    ErrorCode PAID_MEMBER_USER_NOT_OPEN = new ErrorCode(1_004_024_000, "会员未开通");
    ErrorCode PAID_MEMBER_USER_PASSED = new ErrorCode(1_004_025_000, "会员已过期");
    ErrorCode PAID_MEMBER_CONFIG_NOT_EXISTS = new ErrorCode(1_004_026_000, "付费会员配置不存在");
+    ErrorCode PAID_MEMBER_AGREE_NOT_EXISTS = new ErrorCode(1_004_027_000, "会员协议不存在");


 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/PaidMemberAgreeController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/PaidMemberAgreeController.java
@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.member.controller.admin.memberagree;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+
+import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
+import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import cn.iocoder.yudao.module.member.controller.admin.memberagree.vo.*;
+import cn.iocoder.yudao.module.member.dal.dataobject.memberagree.PaidMemberAgreeDO;
+import cn.iocoder.yudao.module.member.service.memberagree.PaidMemberAgreeService;
+
+@Tag(name = "管理后台 - 会员协议")
+@RestController
+@RequestMapping("/member/paid-member-agree")
+@Validated
+public class PaidMemberAgreeController {
+
+    @Resource
+    private PaidMemberAgreeService paidMemberAgreeService;
+
+
+    @PutMapping("/save")
+    @Operation(summary = "更新会员协议")
+    @PreAuthorize("@ss.hasPermission('member:paid-member-agree:update')")
+    public CommonResult<Boolean> savePaidMemberAgree(@Valid @RequestBody PaidMemberAgreeSaveReqVO updateReqVO) {
+        paidMemberAgreeService.saveAgree(updateReqVO);
+        return success(true);
+    }
+
+
+
+    @GetMapping("/get")
+    @Operation(summary = "获得会员协议")
+    @PreAuthorize("@ss.hasPermission('member:paid-member-agree:query')")
+    public CommonResult<PaidMemberAgreeRespVO> getPaidMemberAgree() {
+        PaidMemberAgreeDO paidMemberAgree = paidMemberAgreeService.getAgree();
+        return success(BeanUtils.toBean(paidMemberAgree, PaidMemberAgreeRespVO.class));
+    }
+
+
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/vo/PaidMemberAgreePageReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/vo/PaidMemberAgreePageReqVO.java
@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.member.controller.admin.memberagree.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 会员协议分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class PaidMemberAgreePageReqVO extends PageParam {
+
+    @Schema(description = "内容")
+    private String content;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/vo/PaidMemberAgreeRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/vo/PaidMemberAgreeRespVO.java
@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.member.controller.admin.memberagree.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 会员协议 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class PaidMemberAgreeRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "22863")
+    @ExcelProperty("编号")
+    private Integer id;
+
+    @Schema(description = "内容")
+    @ExcelProperty("内容")
+    private String content;
+
+    @Schema(description = "创建时间")
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/vo/PaidMemberAgreeSaveReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/memberagree/vo/PaidMemberAgreeSaveReqVO.java
@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.member.controller.admin.memberagree.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 会员协议新增/修改 Request VO")
+@Data
+public class PaidMemberAgreeSaveReqVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "22863")
+    private Integer id;
+
+    @Schema(description = "内容")
+    private String content;
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserPageReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserPageReqVO.java
@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;

+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

@Schema(description = "管理后台 - 付费会员分页 Request VO")
@ -85,6 +86,7 @@ public class PaidMemberUserPageReqVO extends PageParam {
    private LocalDateTime[] payTime;

    @Schema(description = "到期时间", example = "2024-11-22 09:30:05")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
    private LocalDateTime cardExpirationTime;


@ -109,4 +111,6 @@ public class PaidMemberUserPageReqVO extends PageParam {
    @Schema(description = "会员类型")
    private String payMemberType;

+    @Schema(description = "商户订单编号")
+    private String merchantOrderId;
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserRespVO.java
@ -102,7 +102,7 @@ public class PaidMemberUserRespVO {
    @Schema(description = "支付时间", example = "2024-11-22 09:30:05")
    private LocalDateTime payTime;

-    @Schema(description = "到期时间", example = "2024-11-22 09:30:05")
+    @Schema(description = "到期时间", example = "2024-11-22")
    private LocalDateTime cardExpirationTime;


@ -127,4 +127,7 @@ public class PaidMemberUserRespVO {
    @Schema(description = "会员类型")
    private String payMemberType;

+    @Schema(description = "商户订单编号")
+    private String merchantOrderId;
+
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserSaveReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/PaidMemberUserSaveReqVO.java
@ -7,6 +7,7 @@ import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;

+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

@Schema(description = "管理后台 - 会员新增/修改 Request VO")
@ -82,7 +83,8 @@ public class PaidMemberUserSaveReqVO {
    @Schema(description = "支付时间", example = "2024-11-22 09:30:05")
    private LocalDateTime payTime;

-    @Schema(description = "到期时间", example = "2024-11-22 09:30:05")
+    @Schema(description = "到期时间", example = "2024-11-22")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
    private LocalDateTime cardExpirationTime;


@ -106,4 +108,7 @@ public class PaidMemberUserSaveReqVO {

    @Schema(description = "会员类型", requiredMode = Schema.RequiredMode.REQUIRED)
    private String payMemberType;
+
+     @Schema(description = "商户订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String merchantOrderId;
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/memberagree/AppPaidMemberAgreeController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/memberagree/AppPaidMemberAgreeController.java
@ -0,0 +1,40 @@
+package cn.iocoder.yudao.module.member.controller.app.memberagree;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.framework.security.core.annotations.PreAuthenticated;
+import cn.iocoder.yudao.module.member.controller.admin.memberagree.vo.PaidMemberAgreeRespVO;
+import cn.iocoder.yudao.module.member.dal.dataobject.memberagree.PaidMemberAgreeDO;
+import cn.iocoder.yudao.module.member.service.memberagree.PaidMemberAgreeService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "用户 APP - 用户付费会员协议")
+@RestController
+@RequestMapping("/member/paid-member-agree")
+@Validated
+@Slf4j
+public class AppPaidMemberAgreeController {
+
+    @Resource
+    private PaidMemberAgreeService paidMemberAgreeService;
+
+    @GetMapping("/get")
+    @Operation(summary = "获得会员协议")
+    @PreAuthenticated
+    public CommonResult<PaidMemberAgreeRespVO> getPaidMemberAgree() {
+        PaidMemberAgreeDO paidMemberAgree = paidMemberAgreeService.getAgree();
+        return success(BeanUtils.toBean(paidMemberAgree, PaidMemberAgreeRespVO.class));
+    }
+}
+
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/point/AppMemberPointRecordController.java
@ -41,4 +41,15 @@ public class AppMemberPointRecordController {
        return success(BeanUtils.toBean(pageResult, AppMemberPointRecordRespVO.class));
    }

+
+
+    @GetMapping("/getPointInfo")
+    public CommonResult<MemberPointRecordDO> getPointInfo() {
+        MemberPointRecordDO pointInfo = pointRecordService.getPointInfo(getLoginUserId());
+        return success(pointInfo);
+    }
+
+
+
+
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/vo/AppMemberUserInfoRespVO.java
@ -6,7 +6,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;

-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;

@Schema(description = "用户 APP - 用户个人信息 Response VO")
@Data
@ -47,9 +49,9 @@ public class AppMemberUserInfoRespVO {
    @Schema(description = "会员名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "季卡")
    private String cardName;

-    @Schema(description = "会员名称", requiredMode = Schema.RequiredMode.REQUIRED)
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private String cardExpirationTime;
+    @Schema(description = "过期时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime cardExpirationTime;

    @Schema(description = "用户 App - 会员等级")
    @Data
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/memberagree/PaidMemberAgreeConvert.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/memberagree/PaidMemberAgreeConvert.java
@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.member.convert.memberagree;
+
+import cn.iocoder.yudao.module.member.controller.admin.memberagree.vo.PaidMemberAgreeSaveReqVO;
+import cn.iocoder.yudao.module.member.dal.dataobject.memberagree.PaidMemberAgreeDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * 付费会员协议 Convert
+ *
+ */
+@Mapper
+public interface PaidMemberAgreeConvert {
+
+    PaidMemberAgreeConvert INSTANCE = Mappers.getMapper(PaidMemberAgreeConvert.class);
+
+    PaidMemberAgreeDO convert(PaidMemberAgreeSaveReqVO bean);
+}
+
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberagree/PaidMemberAgreeDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/memberagree/PaidMemberAgreeDO.java
@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.member.dal.dataobject.memberagree;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 会员协议 DO
+ *
+ * @author 管理员
+ */
+@TableName("paid_member_agree")
+@KeySequence("paid_member_agree_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PaidMemberAgreeDO extends BaseDO {
+
+    /**
+     * 编号
+     */
+    @TableId
+    private Integer id;
+    /**
+     * 内容
+     */
+    private String content;
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointRecordDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/point/MemberPointRecordDO.java
@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.member.dal.dataobject.point;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.member.enums.point.MemberPointBizTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
@ -66,4 +67,13 @@ public class MemberPointRecordDO extends BaseDO {
     */
    private Integer totalPoint;

+
+    //总共获得的积分
+    @TableField(exist = false)
+    private Integer addUp;
+
+    //总共消费的积分
+    @TableField(exist = false)
+    private Integer reduce;
+
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/MemberUserDO.java
@ -143,7 +143,7 @@ public class MemberUserDO extends TenantBaseDO {
    private Long groupId;

    /**
-     * 是否绑过卡,是否开通过会员(0：未开通,1：试用,2：有效期,3：永久)
+     * 是否绑过卡,是否开通过会员(0：未开通,1：试用,2：有效期,3：永久,4：过期)
     */
    private Integer activate;

--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/PaidMemberUserDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/user/PaidMemberUserDO.java
@ -156,5 +156,12 @@ public class PaidMemberUserDO extends TenantBaseDO {
     */
    private String payMemberType;

+    /**
+     * 商户订单编号
+     *
+     * 例如说，内部系统 A 的订单号，需要保证每个 PayAppDO 唯一
+     */
+    private String merchantOrderId;
+

 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/memberagree/PaidMemberAgreeMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/memberagree/PaidMemberAgreeMapper.java
@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.member.dal.mysql.memberagree;
+
+import java.util.*;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.member.dal.dataobject.memberagree.PaidMemberAgreeDO;
+import org.apache.ibatis.annotations.Mapper;
+import cn.iocoder.yudao.module.member.controller.admin.memberagree.vo.*;
+
+/**
+ * 会员协议 Mapper
+ *
+ * @author 管理员
+ */
+@Mapper
+public interface PaidMemberAgreeMapper extends BaseMapperX<PaidMemberAgreeDO> {
+
+    default PageResult<PaidMemberAgreeDO> selectPage(PaidMemberAgreePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<PaidMemberAgreeDO>()
+                .eqIfPresent(PaidMemberAgreeDO::getContent, reqVO.getContent())
+                .betweenIfPresent(PaidMemberAgreeDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(PaidMemberAgreeDO::getId));
+    }
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/PaidMemberUserMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/user/PaidMemberUserMapper.java
@ -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();
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/user/PaidMemberUserExpireJob.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/job/user/PaidMemberUserExpireJob.java
@ -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);
+    }
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/memberagree/PaidMemberAgreeService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/memberagree/PaidMemberAgreeService.java
@ -0,0 +1,59 @@
+package cn.iocoder.yudao.module.member.service.memberagree;
+
+import java.util.*;
+import javax.validation.*;
+import cn.iocoder.yudao.module.member.controller.admin.memberagree.vo.*;
+import cn.iocoder.yudao.module.member.dal.dataobject.memberagree.PaidMemberAgreeDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+
+/**
+ * 会员协议 Service 接口
+ *
+ * @author 管理员
+ */
+public interface PaidMemberAgreeService {
+
+    /**
+     * 创建会员协议
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Integer createPaidMemberAgree(@Valid PaidMemberAgreeSaveReqVO createReqVO);
+
+    /**
+     * 更新会员协议
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updatePaidMemberAgree(@Valid PaidMemberAgreeSaveReqVO updateReqVO);
+
+    /**
+     * 删除会员协议
+     *
+     * @param id 编号
+     */
+    void deletePaidMemberAgree(Integer id);
+
+    /**
+     * 获得会员协议
+     *
+     * @param id 编号
+     * @return 会员协议
+     */
+    PaidMemberAgreeDO getPaidMemberAgree(Integer id);
+
+    /**
+     * 获得会员协议分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 会员协议分页
+     */
+    PageResult<PaidMemberAgreeDO> getPaidMemberAgreePage(PaidMemberAgreePageReqVO pageReqVO);
+
+    PaidMemberAgreeDO getAgree();
+
+    void saveAgree(@Valid PaidMemberAgreeSaveReqVO saveReqVO);
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/memberagree/PaidMemberAgreeServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/memberagree/PaidMemberAgreeServiceImpl.java
@ -0,0 +1,96 @@
+package cn.iocoder.yudao.module.member.service.memberagree;
+
+import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.member.convert.memberagree.PaidMemberAgreeConvert;
+import cn.iocoder.yudao.module.member.convert.memberconfig.PaidMemberConfigConvert;
+import cn.iocoder.yudao.module.member.dal.dataobject.memberconfig.PaidMemberConfigDO;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import cn.iocoder.yudao.module.member.controller.admin.memberagree.vo.*;
+import cn.iocoder.yudao.module.member.dal.dataobject.memberagree.PaidMemberAgreeDO;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import cn.iocoder.yudao.module.member.dal.mysql.memberagree.PaidMemberAgreeMapper;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
+
+/**
+ * 会员协议 Service 实现类
+ *
+ * @author 管理员
+ */
+@Service
+@Validated
+public class PaidMemberAgreeServiceImpl implements PaidMemberAgreeService {
+
+    @Resource
+    private PaidMemberAgreeMapper paidMemberAgreeMapper;
+
+    @Override
+    public Integer createPaidMemberAgree(PaidMemberAgreeSaveReqVO createReqVO) {
+        // 插入
+        PaidMemberAgreeDO paidMemberAgree = BeanUtils.toBean(createReqVO, PaidMemberAgreeDO.class);
+        paidMemberAgreeMapper.insert(paidMemberAgree);
+        // 返回
+        return paidMemberAgree.getId();
+    }
+
+    @Override
+    public void updatePaidMemberAgree(PaidMemberAgreeSaveReqVO updateReqVO) {
+        // 校验存在
+        validatePaidMemberAgreeExists(updateReqVO.getId());
+        // 更新
+        PaidMemberAgreeDO updateObj = BeanUtils.toBean(updateReqVO, PaidMemberAgreeDO.class);
+        paidMemberAgreeMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deletePaidMemberAgree(Integer id) {
+        // 校验存在
+        validatePaidMemberAgreeExists(id);
+        // 删除
+        paidMemberAgreeMapper.deleteById(id);
+    }
+
+    private void validatePaidMemberAgreeExists(Integer id) {
+        if (paidMemberAgreeMapper.selectById(id) == null) {
+            throw exception(PAID_MEMBER_AGREE_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public PaidMemberAgreeDO getPaidMemberAgree(Integer id) {
+        return paidMemberAgreeMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<PaidMemberAgreeDO> getPaidMemberAgreePage(PaidMemberAgreePageReqVO pageReqVO) {
+        return paidMemberAgreeMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public PaidMemberAgreeDO getAgree() {
+        List<PaidMemberAgreeDO> list = paidMemberAgreeMapper.selectList();
+        return CollectionUtils.getFirst(list);
+    }
+
+    @Override
+    public void saveAgree(PaidMemberAgreeSaveReqVO saveReqVO) {
+        //存在，则更新
+        PaidMemberAgreeDO paidMemberAgreeDO = getAgree();
+        if(paidMemberAgreeDO != null){
+            paidMemberAgreeMapper.updateById(PaidMemberAgreeConvert.INSTANCE.convert(saveReqVO).setId(paidMemberAgreeDO.getId()));
+            return;
+        }
+        //不存在，则进行插入
+        paidMemberAgreeMapper.insert(PaidMemberAgreeConvert.INSTANCE.convert(saveReqVO));
+    }
+
+}
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordService.java
@ -39,4 +39,6 @@ public interface MemberPointRecordService {
     * @param bizId   业务编号
     */
    void createPointRecord(Long userId, Integer point, MemberPointBizTypeEnum bizType, String bizId);
+
+    MemberPointRecordDO getPointInfo(Long userId);
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/point/MemberPointRecordServiceImpl.java
@ -92,4 +92,24 @@ public class MemberPointRecordServiceImpl implements MemberPointRecordService {
        memberPointRecordMapper.insert(record);
    }

+    @Override
+    public MemberPointRecordDO getPointInfo(Long userId) {
+        List<MemberPointRecordDO> memberPointRecordDOList = memberPointRecordMapper.selectList("user_id", userId);
+        Integer addUp = 0;
+        Integer reduce = 0;
+        for (int i = 0; i < memberPointRecordDOList.size(); i++) {
+            MemberPointRecordDO memberPointRecordDO = memberPointRecordDOList.get(i);
+            if (memberPointRecordDO.getPoint() > 0){ //获得积分
+                addUp = addUp + memberPointRecordDO.getPoint();
+            }
+            if (memberPointRecordDO.getPoint() < 0){  //消费积分
+                reduce = reduce + memberPointRecordDO.getPoint();
+            }
+        }
+        MemberPointRecordDO memberPointRecordDO = new MemberPointRecordDO();
+        memberPointRecordDO.setAddUp(addUp);
+        memberPointRecordDO.setReduce(Math.abs(reduce));
+        return memberPointRecordDO;
+    }
+
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserService.java
@ -189,6 +189,6 @@ public interface MemberUserService {

    void updateUserDo(MemberUserDO user);

-    void updateActivate(String cardName);
+    void updateActivate(String cardName,Long userId);

 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
@ -38,7 +38,6 @@ import java.util.List;

 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;

 /**
@ -330,9 +329,9 @@ public class MemberUserServiceImpl implements MemberUserService {
    }

    @Override
-    public void updateActivate(String cardName) {
-        MemberUserDO memberUserDO = getUser(getLoginUserId());
-        //设置个人信息的会员状态，0：未开通，1试用，2有效期，3永久
+    public void updateActivate(String cardName,Long userId) {
+        MemberUserDO memberUserDO = getUser(userId);
+        //设置个人信息的会员状态，0：未开通，1试用，2有效期，3永久，4过期
        if(cardName.equals("永久")){
            memberUserDO.setActivate(3);
        }else {
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserService.java
@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import cn.iocoder.yudao.module.member.dal.dataobject.user.PaidMemberUserDO;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import cn.iocoder.yudao.module.trade.dal.dataobject.order.TradeOrderDO;

 /**
 * 会员 Service 接口
@ -57,7 +58,12 @@ public interface PaidMemberUserService {

    int getPriceByTtype(Integer activate, String cardName);

-    LocalDateTime getDeadLineDay(String cardName);
+    /*
+    * 判断当前是否会员
+    * 为会员则过期时间需要续时长
+    * 不为会员则直接加入过期时间
+    * */
+    LocalDateTime getDeadLineDay(String cardName,Long userId);

    PaidMemberUserDO getPaidMemberUserByOrderNo(String orderNO);

@ -86,4 +92,14 @@ public interface PaidMemberUserService {

    PaidMemberUserDO getByPayOrderId(Long payOrderId);

+    /***
+     * 创建交易订单
+     */
+    public Long buildTradeOrder(PaidMemberUserDO updateReqVO);
+
+    void updateTradeOrderId(Long merchantOrderId, Long payOrderId);
+
+    PaidMemberUserSaveReqVO createPaidMemberUserSaveReqVO(MemberUserDO memberUserDO, String cardName);
+
+    int expireMemberUser();
 }
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/PaidMemberUserServiceImpl.java
@ -1,11 +1,17 @@
 package cn.iocoder.yudao.module.member.service.user;

-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
-import cn.iocoder.yudao.framework.common.util.date.DateUtils;
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+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.trade.dal.dataobject.order.TradeOrderDO;
+import cn.iocoder.yudao.module.trade.dal.mysql.order.TradeOrderMapper;
+import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderRefundStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderStatusEnum;
+import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
+import cn.iocoder.yudao.module.trade.service.order.TradeOrderUpdateService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@ -13,7 +19,10 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;

 import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import cn.iocoder.yudao.module.member.controller.admin.user.vo.*;
@ -25,7 +34,11 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.member.dal.mysql.user.PaidMemberUserMapper;

 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.framework.common.util.date.LocalDateTimeUtils.addTime;
+import static cn.iocoder.yudao.framework.common.util.servlet.ServletUtils.getClientIP;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.getTerminal;
 import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;

 /**
@ -43,6 +56,14 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
    @Resource
    private PaidMemberCardTypeService memberCardTypeService;

+    @Resource
+    private TradeOrderUpdateService tradeOrderUpdateService;
+
+    @Resource
+    private TradeOrderMapper tradeOrderMapper;
+
+    @Resource
+    private MemberUserService memberUserService;


    @Override
@ -91,24 +112,10 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
        return paidMemberUserMapper.selectById(id);
    }

-//    @Override
-//    public PaidMemberUserDO isValidPaidMember(Integer activate, LocalDateTime cardExpirationTime) {
-//        if (activate == 0){
-//            throw exception(PAID_MEMBER_USER_NOT_OPEN);
-//        } else if (activate != 0 && cardExpirationTime.isBefore(LocalDateTime.now())) {
-//            throw exception(PAID_MEMBER_USER_PASSED);
-//        }else {
-//            //当前用户为会员
-//            List<PaidMemberUserDO> list = paidMemberUserMapper.selectList(PaidMemberUserDO::getUid,getLoginUserId(),
-//                    )
-//        }
-//        return null;
-//    }
-
    @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();
        }
@ -121,22 +128,46 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {

    //获取会员类型对应的过期时间
    @Override
-    public LocalDateTime getDeadLineDay(String cardName) {
+    public LocalDateTime getDeadLineDay(String cardName,Long userId) {
        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);
-            }
+        MemberUserDO memberUserDO = memberUserService.getUser(userId);
+        //判断是否为会员，是否需要续期
+        if(memberUserDO.getActivate() !=1
+                && memberUserDO.getActivate() != 2
+                && memberUserDO.getActivate() != 3){
+            deadlineDay = getDay(cardName,now);
+        }
+        else {
+            List<PaidMemberUserDO> list = paidMemberUserMapper.selectList(new LambdaQueryWrapperX<PaidMemberUserDO>()
+                    .eqIfPresent(PaidMemberUserDO::getUid, userId)
+                    .isNotNull(PaidMemberUserDO::getCardExpirationTime)
+                    .orderByDesc(PaidMemberUserDO::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;
+        PaidMemberCardTypeDO paidMemberCardTypeDO = memberCardTypeService.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;
    }

@ -195,4 +226,73 @@ public class PaidMemberUserServiceImpl implements PaidMemberUserService {
        return paidMemberUserDO;
    }

+    @Override
+    public Long buildTradeOrder(PaidMemberUserDO updateReqVO) {
+        TradeOrderDO orderDO = new TradeOrderDO();
+         orderDO.setUserId(updateReqVO.getUid());
+         orderDO.setType(TradeOrderTypeEnum.NORMAL.getType());
+         orderDO.setNo(updateReqVO.getOrderNo());
+         orderDO.setStatus(TradeOrderStatusEnum.UNPAID.getStatus());
+         orderDO.setPayStatus(false);
+         orderDO.setRefundStatus(TradeOrderRefundStatusEnum.NONE.getStatus());
+         orderDO.setProductCount(1);
+         orderDO.setUserIp(getClientIP()).setTerminal(getTerminal());
+         orderDO.setDeliveryType(DeliveryTypeEnum.EXPRESS.getType());
+         orderDO.setPayPrice(updateReqVO.getPrice());
+        //插入新增交易订单
+        tradeOrderMapper.insert(orderDO);
+         //查询最新的交易订单数据
+        List<TradeOrderDO> list = tradeOrderMapper.selectList(new LambdaQueryWrapperX<TradeOrderDO>()
+                        .eqIfPresent(TradeOrderDO::getUserId,updateReqVO.getUid())
+                        .orderByDesc(TradeOrderDO::getId));
+        if(list.isEmpty()){
+            return null;
+        }
+        orderDO = CollUtil.getFirst(list);
+        return orderDO.getId();
+    }
+
+    @Override
+    public void updateTradeOrderId(Long merchantOrderId, Long payOrderId) {
+        TradeOrderDO orderDO = tradeOrderMapper.selectOne(new LambdaQueryWrapperX<TradeOrderDO>()
+                .eqIfPresent(TradeOrderDO::getId,merchantOrderId));
+        orderDO.setPayOrderId(payOrderId);
+        tradeOrderMapper.updateById(orderDO);
+    }
+
+    @Override
+    public PaidMemberUserSaveReqVO createPaidMemberUserSaveReqVO(MemberUserDO memberUserDO, String cardName) {
+        PaidMemberUserSaveReqVO paidMemberUserSaveReqVO = new PaidMemberUserSaveReqVO();
+        //将用户信息复制到会员记录里
+        org.springframework.beans.BeanUtils.copyProperties(memberUserDO,paidMemberUserSaveReqVO);
+        paidMemberUserSaveReqVO.setPayMemberType(cardName);
+        paidMemberUserSaveReqVO.setId(null);
+        paidMemberUserSaveReqVO.setUid(memberUserDO.getId());
+        //获取期限天数
+        String deadlineDay = memberCardTypeService.selectByName(cardName).getVid();
+        paidMemberUserSaveReqVO.setDeadlineDay(deadlineDay);
+        return paidMemberUserSaveReqVO;
+    }
+
+    @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;
+    }
+
 }
--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/member/AppPaidMembeController.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/member/AppPaidMembeController.java
@ -91,26 +91,21 @@ public class AppPaidMembeController {
            throw exception(MEMBER_USER_NOT_EXISTS);
        }
        PaidMemberUserDO paidMemberUserDO = new PaidMemberUserDO();
-        PaidMemberUserSaveReqVO paidMemberUserSaveReqVO = new PaidMemberUserSaveReqVO();
        //初始化支付金额,单位为分
        int price = 0;
        Long payOrderId = null;
+        //初始化付费会员记录
+        PaidMemberUserSaveReqVO paidMemberUserSaveReqVO = paidMemberUserService.
+                createPaidMemberUserSaveReqVO(memberUserDO,reqVO.getCardName());
        if(reqVO.getCardName().equals("试用")){
-            BeanUtils.copyProperties(memberUserDO,paidMemberUserSaveReqVO);
-            paidMemberUserSaveReqVO.setPayMemberType(reqVO.getCardName());
-            paidMemberUserSaveReqVO.setId(null);
-            paidMemberUserSaveReqVO.setUid(memberUserDO.getId());
            paidMemberUserSaveReqVO.setPrice(price);
            paidMemberUserSaveReqVO.setPaid(true);
-            //获取期限天数
-            String deadlineDay = memberCardService.selectByName(reqVO.getCardName()).getVid();
-            paidMemberUserSaveReqVO.setDeadlineDay(deadlineDay);
            paidMemberUserSaveReqVO.setPayType("免费领取");
            //获取支付时间
            LocalDateTime payTime = LocalDateTime.now();
            paidMemberUserSaveReqVO.setPayTime(payTime);
            //获取试用类型的过期时间
-            LocalDateTime cardExpirationTime = paidMemberUserService.getDeadLineDay(reqVO.getCardName());
+            LocalDateTime cardExpirationTime = paidMemberUserService.getDeadLineDay(reqVO.getCardName(),getLoginUserId());
            paidMemberUserSaveReqVO.setCardExpirationTime(cardExpirationTime);
            //设置会员订单号
            paidMemberUserSaveReqVO.setOrderNo(noRedisDAO.generate(PAID_MEMBER_NO_PREFIX));
@ -123,15 +118,8 @@ public class AppPaidMembeController {
            memberUserService.updateUserDo(memberUserDO);
        }
        else {
-            BeanUtils.copyProperties(memberUserDO,paidMemberUserSaveReqVO);
-            paidMemberUserSaveReqVO.setId(null);
-            paidMemberUserSaveReqVO.setPayMemberType(reqVO.getCardName());
-            paidMemberUserSaveReqVO.setUid(memberUserDO.getId());
            //获取实际支付金额（判断是否为会员有无优惠价）
            price = paidMemberUserService.getPriceByTtype(memberUserDO.getActivate(),reqVO.getCardName());
-            //获取期限天数
-            String deadlineDay = memberCardService.selectByName(reqVO.getCardName()).getVid();
-            paidMemberUserSaveReqVO.setDeadlineDay(deadlineDay);
            paidMemberUserSaveReqVO.setPrice(price);
            //设置会员订单号
            paidMemberUserSaveReqVO.setOrderNo(noRedisDAO.generate(PAID_MEMBER_NO_PREFIX));
@ -139,14 +127,19 @@ public class AppPaidMembeController {
            Long id = paidMemberUserService.createMemberUser(paidMemberUserSaveReqVO);
            //查询新增的会员订单记录
            paidMemberUserDO = paidMemberUserService.getMemberUser(id);
-            //            创建支付订单号
+            //创建交易订单号
+            Long merchantOrderId = paidMemberUserService.buildTradeOrder(paidMemberUserDO);
+            paidMemberUserDO.setMerchantOrderId(String.valueOf(merchantOrderId));
+            //创建支付订单号
            payOrderId = payOrderService.createOrder(new PayOrderCreateReqDTO()
                    .setAppId(1L).setUserIp(getClientIP())
-                    .setMerchantOrderId(""+paidMemberUserDO.getId())
+                    .setMerchantOrderId(""+paidMemberUserDO.getMerchantOrderId())
                    .setSubject(PAID_MEMBER_USER_SUBJECT).setBody("")
                    .setPrice(paidMemberUserDO.getPrice())
                    .setExpireTime(addTime(Duration.ofHours(2L)))); // TODO @芋艿：支付超时时间
            paidMemberUserDO.setPayOrderId(payOrderId);
+           //将支付订单号更新到交易订单中
+            paidMemberUserService.updateTradeOrderId(merchantOrderId,payOrderId);
            //跟新支付订单号进付费会员表里
            paidMemberUserService.update(paidMemberUserDO);
        }
@ -157,22 +150,21 @@ public class AppPaidMembeController {
    @PostMapping("/update")
    @Operation(summary = "余额支付")
    public CommonResult<Boolean> updatePaidMemberUser(@Valid @RequestBody AppPaidMemeberOrderReqDto notifyReqDTO){
-        //获取当前登录用户信息,并判断用户是否为会员
-        MemberUserDO memberUserDO = memberUserService.getUser(getLoginUserId());
        //获取订单记录
        PaidMemberUserDO paidMemberUserDO = paidMemberUserService.getMemberUser(notifyReqDTO.getId());
 //        获取当前用户钱包信息
        PayWalletDO walletDO = payWalletService.getOrCreateWallet(WebFrameworkUtils.getLoginUserId(),getLoginUserType());
 //       扣减钱包余额
-        payWalletService.reduceWalletBalance
-                (walletDO.getId(),notifyReqDTO.getId(),PAYMENT,paidMemberUserDO.getPrice());
+        payWalletService.reduceWalletBalanceByCardType
+                (walletDO.getId(),notifyReqDTO.getId(),PAYMENT,paidMemberUserDO.getPrice(),
+                        paidMemberUserDO.getPayMemberType());
        //获取支付时间
        LocalDateTime payTime = LocalDateTime.now();
        paidMemberUserDO.setPayTime(payTime);
        //更新会员订单支付状态为已支付
        paidMemberUserDO.setPaid(true);
        //获取试用类型的过期时间
-        LocalDateTime cardExpirationTime = paidMemberUserService.getDeadLineDay(notifyReqDTO.getCardName());
+        LocalDateTime cardExpirationTime = paidMemberUserService.getDeadLineDay(notifyReqDTO.getCardName(),getLoginUserId());
        paidMemberUserDO.setCardExpirationTime(cardExpirationTime);
        paidMemberUserDO.setPayChannel(notifyReqDTO.getPayChannel());
        String payType = paidMemberUserService.currentPayType(notifyReqDTO.getPayChannel());
@ -180,9 +172,7 @@ public class AppPaidMembeController {
        //更新会员订单
        paidMemberUserService.update(paidMemberUserDO);
        //更新用户会员状态
-        memberUserService.updateActivate(paidMemberUserDO.getPayMemberType());
-//        return success(PayMemberOrderConvert.INSTANCE.convert(paidMemberUserDO.getId(),payOrderId
-//                ,paidMemberUserDO.getCardExpirationTime(),memberUserDO.getActivate()));
+        memberUserService.updateActivate(paidMemberUserDO.getPayMemberType(),getLoginUserId());
        return success(true);
    }

--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletService.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletService.java
@ -70,6 +70,20 @@ public interface PayWalletService {
    PayWalletTransactionDO reduceWalletBalance(Long walletId, Long bizId,
                                               PayWalletBizTypeEnum bizType, Integer price);

+    /**
+     * 根据会员购卡类型
+     * 扣减钱包余额
+     *
+     * @param walletId 钱包 id
+     * @param bizId    业务关联 id
+     * @param bizType  业务关联分类
+     * @param price    扣减金额
+     * @param payMemberType   会员类型
+     * @return 钱包流水
+     */
+    PayWalletTransactionDO reduceWalletBalanceByCardType(Long walletId, Long bizId,
+                                               PayWalletBizTypeEnum bizType, Integer price,String payMemberType);
+
    /**
     * 增加钱包余额
     *
--- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
+++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
@ -169,6 +169,41 @@ public class PayWalletServiceImpl implements PayWalletService {
        return walletTransactionService.createWalletTransaction(bo);
    }

+    @Override
+    public PayWalletTransactionDO reduceWalletBalanceByCardType(Long walletId, Long bizId, PayWalletBizTypeEnum bizType, Integer price, String payMemberType) {
+        // 1. 获取钱包
+        PayWalletDO payWallet = getWallet(walletId);
+        if (payWallet == null) {
+            log.error("[reduceWalletBalance]，用户钱包({})不存在.", walletId);
+            throw exception(WALLET_NOT_FOUND);
+        }
+        // 2.1 扣除余额
+        int updateCounts;
+        switch (bizType) {
+            case PAYMENT: {
+                updateCounts = walletMapper.updateWhenConsumption(payWallet.getId(), price);
+                break;
+            }
+            case RECHARGE_REFUND: {
+                updateCounts = walletMapper.updateWhenRechargeRefund(payWallet.getId(), price);
+                break;
+            }
+            default: {
+                // TODO 其它类型待实现
+                throw new UnsupportedOperationException("待实现");
+            }
+        }
+        if (updateCounts == 0) {
+            throw exception(WALLET_BALANCE_NOT_ENOUGH);
+        }
+        // 2.2 生成钱包流水
+        Integer afterBalance = payWallet.getBalance() - price;
+        WalletTransactionCreateReqBO bo = new WalletTransactionCreateReqBO().setWalletId(payWallet.getId())
+                .setPrice(-price).setBalance(afterBalance).setBizId(String.valueOf(bizId))
+                .setBizType(bizType.getType()).setTitle(bizType.getDescription()+payMemberType+"类型会员");
+        return walletTransactionService.createWalletTransaction(bo);
+    }
+
    @Override
    @Transactional(rollbackFor = Exception.class)
    @SneakyThrows
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/configuration/ConfigurationController.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/configuration/ConfigurationController.java
@ -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);
-    }

 }
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/configuration/ConfigurationServiceImpl.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/configuration/ConfigurationServiceImpl.java
@ -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();

                    //判断时间段是否存在
                    /**
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApi.java
@ -81,4 +81,8 @@ public interface DictDataApi {

    Long createDictDataApi(DictDataSaveReqApiVO createReqVO);

+    int updateMenu(Integer id,String name);
+
+    void deleteMenu(Long id);
+
 }
--- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java
+++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dict/dto/DictDataRespDTO.java
@ -10,6 +10,7 @@ import lombok.Data;
 */
@Data
 public class DictDataRespDTO {
+    private Integer id;

    /**
     * 字典标签
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dict/DictDataApiImpl.java
@ -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);
+    }
+
+
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
@ -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);
+    }
+
+
+
+
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java
@ -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();
+
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java
@ -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);
 }
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java
@ -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);
+    }
+
 }
Author	SHA1	Message	Date
XinWei	be9593e214	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-30 11:12:42 +08:00
XinWei	eead90abb2	新增vue3构建脚本	2024-10-30 11:12:27 +08:00
root	527e0210de	Merge pull request '活动商品接口' (#94 ) 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/94	2024-10-29 18:39:55 +08:00
sonjinyon	074278c9bd	活动商品接口	2024-10-29 18:36:11 +08:00
root	7dcb1ef9a9	Merge pull request '会员支付优化(现金支付)' (#93 ) 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/93	2024-10-29 18:34:46 +08:00
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
khy	e406f885d9	会员支付优化	2024-10-29 11:50:33 +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
khy	cbdbf6fa01	会员记录支付状态	2024-10-28 11:09:09 +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
khy	6c29031b3b	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1	2024-10-28 10:22:58 +08:00
khy	b6b82502e0	会员协议	2024-10-28 10:22:38 +08:00
root	0eabf4fc3c	Merge pull request 'khy1' (#86 ) 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/86	2024-10-25 17:48:40 +08:00
khy	0621b9823b	交易订单	2024-10-25 17:46:26 +08:00
root	12dd84bb4c	Merge pull request '交易' (#85 ) 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/85	2024-10-25 16:44:40 +08:00
khy	35cea73266	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1	2024-10-25 16:42:50 +08:00
root	b24c6d3157	Merge pull request 'sjy-two' (#84 ) 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/84	2024-10-25 16:39:13 +08:00
khy	36b7469e1e	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into khy1	2024-10-25 16:38:55 +08:00
khy	a163a6490f	交易	2024-10-25 16:38:16 +08:00
sonjinyon	67459fe554	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-25 16:23:44 +08:00
root	a521d1c674	Merge pull request '交易订单' (#83 ) 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/83	2024-10-25 16:20:39 +08:00
khy	783ab383ec	交易订单	2024-10-25 16:19:29 +08:00
root	21a0e43cc1	Merge pull request '新增交易订单' (#82 ) 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/82	2024-10-25 16:16:52 +08:00
khy	f8de72bc6a	新增交易订单	2024-10-25 16:14:01 +08:00
sonjinyon	c58893d335	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-25 16:05:47 +08:00
sonjinyon	aa3d6de962	调整积分商城，我的积分数据显示，兑换记录详情	2024-10-25 15:51:43 +08:00
root	45b6bf142e	Merge pull request '支付bug' (#79 ) 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/79	2024-10-25 14:48:48 +08:00
khy	6beabe3478	支付bug	2024-10-25 14:38:59 +08:00
root	94d29f3cad	Merge pull request '后台-客服页面调整和客服转接功能（前端刷新功能未实现）' (#78 ) from cxw 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/78	2024-10-25 13:59:19 +08:00
sonjinyon	f6b2ffb401	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into sjy-two	2024-10-25 09:18:11 +08:00