修改预约提交接口

Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41 ) from cxw into master
Reviewed-on: #41
2024-10-14 13:19:30 +08:00 · 2024-10-12 14:50:00 +08:00 · 2024-10-12 14:43:32 +08:00 · 2024-10-12 13:26:17 +08:00 · 2024-10-12 09:38:26 +08:00 · 2024-10-12 09:35:10 +08:00
40 changed files with 989 additions and 265 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -60,7 +60,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
      port: 22 # 远程连接端口
 
-      command_timeout: 10m # 远程执行命令超时时间
+      command_timeout: 30m # 远程执行命令超时时间
 
      script:
 #        - ls
--- a/yudao-admin-vue3/.env.local
+++ b/yudao-admin-vue3/.env.local
@ -4,12 +4,13 @@ NODE_ENV=development
 VITE_DEV=true

 # 请求路径
-VITE_BASE_URL='http://localhost:6127'
+#VITE_BASE_URL='https://zysc.fjptzykj.com'
+VITE_BASE_URL='http://192.168.1.12:6127'

 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:6127/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='https://zysc.fjptzykj.com/admin-api/infra/file/upload'

 # 接口地址
 VITE_API_URL=/admin-api
--- a/yudao-admin-vue3/src/api/mall/statistics/member.ts
+++ b/yudao-admin-vue3/src/api/mall/statistics/member.ts
@ -121,3 +121,10 @@ export const getMemberRegisterCountList = (
    params: { times: [formatDate(beginTime), formatDate(endTime)] }
  })
 }
+
+// 获取自定义页面数据
+export const getDiyPage = () => {
+  return request.get({
+    url: '/promotion/diy-page/getDiyPage'
+  })
+}
--- a/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue
+++ b/yudao-admin-vue3/src/components/AppLinkInput/AppLinkSelectDialog.vue
@ -1,210 +1,215 @@
 <template>
-  <Dialog v-model="dialogVisible" title="选择链接" width="65%">
-    <div class="h-500px flex gap-8px">
-      <!-- 左侧分组列表 -->
-      <el-scrollbar wrap-class="h-full" ref="groupScrollbar" view-class="flex flex-col">
-        <el-button
-          v-for="(group, groupIndex) in APP_LINK_GROUP_LIST"
-          :key="groupIndex"
-          :class="[
+	<Dialog v-model="dialogVisible" title="选择链接" width="65%">
+		<div class="h-500px flex gap-8px">
+			<!-- 左侧分组列表 -->
+			<el-scrollbar wrap-class="h-full" ref="groupScrollbar" view-class="flex flex-col">
+				<template v-for="(group, groupIndex) in APP_LINK_GROUP_LIST">
+				<el-button v-if="groupIndex<7"  :key="groupIndex"  :class="[
            'm-r-16px m-l-0px! justify-start! w-90px',
            { active: activeGroup === group.name }
-          ]"
-          ref="groupBtnRefs"
-          :text="activeGroup !== group.name"
-          :type="activeGroup === group.name ? 'primary' : 'default'"
-          @click="handleGroupSelected(group.name)"
-        >
-          {{ group.name }}
-        </el-button>
-      </el-scrollbar>
-      <!-- 右侧链接列表 -->
-      <el-scrollbar class="h-full flex-1" @scroll="handleScroll" ref="linkScrollbar">
-        <div v-for="(group, groupIndex) in APP_LINK_GROUP_LIST" :key="groupIndex">
-			<template  v-if="activeGroup == group.name">
-				<!-- 分组标题 -->
-				<div class="font-bold" ref="groupTitleRefs">{{ group.name }}</div>
-				<!-- 链接列表 -->
-				<el-tooltip
-				  v-for="(appLink, appLinkIndex) in group.links"
-				  :key="appLinkIndex"
-				  :content="appLink.path"
-				  placement="bottom"
-				  :show-after="300"
-				>
-				  <el-button
-				    class="m-b-8px m-r-8px m-l-0px!"
-				    :type="isSameLink(appLink.path, activeAppLink.path) ? 'primary' : 'default'"
-				    @click="handleAppLinkSelected(appLink)"
-				  >
-				    {{ appLink.name }}
-				  </el-button>
-				</el-tooltip>
-			</template>
-          
-        </div>
-      </el-scrollbar>
-    </div>
-    <!-- 底部对话框操作按钮 -->
-    <template #footer>
-      <el-button type="primary" @click="handleSubmit">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-  <Dialog v-model="detailSelectDialog.visible" title="" width="50%">
-    <el-form class="min-h-200px">
-      <el-form-item
-        label="选择分类"
-        v-if="detailSelectDialog.type === APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST"
-      >
-        <ProductCategorySelect
-          v-model="detailSelectDialog.id"
-          :parent-id="0"
-          @update:model-value="handleProductCategorySelected"
-        />
-      </el-form-item>
-    </el-form>
-  </Dialog>
+          ]" ref="groupBtnRefs" :text="activeGroup !== group.name"
+					:type="activeGroup === group.name ? 'primary' : 'default'" @click="handleGroupSelected(group.name)">
+						{{ group.name }}
+				</el-button>
+				</template>
+			</el-scrollbar>
+			<!-- 右侧链接列表 -->
+			<el-scrollbar class="h-full flex-1" @scroll="handleScroll" ref="linkScrollbar">
+				<div v-for="(group, groupIndex) in APP_LINK_GROUP_LIST" :key="groupIndex">
+					<template v-if="activeGroup == group.name && groupIndex<7">
+						<!-- 分组标题 -->
+						<div class="font-bold" ref="groupTitleRefs">{{ group.name }}</div>
+						<!-- 链接列表 -->
+						<el-tooltip v-for="(appLink, appLinkIndex) in group.links" :key="appLinkIndex"
+							:content="appLink.path" placement="bottom" :show-after="300">
+							
+							<el-button class="m-b-8px m-r-8px m-l-0px!"
+								:type="isSameLink(appLink.path, activeAppLink.path) ? 'primary' : 'default'"
+								@click="handleAppLinkSelected(appLink)">
+								{{ appLink.name }}
+							</el-button>
+						</el-tooltip>
+					</template>
+
+				</div>
+			</el-scrollbar>
+		</div>
+		<!-- 底部对话框操作按钮 -->
+		<template #footer>
+			<el-button type="primary" @click="handleSubmit">确 定</el-button>
+			<el-button @click="dialogVisible = false">取 消</el-button>
+		</template>
+	</Dialog>
+	<Dialog v-model="detailSelectDialog.visible" title="" width="50%">
+		<el-form class="min-h-200px">
+			<el-form-item label="选择分类" v-if="detailSelectDialog.type === APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST">
+				<ProductCategorySelect v-model="detailSelectDialog.id" :parent-id="0"
+					@update:model-value="handleProductCategorySelected" />
+			</el-form-item>
+		</el-form>
+	</Dialog>
 </template>
 <script lang="ts" setup>
-import { APP_LINK_GROUP_LIST, APP_LINK_TYPE_ENUM, AppLink } from './data'
-import { ButtonInstance, ScrollbarInstance } from 'element-plus'
-import { split } from 'lodash-es'
-import ProductCategorySelect from '@/views/mall/product/category/components/ProductCategorySelect.vue'
-import { getUrlNumberValue } from '@/utils'
+	import { APP_LINK_GROUP_LIST, APP_LINK_TYPE_ENUM, AppLink } from './data'
+	import * as MemberStatisticsApi from '@/api/mall/statistics/member'
+	import { ButtonInstance, ScrollbarInstance } from 'element-plus'
+	import { split } from 'lodash-es'
+	import ProductCategorySelect from '@/views/mall/product/category/components/ProductCategorySelect.vue'
+	import { getUrlNumberValue } from '@/utils'
+	// 假设你要追加的数据是一个新的对象
+	const userComparison = ref([])
+	/** 查询会员用户数量对照卡片数据 */
+	const GetDiyPage = async () => {
+		userComparison.value = await MemberStatisticsApi.getDiyPage()
+		const arry = userComparison.value.map(link => {
+			return {
+				name: link.name,
+				path: `/pages/index/page?id=${link.id}`
+			};
+		});
+		userComparison.value = {
+			name: '自定义页面',
+			links:arry
+		}
+		APP_LINK_GROUP_LIST.push(userComparison.value);
+		// userComparison.value = APP_LINK_GROUP_LIST 
+		//  userComparison.value = APP_LINK_GROUP_LIST.push({qq:1})
+		console.log(APP_LINK_GROUP_LIST, 'userComparison.value')
+	}
+	GetDiyPage()
+	// APP 链接选择弹框
+	defineOptions({ name: 'AppLinkSelectDialog' })
+	// 选中的分组，默认选中第一个
+	const activeGroup = ref(APP_LINK_GROUP_LIST[0].name)
+	// 选中的 APP 链接
+	const activeAppLink = ref({} as AppLink)

-// APP 链接选择弹框
-defineOptions({ name: 'AppLinkSelectDialog' })
-// 选中的分组，默认选中第一个
-const activeGroup = ref(APP_LINK_GROUP_LIST[0].name)
-// 选中的 APP 链接
-const activeAppLink = ref({} as AppLink)
+	/** 打开弹窗 */
+	const dialogVisible = ref(false)
+	const open = (link : string) => {
+		activeAppLink.value.path = link
+		dialogVisible.value = true

-/** 打开弹窗 */
-const dialogVisible = ref(false)
-const open = (link: string) => {
-  activeAppLink.value.path = link
-  dialogVisible.value = true
+		// 滚动到当前的链接
+		const group = APP_LINK_GROUP_LIST.find((group) =>
+			group.links.some((linkItem) => {
+				const sameLink = isSameLink(linkItem.path, link)
+				if (sameLink) {
+					activeAppLink.value = { ...linkItem, path: link }
+				}
+				return sameLink
+			})
+		)
+		if (group) {
+			// 使用 nextTick 的原因：可能 Dom 还没生成，导致滚动失败
+			nextTick(() => handleGroupSelected(group.name))
+		}
+	}
+	defineExpose({ open })

-  // 滚动到当前的链接
-  const group = APP_LINK_GROUP_LIST.find((group) =>
-    group.links.some((linkItem) => {
-      const sameLink = isSameLink(linkItem.path, link)
-      if (sameLink) {
-        activeAppLink.value = { ...linkItem, path: link }
-      }
-      return sameLink
-    })
-  )
-  if (group) {
-    // 使用 nextTick 的原因：可能 Dom 还没生成，导致滚动失败
-    nextTick(() => handleGroupSelected(group.name))
-  }
-}
-defineExpose({ open })
+	// 处理 APP 链接选中
+	const handleAppLinkSelected = (appLink : AppLink) => {
+		if (!isSameLink(appLink.path, activeAppLink.value.path)) {
+			activeAppLink.value = appLink
+			console.log(activeAppLink.value,activeAppLink.value.path,"activeAppLink.value")
+		}
+		switch (appLink.type) {
+			case APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST:
+				detailSelectDialog.value.visible = true
+				detailSelectDialog.value.type = appLink.type
+				// 返显
+				detailSelectDialog.value.id =
+					getUrlNumberValue('id', 'http://127.0.0.1' + activeAppLink.value.path) || undefined
+				break
+			default:
+				break
+		}
+	}

-// 处理 APP 链接选中
-const handleAppLinkSelected = (appLink: AppLink) => {
-  if (!isSameLink(appLink.path, activeAppLink.value.path)) {
-    activeAppLink.value = appLink
-  }
-  switch (appLink.type) {
-    case APP_LINK_TYPE_ENUM.PRODUCT_CATEGORY_LIST:
-      detailSelectDialog.value.visible = true
-      detailSelectDialog.value.type = appLink.type
-      // 返显
-      detailSelectDialog.value.id =
-        getUrlNumberValue('id', 'http://127.0.0.1' + activeAppLink.value.path) || undefined
-      break
-    default:
-      break
-  }
-}
+	// 处理绑定值更新
+	const emit = defineEmits<{
+		change : [link: string]
+		appLinkChange : [appLink: AppLink]
+	}>()
+	const handleSubmit = () => {
+		dialogVisible.value = false
+		emit('change', activeAppLink.value.path)
+		emit('appLinkChange', activeAppLink.value)
+	}

-// 处理绑定值更新
-const emit = defineEmits<{
-  change: [link: string]
-  appLinkChange: [appLink: AppLink]
-}>()
-const handleSubmit = () => {
-  dialogVisible.value = false
-  emit('change', activeAppLink.value.path)
-  emit('appLinkChange', activeAppLink.value)
-}
+	// 分组标题引用列表
+	const groupTitleRefs = ref<HTMLInputElement[]>([])
+	/**
+	 * 处理右侧链接列表滚动
+	 * @param scrollTop 滚动条的位置
+	 */
+	const handleScroll = ({ scrollTop } : { scrollTop : number }) => {
+		const titleEl = groupTitleRefs.value.find((titleEl : HTMLInputElement) => {
+			// 获取标题的位置信息
+			const { offsetHeight, offsetTop } = titleEl
+			// 判断标题是否在可视范围内
+			return scrollTop >= offsetTop && scrollTop < offsetTop + offsetHeight
+		})
+		// 只需处理一次
+		if (titleEl && activeGroup.value !== titleEl.textContent) {
+			activeGroup.value = titleEl.textContent || ''
+			// 同步左侧的滚动条位置
+			scrollToGroupBtn(activeGroup.value)
+		}
+	}

-// 分组标题引用列表
-const groupTitleRefs = ref<HTMLInputElement[]>([])
-/**
- * 处理右侧链接列表滚动
- * @param scrollTop 滚动条的位置
- */
-const handleScroll = ({ scrollTop }: { scrollTop: number }) => {
-  const titleEl = groupTitleRefs.value.find((titleEl: HTMLInputElement) => {
-    // 获取标题的位置信息
-    const { offsetHeight, offsetTop } = titleEl
-    // 判断标题是否在可视范围内
-    return scrollTop >= offsetTop && scrollTop < offsetTop + offsetHeight
-  })
-  // 只需处理一次
-  if (titleEl && activeGroup.value !== titleEl.textContent) {
-    activeGroup.value = titleEl.textContent || ''
-    // 同步左侧的滚动条位置
-    scrollToGroupBtn(activeGroup.value)
-  }
-}
+	// 右侧滚动条
+	const linkScrollbar = ref<ScrollbarInstance>()
+	// 处理分组选中
+	const handleGroupSelected = (group : string) => {
+		activeGroup.value = group
+		// const titleRef = groupTitleRefs.value.find((item: HTMLInputElement) => item.textContent === group)
+		// if (titleRef) {
+		//   // 滚动分组标题
+		//   linkScrollbar.value?.setScrollTop(titleRef.offsetTop)
+		// }
+	}

-// 右侧滚动条
-const linkScrollbar = ref<ScrollbarInstance>()
-// 处理分组选中
-const handleGroupSelected = (group: string) => {
-  activeGroup.value = group
-  // const titleRef = groupTitleRefs.value.find((item: HTMLInputElement) => item.textContent === group)
-  // if (titleRef) {
-  //   // 滚动分组标题
-  //   linkScrollbar.value?.setScrollTop(titleRef.offsetTop)
-  // }
-}
+	// 分组滚动条
+	const groupScrollbar = ref<ScrollbarInstance>()
+	// 分组引用列表
+	const groupBtnRefs = ref<ButtonInstance[]>([])
+	// 自动滚动分组按钮，确保分组按钮保持在可视区域内
+	const scrollToGroupBtn = (group : string) => {
+		const groupBtn = groupBtnRefs.value
+			.map((btn : ButtonInstance) => btn['ref'])
+			.find((ref : Node) => ref.textContent === group)
+		if (groupBtn) {
+			groupScrollbar.value?.setScrollTop(groupBtn.offsetTop)
+		}
+	}

-// 分组滚动条
-const groupScrollbar = ref<ScrollbarInstance>()
-// 分组引用列表
-const groupBtnRefs = ref<ButtonInstance[]>([])
-// 自动滚动分组按钮，确保分组按钮保持在可视区域内
-const scrollToGroupBtn = (group: string) => {
-  const groupBtn = groupBtnRefs.value
-    .map((btn: ButtonInstance) => btn['ref'])
-    .find((ref: Node) => ref.textContent === group)
-  if (groupBtn) {
-    groupScrollbar.value?.setScrollTop(groupBtn.offsetTop)
-  }
-}
+	// 是否为相同的链接（不比较参数，只比较链接）
+	const isSameLink = (link1 : string, link2 : string) => {
+		return split(link1, '?', 1)[0] === split(link2, '?', 1)[0]
+	}

-// 是否为相同的链接（不比较参数，只比较链接）
-const isSameLink = (link1: string, link2: string) => {
-  return split(link1, '?', 1)[0] === split(link2, '?', 1)[0]
-}
-
-// 详情选择对话框
-const detailSelectDialog = ref<{
-  visible: boolean
-  id?: number
-  type?: APP_LINK_TYPE_ENUM
-}>({
-  visible: false,
-  id: undefined,
-  type: undefined
-})
-// 处理详情选择
-const handleProductCategorySelected = (id: number) => {
-  const url = new URL(activeAppLink.value.path, 'http://127.0.0.1')
-  // 修改 id 参数
-  url.searchParams.set('id', `${id}`)
-  // 排除域名
-  activeAppLink.value.path = `${url.pathname}${url.search}`
-  // 关闭对话框
-  detailSelectDialog.value.visible = false
-  // 重置 id
-  detailSelectDialog.value.id = undefined
-}
+	// 详情选择对话框
+	const detailSelectDialog = ref<{
+		visible : boolean
+		id ?: number
+		type ?: APP_LINK_TYPE_ENUM
+	}>({
+		visible: false,
+		id: undefined,
+		type: undefined
+	})
+	// 处理详情选择
+	const handleProductCategorySelected = (id : number) => {
+		const url = new URL(activeAppLink.value.path, 'http://127.0.0.1')
+		// 修改 id 参数
+		url.searchParams.set('id', `${id}`)
+		// 排除域名
+		activeAppLink.value.path = `${url.pathname}${url.search}`
+		// 关闭对话框
+		detailSelectDialog.value.visible = false
+		// 重置 id
+		detailSelectDialog.value.id = undefined
+	}
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>
--- a/yudao-admin-vue3/src/components/AppLinkInput/data.ts
+++ b/yudao-admin-vue3/src/components/AppLinkInput/data.ts
@ -250,30 +250,31 @@ export const APP_LINK_GROUP_LIST = [
        path: '/pages/user/user_vip/index'
      }
    ]
-  },
-  {
-    name: '自定义页面',
-    links: [
-      {
-        name: '促销页面',
-        path: 'ss'
-      },
-      {
-        name: '关于我们',
-        path: '/pages/pay/recharge-lo'
-      },
-      {
-        name: '产品与服务',
-        path: '/pages/pay/recharge-l'
-      },
-      {
-        name: '自定义页面',
-        path: '/pages/pay/recharge-'
-      },
-      {
-        name: '个人中心',
-        path: '/pages/pay/recharge'
-      }
-    ]
  }
+  // ,
+  // {
+  //   name: '自定义页面',
+  //   links: [
+  //     {
+  //       name: '促销页面',
+  //       path: 'ss'
+  //     },
+  //     {
+  //       name: '关于我们',
+  //       path: '/pages/pay/recharge-lo'
+  //     },
+  //     {
+  //       name: '产品与服务',
+  //       path: '/pages/pay/recharge-l'
+  //     },
+  //     {
+  //       name: '自定义页面',
+  //       path: '/pages/pay/recharge-'
+  //     },
+  //     {
+  //       name: '个人中心',
+  //       path: '/pages/pay/recharge'
+  //     }
+  //   ]
+  // }
 ] as AppLinkGroup[]
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/CouponCard/property.vue
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/CouponCard/property.vue
@ -23,7 +23,7 @@
        </el-form-item>
      </el-card>
      <el-card header="优惠券样式" class="property-group" shadow="never">
-        <el-form-item label="列数" prop="type">
+        <!-- <el-form-item label="列数" prop="type">
          <el-radio-group v-model="formData.columns">
            <el-tooltip class="item" content="一列" placement="bottom">
              <el-radio-button :label="1">
@ -41,7 +41,7 @@
              </el-radio-button>
            </el-tooltip>
          </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="背景图片" prop="bgImg">
          <UploadImg v-model="formData.bgImg" height="80px" width="100%" class="min-w-160px" />
        </el-form-item>
@ -85,7 +85,7 @@ defineOptions({ name: 'CouponCardProperty' })
 const props = defineProps<{ modelValue: CouponCardProperty }>()
 const emit = defineEmits(['update:modelValue'])
 const { formData } = usePropertyForm(props.modelValue, emit)
-
+formData.value.columns = '3';
 // 优惠券列表
 const couponList = ref<CouponTemplateApi.CouponTemplateVO[]>([])
 const couponSelectDialog = ref()
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
@ -7,8 +7,9 @@
 				<div class="item h-42px flex flex-row items-center justify-between gap-4px p-x-12px">
 					<div class="flex flex-1 flex-row items-center gap-8px">
 						<div class="wh">
-							<img
-								src="https://zysc.fjptzykj.com:3000/shangcheng/02d372da2be37f10ecb4b79509a68f4d1c3fe6429add76d4c80f3cb9ee401e33.png" />
+							<img class="new-text1"
+								src="https://zysc.fjptzykj.com:3000/shangcheng/2f2be070c60ceb9466af937ff9dd8917ad2ee02f774dbac48fbb9e73bfc688d0.png" />
+							<span class="new-text">拼团活动</span>
 						</div>
 						<span class="text-16px" style="color: rgb(187, 187, 187);">92人拼团成功</span>
 					</div>
@ -158,6 +159,14 @@ onMounted(() => {
 	.wh {
 		position: relative;
 		padding-right: 10px;
+		display: flex;
+		align-items: center;
+		.new-text1{
+			width:30px;
+		}
+		.new-text{
+			font-weight: 700;	
+		}
 	}
 	
 	.wh::after {
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue
@ -99,6 +99,7 @@ defineOptions({ name: 'PromotionCombinationProperty' })
 const props = defineProps<{ modelValue: PromotionCombinationProperty }>()
 const emit = defineEmits(['update:modelValue'])
 const { formData } = usePropertyForm(props.modelValue, emit)
+formData.value.layoutType = 'threeCol';
 // 活动列表
 const activityList = ref<CombinationActivityApi.CombinationActivityVO>([])
 onMounted(async () => {
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionPoint/config.ts
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionPoint/config.ts
@ -0,0 +1,96 @@
+import {ComponentStyle, DiyComponent} from '@/components/DiyEditor/util'
+
+/** 积分商城属性 */
+export interface PromotionPointProperty {
+  // 布局类型：单列 | 三列
+  layoutType: 'oneColBigImg' | 'oneColSmallImg' | 'twoCol'
+  // 商品字段
+  fields: {
+    // 商品名称
+    name: PromotionPointFieldProperty
+    // 商品简介
+    introduction: PromotionPointFieldProperty
+    // 商品价格
+    price: PromotionPointFieldProperty
+    // 市场价
+    marketPrice: PromotionPointFieldProperty
+    // 商品销量
+    salesCount: PromotionPointFieldProperty
+    // 商品库存
+    stock: PromotionPointFieldProperty
+  }
+  // 角标
+  badge: {
+    // 是否显示
+    show: boolean
+    // 角标图片
+    imgUrl: string
+  }
+  // 按钮
+  btnBuy: {
+    // 类型：文字 | 图片
+    type: 'text' | 'img'
+    // 文字
+    text: string
+    // 文字按钮：背景渐变起始颜色
+    bgBeginColor: string
+    // 文字按钮：背景渐变结束颜色
+    bgEndColor: string
+    // 图片按钮：图片地址
+    imgUrl: string
+  }
+  // 上圆角
+  borderRadiusTop: number
+  // 下圆角
+  borderRadiusBottom: number
+  // 间距
+  space: number
+  // 秒杀活动编号
+  activityIds: number[]
+  // 组件样式
+  style: ComponentStyle
+}
+
+// 商品字段
+export interface PromotionPointFieldProperty {
+  // 是否显示
+  show: boolean
+  // 颜色
+  color: string
+}
+
+// 定义组件
+export const component = {
+  id: 'PromotionPoint',
+  name: '积分商城',
+  icon: 'ep:present',
+  property: {
+    layoutType: 'oneColBigImg',
+    fields: {
+      name: { show: true, color: '#000' },
+      introduction: { show: true, color: '#999' },
+      price: { show: true, color: '#ff3000' },
+      marketPrice: { show: true, color: '#c4c4c4' },
+      salesCount: { show: true, color: '#c4c4c4' },
+      stock: { show: false, color: '#c4c4c4' }
+    },
+    badge: { show: false, imgUrl: '' },
+    btnBuy: {
+      type: 'text',
+      text: '立即兑换',
+      bgBeginColor: '#FF6000',
+      bgEndColor: '#FE832A',
+      imgUrl: ''
+    },
+    borderRadiusTop: 8,
+    borderRadiusBottom: 8,
+    space: 8,
+    style: {
+      bgType: 'color',
+      bgColor: '',
+      marginLeft: 8,
+      marginRight: 8,
+      marginBottom: 8
+    } as ComponentStyle
+  }
+} as DiyComponent<PromotionPointProperty>
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionPoint/index.vue
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionPoint/index.vue
@ -0,0 +1,202 @@
+<template>
+  <div ref="containerRef" :class="`box-content min-h-30px w-full flex flex-row flex-wrap`">
+    <div
+      v-for="(spu, index) in spuList"
+      :key="index"
+      :style="{
+        ...calculateSpace(index),
+        ...calculateWidth(),
+        borderTopLeftRadius: `${property.borderRadiusTop}px`,
+        borderTopRightRadius: `${property.borderRadiusTop}px`,
+        borderBottomLeftRadius: `${property.borderRadiusBottom}px`,
+        borderBottomRightRadius: `${property.borderRadiusBottom}px`
+      }"
+      class="relative box-content flex flex-row flex-wrap overflow-hidden bg-white"
+    >
+      <!-- 角标 -->
+      <div v-if="property.badge.show" class="absolute left-0 top-0 z-1 items-center justify-center">
+        <el-image :src="property.badge.imgUrl" class="h-26px w-38px" fit="cover" />
+      </div>
+      <!-- 商品封面图 -->
+      <div
+        :class="[
+          'h-140px',
+          {
+            'w-full': property.layoutType !== 'oneColSmallImg',
+            'w-140px': property.layoutType === 'oneColSmallImg'
+          }
+        ]"
+      >
+        <el-image :src="spu.picUrl" class="h-full w-full" fit="cover" />
+      </div>
+      <div
+        :class="[
+          ' flex flex-col gap-8px p-8px box-border',
+          {
+            'w-full': property.layoutType !== 'oneColSmallImg',
+            'w-[calc(100%-140px-16px)]': property.layoutType === 'oneColSmallImg'
+          }
+        ]"
+      >
+        <!-- 商品名称 -->
+        <div
+          v-if="property.fields.name.show"
+          :class="[
+            'text-14px ',
+            {
+              truncate: property.layoutType !== 'oneColSmallImg',
+              'overflow-ellipsis line-clamp-2': property.layoutType === 'oneColSmallImg'
+            }
+          ]"
+          :style="{ color: property.fields.name.color }"
+        >
+          {{ spu.name }}
+        </div>
+        <!-- 商品简介 -->
+        <div
+          v-if="property.fields.introduction.show"
+          :style="{ color: property.fields.introduction.color }"
+          class="truncate text-12px"
+        >
+          {{ spu.introduction }}
+        </div>
+        <div>
+          <!-- 积分 -->
+          <span
+            v-if="property.fields.price.show"
+            :style="{ color: property.fields.price.color }"
+            class="text-16px"
+          >
+            {{ spu.point }}积分
+            {{ !spu.pointPrice || spu.pointPrice === 0 ? '' : `+${fenToYuan(spu.pointPrice)}元` }}
+          </span>
+          <!-- 市场价 -->
+          <span
+            v-if="property.fields.marketPrice.show && spu.marketPrice"
+            :style="{ color: property.fields.marketPrice.color }"
+            class="ml-4px text-10px line-through"
+          >
+            ￥{{ fenToYuan(spu.marketPrice) }}
+          </span>
+        </div>
+        <div class="text-12px">
+          <!-- 销量 -->
+          <span
+            v-if="property.fields.salesCount.show"
+            :style="{ color: property.fields.salesCount.color }"
+          >
+            已兑{{ (spu.pointTotalStock || 0) - (spu.pointStock || 0) }}件
+          </span>
+          <!-- 库存 -->
+          <span v-if="property.fields.stock.show" :style="{ color: property.fields.stock.color }">
+            库存{{ spu.pointTotalStock || 0 }}
+          </span>
+        </div>
+      </div>
+      <!-- 购买按钮 -->
+      <div class="absolute bottom-8px right-8px">
+        <!-- 文字按钮 -->
+        <span
+          v-if="property.btnBuy.type === 'text'"
+          :style="{
+            background: `linear-gradient(to right, ${property.btnBuy.bgBeginColor}, ${property.btnBuy.bgEndColor}`
+          }"
+          class="rounded-full p-x-12px p-y-4px text-12px text-white"
+        >
+          {{ property.btnBuy.text }}
+        </span>
+        <!-- 图片按钮 -->
+        <el-image
+          v-else
+          :src="property.btnBuy.imgUrl"
+          class="h-28px w-28px rounded-full"
+          fit="cover"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { PromotionPointProperty } from './config'
+import * as ProductSpuApi from '@/api/mall/product/spu'
+import { PointActivityApi, PointActivityVO, SpuExtension0 } from '@/api/mall/promotion/point'
+import { fenToYuan } from '@/utils'
+
+/** 积分商城卡片 */
+defineOptions({ name: 'PromotionPoint' })
+// 定义属性
+const props = defineProps<{ property: PromotionPointProperty }>()
+// 商品列表
+const spuList = ref<SpuExtension0[]>([])
+const spuIdList = ref<number[]>([])
+const pointActivityList = ref<PointActivityVO[]>([])
+
+watch(
+  () => props.property.activityIds,
+  async () => {
+    try {
+      // 新添加的积分商城组件，是没有活动ID的
+      const activityIds = props.property.activityIds
+      // 检查活动ID的有效性
+      if (Array.isArray(activityIds) && activityIds.length > 0) {
+        // 获取积分商城活动详情列表
+        pointActivityList.value = await PointActivityApi.getPointActivityListByIds(activityIds)
+
+        // 获取积分商城活动的 SPU 详情列表
+        spuList.value = []
+        spuIdList.value = pointActivityList.value.map((activity) => activity.spuId)
+        if (spuIdList.value.length > 0) {
+          spuList.value = await ProductSpuApi.getSpuDetailList(spuIdList.value)
+        }
+
+        // 更新 SPU 的最低兑换积分和所需兑换金额
+        pointActivityList.value.forEach((activity) => {
+          // 匹配spuId
+          const spu = spuList.value.find((spu) => spu.id === activity.spuId)
+          if (spu) {
+            spu.pointStock = activity.stock
+            spu.pointTotalStock = activity.totalStock
+            spu.point = activity.point
+            spu.pointPrice = activity.price
+          }
+        })
+      }
+    } catch (error) {
+      console.error('获取积分商城活动细节或 SPU 细节时出错:', error)
+    }
+  },
+  {
+    immediate: true,
+    deep: true
+  }
+)
+
+/**
+ * 计算商品的间距
+ * @param index 商品索引
+ */
+const calculateSpace = (index: number) => {
+  // 商品的列数
+  const columns = props.property.layoutType === 'twoCol' ? 2 : 1
+  // 第一列没有左边距
+  const marginLeft = index % columns === 0 ? '0' : props.property.space + 'px'
+  // 第一行没有上边距
+  const marginTop = index < columns ? '0' : props.property.space + 'px'
+
+  return { marginLeft, marginTop }
+}
+
+// 容器
+const containerRef = ref()
+// 计算商品的宽度
+const calculateWidth = () => {
+  let width = '100%'
+  // 双列时每列的宽度为：（总宽度 - 间距）/ 2
+  if (props.property.layoutType === 'twoCol') {
+    width = `${(containerRef.value.offsetWidth - props.property.space) / 2}px`
+  }
+  return { width }
+}
+</script>
+
+<style lang="scss" scoped></style>
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionPoint/property.vue
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionPoint/property.vue
@ -0,0 +1,154 @@
+<template>
+  <ComponentContainerProperty v-model="formData.style">
+    <el-form :model="formData" label-width="80px">
+      <el-card class="property-group" header="积分商城活动" shadow="never">
+        <PointShowcase v-model="formData.activityIds" />
+      </el-card>
+      <el-card class="property-group" header="商品样式" shadow="never">
+        <el-form-item label="布局" prop="type">
+          <el-radio-group v-model="formData.layoutType">
+            <el-tooltip class="item" content="单列大图" placement="bottom">
+              <el-radio-button value="oneColBigImg">
+                <Icon icon="fluent:text-column-one-24-filled" />
+              </el-radio-button>
+            </el-tooltip>
+            <el-tooltip class="item" content="单列小图" placement="bottom">
+              <el-radio-button value="oneColSmallImg">
+                <Icon icon="fluent:text-column-two-left-24-filled" />
+              </el-radio-button>
+            </el-tooltip>
+            <el-tooltip class="item" content="双列" placement="bottom">
+              <el-radio-button value="twoCol">
+                <Icon icon="fluent:text-column-two-24-filled" />
+              </el-radio-button>
+            </el-tooltip>
+            <!--<el-tooltip class="item" content="三列" placement="bottom">
+              <el-radio-button value="threeCol">
+                <Icon icon="fluent:text-column-three-24-filled" />
+              </el-radio-button>
+            </el-tooltip>-->
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="商品名称" prop="fields.name.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.name.color" />
+            <el-checkbox v-model="formData.fields.name.show" />
+          </div>
+        </el-form-item>
+        <el-form-item label="商品简介" prop="fields.introduction.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.introduction.color" />
+            <el-checkbox v-model="formData.fields.introduction.show" />
+          </div>
+        </el-form-item>
+        <el-form-item label="商品价格" prop="fields.price.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.price.color" />
+            <el-checkbox v-model="formData.fields.price.show" />
+          </div>
+        </el-form-item>
+        <el-form-item label="市场价" prop="fields.marketPrice.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.marketPrice.color" />
+            <el-checkbox v-model="formData.fields.marketPrice.show" />
+          </div>
+        </el-form-item>
+        <el-form-item label="商品销量" prop="fields.salesCount.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.salesCount.color" />
+            <el-checkbox v-model="formData.fields.salesCount.show" />
+          </div>
+        </el-form-item>
+        <el-form-item label="商品库存" prop="fields.stock.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.stock.color" />
+            <el-checkbox v-model="formData.fields.stock.show" />
+          </div>
+        </el-form-item>
+      </el-card>
+      <el-card class="property-group" header="角标" shadow="never">
+        <el-form-item label="角标" prop="badge.show">
+          <el-switch v-model="formData.badge.show" />
+        </el-form-item>
+        <el-form-item v-if="formData.badge.show" label="角标" prop="badge.imgUrl">
+          <UploadImg v-model="formData.badge.imgUrl" height="44px" width="72px">
+            <template #tip> 建议尺寸：36 * 22</template>
+          </UploadImg>
+        </el-form-item>
+      </el-card>
+      <el-card class="property-group" header="按钮" shadow="never">
+        <el-form-item label="按钮类型" prop="btnBuy.type">
+          <el-radio-group v-model="formData.btnBuy.type">
+            <el-radio-button value="text">文字</el-radio-button>
+            <el-radio-button value="img">图片</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <template v-if="formData.btnBuy.type === 'text'">
+          <el-form-item label="按钮文字" prop="btnBuy.text">
+            <el-input v-model="formData.btnBuy.text" />
+          </el-form-item>
+          <el-form-item label="左侧背景" prop="btnBuy.bgBeginColor">
+            <ColorInput v-model="formData.btnBuy.bgBeginColor" />
+          </el-form-item>
+          <el-form-item label="右侧背景" prop="btnBuy.bgEndColor">
+            <ColorInput v-model="formData.btnBuy.bgEndColor" />
+          </el-form-item>
+        </template>
+        <template v-else>
+          <el-form-item label="图片" prop="btnBuy.imgUrl">
+            <UploadImg v-model="formData.btnBuy.imgUrl" height="56px" width="56px">
+              <template #tip> 建议尺寸：56 * 56</template>
+            </UploadImg>
+          </el-form-item>
+        </template>
+      </el-card>
+      <el-card class="property-group" header="商品样式" shadow="never">
+        <el-form-item label="上圆角" prop="borderRadiusTop">
+          <el-slider
+            v-model="formData.borderRadiusTop"
+            :max="100"
+            :min="0"
+            :show-input-controls="false"
+            input-size="small"
+            show-input
+          />
+        </el-form-item>
+        <el-form-item label="下圆角" prop="borderRadiusBottom">
+          <el-slider
+            v-model="formData.borderRadiusBottom"
+            :max="100"
+            :min="0"
+            :show-input-controls="false"
+            input-size="small"
+            show-input
+          />
+        </el-form-item>
+        <el-form-item label="间隔" prop="space">
+          <el-slider
+            v-model="formData.space"
+            :max="100"
+            :min="0"
+            :show-input-controls="false"
+            input-size="small"
+            show-input
+          />
+        </el-form-item>
+      </el-card>
+    </el-form>
+  </ComponentContainerProperty>
+</template>
+
+<script lang="ts" setup>
+import { PromotionPointProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+import PointShowcase from '@/views/mall/promotion/point/components/PointShowcase.vue'
+
+// 秒杀属性面板
+defineOptions({ name: 'PromotionPointProperty' })
+
+const props = defineProps<{ modelValue: PromotionPointProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+</script>
+
+<style lang="scss" scoped></style>
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue
@ -6,8 +6,9 @@
 					<div class="item h-42px flex flex-row items-center justify-between gap-4px p-x-12px">
 						<div class="flex flex-1 flex-row items-center gap-8px">
 							<div class="wh">
-								<img
-									src="https://zysc.fjptzykj.com:3000/shangcheng/1bd7faadbb3c319c6ad303edc23ecbf12162b8ac22e2c8058b3914397d9dd226.png" />
+								<img class="new-text1"
+									src="https://zysc.fjptzykj.com:3000/shangcheng/cb995c399d784c08e27d8f56b0a63ace2d13af3a1ee6aba5a2da71868dc4cf00.png" />
+								<span class="new-text">限时秒杀</span>
 							</div>
 							<span class="text-16px" style="color: rgb(187, 187, 187);">已有99人购买</span>
 						</div>
@ -150,6 +151,14 @@
 	.wh {
 		position: relative;
 		padding-right: 10px;
+		display: flex;
+		align-items: center;
+		.new-text1{
+			width:30px;
+		}
+		.new-text{
+			font-weight: 700;	
+		}
 	}

 	.wh::after {
--- a/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue
+++ b/yudao-admin-vue3/src/components/DiyEditor/components/mobile/PromotionSeckill/property.vue
@ -14,7 +14,7 @@
        </el-form-item>
      </el-card>
      <el-card header="商品样式" class="property-group" shadow="never">
-        <el-form-item label="布局" prop="type">
+        <!-- <el-form-item label="布局" prop="type">
          <el-radio-group v-model="formData.layoutType">
            <el-tooltip class="item" content="单列" placement="bottom">
              <el-radio-button label="oneCol">
@ -27,7 +27,7 @@
              </el-radio-button>
            </el-tooltip>
          </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item label="商品名称" prop="fields.name.show">
          <div class="flex gap-8px">
            <ColorInput v-model="formData.fields.name.color" />
@ -99,6 +99,7 @@ defineOptions({ name: 'PromotionSeckillProperty' })
 const props = defineProps<{ modelValue: PromotionSeckillProperty }>()
 const emit = defineEmits(['update:modelValue'])
 const { formData } = usePropertyForm(props.modelValue, emit)
+formData.value.layoutType = "threeCol"
 // 活动列表
 const activityList = ref<SeckillActivityApi.SeckillActivityVO>([])
 onMounted(async () => {
--- a/yudao-admin-vue3/src/components/DiyEditor/util.ts
+++ b/yudao-admin-vue3/src/components/DiyEditor/util.ts
@ -146,7 +146,7 @@ export const PAGE_LIBS = [
    components: [
      'PromotionCombination',
      'PromotionSeckill',
-      // 'PromotionPoint',
+      'PromotionPoint',
      'CouponCard',
      'PromotionArticle'
    ]
--- a/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
+++ b/yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.product.controller.app.spu.vo;

 import cn.iocoder.yudao.module.product.controller.app.property.vo.value.AppProductPropertyValueDetailRespVO;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

@ -33,6 +34,8 @@ public class AppProductSpuDetailRespVO {
    @Schema(description = "商品轮播图", requiredMode = Schema.RequiredMode.REQUIRED)
    private List<String> sliderPicUrls;

+    @Schema(description = "商品品牌编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    private Long brandId;
    // ========== 营销相关字段 =========

    // ========== SKU 相关字段 =========
--- a/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
+++ b/yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
@ -149,4 +149,6 @@ public interface ErrorCodeConstants {
    ErrorCode POINT_ACTIVITY_JOIN_ACTIVITY_PRODUCT_NOT_EXISTS = new ErrorCode(1_013_007_007, "积分商品兑换失败，原因：商品不存在");
    ErrorCode POINT_ACTIVITY_UPDATE_STOCK_FAIL = new ErrorCode(1_013_007_008, "积分商品兑换失败，原因：积分商品库存不足");

+    ErrorCode TIME_FORMAT_ERROR = new ErrorCode(1_019_007_008, "秒杀时间段格式化错误");
+
 }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
@ -53,7 +53,7 @@ public class AppActivityController {
    private RewardActivityService rewardActivityService;

    @GetMapping("/list-by-spu-id")
-    @Operation(summary = "获得单个商品，近期参与的每个活动")
+    @Operation(summary = "获得单个商品，正在参与的所有活动")
    @Parameter(name = "spuId", description = "商品编号", required = true)
    public CommonResult<List<AppActivityRespVO>> getActivityListBySpuId(@RequestParam("spuId") Long spuId) {
        // 每种活动，只返回一个
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
@ -6,14 +6,20 @@ import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
+import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
 import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
 import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
+import cn.iocoder.yudao.module.promotion.api.seckill.dto.SeckillValidateJoinRespDTO;
 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityDetailRespVO;
+import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityPurchasesTimesReqVO;
 import cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity.AppCombinationActivityRespVO;
+import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillPurchasesTimesReqVO;
 import cn.iocoder.yudao.module.promotion.convert.combination.CombinationActivityConvert;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
 import cn.iocoder.yudao.module.promotion.service.combination.CombinationActivityService;
+import cn.iocoder.yudao.module.trade.api.order.TradeOrderApi;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import io.swagger.v3.oas.annotations.Operation;
@ -35,6 +41,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;

@Tag(name = "用户 APP - 拼团活动")
@RestController
@ -60,7 +67,8 @@ public class AppCombinationActivityController {

    @Resource
    private ProductSpuApi spuApi;
-
+    @Resource
+    private TradeOrderApi tradeOrderApi;
    @GetMapping("/list")
    @Operation(summary = "获得拼团活动列表", description = "用于小程序首页")
    @Parameter(name = "count", description = "需要展示的数量", example = "6")
@ -127,7 +135,15 @@ public class AppCombinationActivityController {

        // 2. 获取活动商品
        List<CombinationProductDO> products = activityService.getCombinationProductsByActivityId(activity.getId());
-        return success(CombinationActivityConvert.INSTANCE.convert3(activity, products));
+        AppCombinationActivityDetailRespVO appCombinationActivityDetailRespVO = CombinationActivityConvert.INSTANCE.convert3(activity, products);
+        // 3.获取已购买数量
+        if (getLoginUserId() != null) {
+            int seckillProductCount = tradeOrderApi.getCombinationProductCount(getLoginUserId(), id);
+            // 总次数减去下单过的次数 得到剩余次数
+            appCombinationActivityDetailRespVO.setRemainingPurchases(Math.max(activity.getTotalLimitCount() - seckillProductCount, 0));
+        } else {
+            appCombinationActivityDetailRespVO.setRemainingPurchases(0);
+        }
+        return success(appCombinationActivityDetailRespVO);
    }
-
 }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityDetailRespVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityDetailRespVO.java
@ -43,6 +43,9 @@ public class AppCombinationActivityDetailRespVO {
    @Schema(description = "商品信息数组", requiredMode = Schema.RequiredMode.REQUIRED)
    private List<Product> products;

+    @Schema(description = "剩余购买次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer remainingPurchases;
+
    @Schema(description = "商品信息")
    @Data
    public static class Product {
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityPurchasesTimesReqVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/vo/activity/AppCombinationActivityPurchasesTimesReqVO.java
@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.promotion.controller.app.combination.vo.activity;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.Valid;
+
+@Schema(description = "用户 App - 拼团剩余购买次数 Request VO")
+@Data
+@Valid
+public class AppCombinationActivityPurchasesTimesReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long userId;
+
+    @Schema(description = "拼团活动编号", example = "1024")
+    private Long activityId;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
@ -5,19 +5,23 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.date.DateUtils;
 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
+import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
+import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
+import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
 import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
 import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
-import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityDetailRespVO;
-import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityNowRespVO;
-import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityPageReqVO;
-import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityRespVO;
+import cn.iocoder.yudao.module.promotion.api.seckill.dto.SeckillValidateJoinRespDTO;
+import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.*;
 import cn.iocoder.yudao.module.promotion.convert.seckill.seckillactivity.SeckillActivityConvert;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillActivityDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillConfigDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillProductDO;
 import cn.iocoder.yudao.module.promotion.service.seckill.SeckillActivityService;
 import cn.iocoder.yudao.module.promotion.service.seckill.SeckillConfigService;
+import cn.iocoder.yudao.module.trade.api.order.TradeOrderApi;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import io.swagger.v3.oas.annotations.Operation;
@ -31,19 +35,23 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;

 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;

+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.cache.CacheUtils.buildAsyncReloadingCache;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.findFirst;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.isBetween;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.TIME_FORMAT_ERROR;

@Tag(name = "用户 App - 秒杀活动")
@RestController
@ -59,7 +67,7 @@ public class AppSeckillActivityController {

                @Override
                public AppSeckillActivityNowRespVO load(String key) {
-                     return getNowSeckillActivity0();
+                    return getNowSeckillActivity0();
                }

            });
@ -73,6 +81,15 @@ public class AppSeckillActivityController {
    @Resource
    private ProductSpuApi spuApi;

+    @Resource
+    private ProductSkuApi skuApi;
+
+    @Resource
+    private TradeOrderApi tradeOrderApi;
+
+    @Resource
+    private MemberUserApi memberUserApi;
+
    @GetMapping("/get-now")
    @Operation(summary = "获得当前秒杀活动", description = "获取当前正在进行的活动，提供给首页使用")
    public CommonResult<AppSeckillActivityNowRespVO> getNowSeckillActivity() {
@ -113,15 +130,38 @@ public class AppSeckillActivityController {

    @GetMapping("/spuList")
    @Parameter(name = "count", description = "需要展示的数量", example = "6")
-    @Operation(summary = "获得秒杀活动分页")
-    public CommonResult<List<ProductSpuRespDTO>> getSeckillActivitySupList(@RequestParam(name = "count", defaultValue = "6") Integer count) {
+    @Operation(summary = "获得现在进行的秒杀活动分页")
+    public CommonResult<List<ProductSpuRespDTO>> getSeckillActivitySupList(@RequestParam(name = "count", defaultValue = "3") Integer count) {
        AppSeckillActivityPageReqVO pageReqVO = new AppSeckillActivityPageReqVO();
-        if (count == null || count == 0){
-            pageReqVO.setPageNo(1);
-            pageReqVO.setPageSize(count);
+        Page<SeckillActivityDO> page = new Page<>(1, 3);
+        ;
+        if (count != null && count != 0) {
+            page = new Page<>(1, count);
        }
+        // 先找出当前时间对应的配置时间段id
+        List<Long> configIdList = new ArrayList<>();
+        try {
+            List<SeckillConfigDO> timeList = configService.getSeckillConfigListByStatus(CommonStatusEnum.ENABLE.getStatus());
+            SimpleDateFormat format = new SimpleDateFormat("HH:mm");
+            // 当前时间
+            Date currentTime = format.parse(format.format(new Date()));
+            // 遍历所有配置时间段，找出符合时间段的id
+            for (SeckillConfigDO seckillConfigDO : timeList) {
+                if (currentTime.before(format.parse(seckillConfigDO.getEndTime())) && currentTime.after(format.parse(seckillConfigDO.getStartTime()))) {
+                    configIdList.add(seckillConfigDO.getId());
+                }
+            }
+        } catch (ParseException e) {
+            throw exception(TIME_FORMAT_ERROR);
+        }
+        // 对配置时间段的id数组进行判断
+        if (configIdList.isEmpty()) {
+            return success(null);
+        }
+        // 获取满足当前正在进行的活动
+        PageResult<SeckillActivityDO> pageResult = activityService.getRunningActivityByConfigIdsCount(configIdList, page);
        // 1. 查询满足当前阶段的活动
-        PageResult<SeckillActivityDO> pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO);
+//        PageResult<SeckillActivityDO> pageResult = activityService.getSeckillActivityAppPageByConfigId(pageReqVO);
        if (CollUtil.isEmpty(pageResult.getList())) {
            return success(null);
        }
@ -135,7 +175,7 @@ public class AppSeckillActivityController {
        HashMap<Long, Long> hashMap = new HashMap<>();
        for (AppSeckillActivityRespVO respVO : result.getList()) {
            arrayList.add(respVO.getSpuId());
-            hashMap.put(respVO.getSpuId(),respVO.getId());
+            hashMap.put(respVO.getSpuId(), respVO.getId());
        }
        List<ProductSpuRespDTO> list = spuApi.getSpuList(arrayList);
        for (ProductSpuRespDTO respDTO : list) {
@ -181,7 +221,17 @@ public class AppSeckillActivityController {

        // 4. 拼接数据
        List<SeckillProductDO> productList = activityService.getSeckillProductListByActivityId(activity.getId());
-        return success(SeckillActivityConvert.INSTANCE.convert3(activity, productList, startTime, endTime));
-    }
+        AppSeckillActivityDetailRespVO appSeckillActivityDetailRespVO = SeckillActivityConvert.INSTANCE.convert3(activity, productList, startTime, endTime);

+        // 5.获取已购买数量
+        if (getLoginUserId() != null) {
+            int seckillProductCount = tradeOrderApi.getSeckillProductCount(getLoginUserId(), id);
+            // 总次数减去下单过的次数 得到剩余次数
+            appSeckillActivityDetailRespVO.setRemainingPurchases(Math.max(activity.getTotalLimitCount() - seckillProductCount, 0));
+        } else {
+            appSeckillActivityDetailRespVO.setRemainingPurchases(0);
+        }
+
+        return success(appSeckillActivityDetailRespVO);
+    }
 }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityDetailRespVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillActivityDetailRespVO.java
@ -43,6 +43,9 @@ public class AppSeckillActivityDetailRespVO {
    @Schema(description = "商品信息数组", requiredMode = Schema.RequiredMode.REQUIRED)
    private List<Product> products;

+    @Schema(description = "剩余购买次数", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer remainingPurchases;
+
    @Schema(description = "商品信息")
    @Data
    public static class Product {
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillPurchasesTimesReqVO.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/vo/activity/AppSeckillPurchasesTimesReqVO.java
@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.trade.enums.delivery.DeliveryTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Schema(description = "用户 App - 秒杀剩余购买次数 Request VO")
+@Data
+@Valid
+public class AppSeckillPurchasesTimesReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long userId;
+
+    @Schema(description = "秒杀活动编号", example = "1024")
+    private Long activityId;
+
+}
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
@ -36,12 +36,14 @@ public interface CombinationActivityMapper extends BaseMapperX<CombinationActivi

    default PageResult<CombinationActivityDO> selectPage(PageParam pageParam, Integer status) {
        return selectPage(pageParam, new LambdaQueryWrapperX<CombinationActivityDO>()
-                .eq(CombinationActivityDO::getStatus, status));
+                .eq(CombinationActivityDO::getStatus, status)
+                .ge(CombinationActivityDO::getEndTime, LocalDateTime.now()));
    }

    default List<CombinationActivityDO> selectListByStatus(Integer status, Integer count) {
        return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
                .eq(CombinationActivityDO::getStatus, status)
+                .ge(CombinationActivityDO::getEndTime, LocalDateTime.now())
                .last("LIMIT " + count));
    }

--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
@ -72,6 +72,7 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> {
    default PageResult<SeckillActivityDO> selectPage(AppSeckillActivityPageReqVO pageReqVO, Integer status) {
        return selectPage(pageReqVO, new LambdaQueryWrapperX<SeckillActivityDO>()
                .eqIfPresent(SeckillActivityDO::getStatus, status)
+                .ge(SeckillActivityDO::getEndTime, LocalDateTime.now())
                // TODO 芋艿：对 find in set 的想法；
                .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0"));
    }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
@ -101,7 +101,7 @@ public interface CombinationActivityService {
    List<CombinationActivityDO> getCombinationActivityListByIds(Collection<Long> ids);

    /**
-     * 获取正在进行的活动分页数据
+     * 获取正在进行的活动分页数据（同时活动未过期）
     *
     * @param count 需要的数量
     * @return 拼团活动分页
@ -109,7 +109,7 @@ public interface CombinationActivityService {
    List<CombinationActivityDO> getCombinationActivityListByCount(Integer count);

    /**
-     * 获取正在进行的活动分页数据
+     * 获取正在进行的活动分页数据（同时活动未过期）
     *
     * @param pageParam 分页请求
     * @return 拼团活动分页
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.promotion.controller.admin.seckill.vo.activity.Se
 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityPageReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillActivityDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillProductDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

 import javax.validation.Valid;
 import java.time.LocalDateTime;
@ -139,4 +140,11 @@ public interface SeckillActivityService {
     */
    List<SeckillActivityDO> getSeckillActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime);

+    /**
+     * 获取当前正在进行的秒杀活动
+     * @param configIdList 符合配置时间段的id
+     * @param page 分页
+     * @return cn.iocoder.yudao.framework.common.pojo.PageResult<cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillActivityDO>
+     */
+    PageResult<SeckillActivityDO> getRunningActivityByConfigIdsCount(List<Long> configIdList, Page<SeckillActivityDO> page);
 }
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
@ -7,6 +7,7 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
 import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
@ -23,6 +24,8 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillConfigDO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillProductDO;
 import cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity.SeckillActivityMapper;
 import cn.iocoder.yudao.module.promotion.dal.mysql.seckill.seckillactivity.SeckillProductMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@ -85,7 +88,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {

    /**
     * 校验秒杀商品参与的活动是否存在冲突
-     *
+     * <p>
     * 1. 校验秒杀时段是否存在
     * 2. 秒杀商品是否参加其它活动
     *
@ -336,4 +339,17 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
                convertSet(spuIdAndActivityIdMaps, map -> MapUtil.getLong(map, "activityId")), dateTime);
    }

+    @Override
+    public PageResult<SeckillActivityDO> getRunningActivityByConfigIdsCount(List<Long> configIdList, Page<SeckillActivityDO> page) {
+        LambdaQueryWrapper<SeckillActivityDO> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SeckillActivityDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
+                .ge(SeckillActivityDO::getEndTime, LocalDateTime.now())
+                .in(SeckillActivityDO::getConfigIds, configIdList);
+        Page<SeckillActivityDO> seckillActivityDOPage = seckillActivityMapper.selectPage(page, wrapper);
+        PageResult<SeckillActivityDO> pageResult = new PageResult<>();
+        pageResult.setTotal(seckillActivityDOPage.getTotal());
+        pageResult.setList(seckillActivityDOPage.getRecords());
+        return pageResult;
+    }
+
 }
--- a/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
+++ b/yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApi.java
@ -37,4 +37,19 @@ public interface TradeOrderApi {
     */
    void cancelPaidOrder(Long userId, Long orderId);

+    /**
+     * 获取已经使用的秒杀次数
+     * @param userId 用户编号
+     * @param activityId 秒杀活动编号
+     * @return java.lang.Integer
+     */
+    Integer getSeckillProductCount(Long userId, Long activityId);
+
+    /**
+     * 获取已经使用的拼团次数
+     * @param userId 用户编号
+     * @param activityId 拼团活动编号
+     * @return java.lang.Integer
+     */
+    Integer getCombinationProductCount(Long userId, Long activityId);
 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/api/order/TradeOrderApiImpl.java
@ -40,4 +40,14 @@ public class TradeOrderApiImpl implements TradeOrderApi {
        tradeOrderUpdateService.cancelPaidOrder(userId, orderId);
    }

+    @Override
+    public Integer getSeckillProductCount(Long userId, Long activityId) {
+        return tradeOrderQueryService.getSeckillProductCount(userId, activityId);
+    }
+
+    @Override
+    public Integer getCombinationProductCount(Long userId, Long activityId) {
+        return tradeOrderQueryService.getCombinationProductCount(userId, activityId);
+    }
+
 }
--- 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
@ -124,4 +124,9 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
        );
    }

+    default List<TradeOrderDO> selectListByUserIdAndCombinationActivityId(Long userId, Long activityId){
+        LambdaQueryWrapperX<TradeOrderDO> wrapperX = new LambdaQueryWrapperX<>();
+        wrapperX.eq(TradeOrderDO::getUserId, userId).eq(TradeOrderDO::getSeckillActivityId, activityId);
+        return selectList(wrapperX);
+    }
 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryService.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryService.java
@ -155,4 +155,12 @@ public interface TradeOrderQueryService {
     */
    List<TradeOrderItemDO> getOrderItemListByOrderId(Collection<Long> orderIds);

+    /**
+     * 在指定拼团活动下，用户购买的商品数量
+     *
+     * @param userId     用户编号
+     * @param activityId 活动编号
+     * @return 拼团商品数量
+     */
+    Integer getCombinationProductCount(Long userId, Long activityId);
 }
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
@ -247,6 +247,18 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
        return tradeOrderItemMapper.selectListByOrderId(orderIds);
    }

+    @Override
+    public Integer getCombinationProductCount(Long userId, Long activityId) {
+        // 获得订单列表
+        List<TradeOrderDO> orders = tradeOrderMapper.selectListByUserIdAndCombinationActivityId(userId, activityId);
+        orders.removeIf(order -> TradeOrderStatusEnum.isCanceled(order.getStatus())); // 过滤掉【已取消】的订单
+        if (CollUtil.isEmpty(orders)) {
+            return 0;
+        }
+        // 获得订单项列表
+        return tradeOrderItemMapper.selectProductSumByOrderId(convertSet(orders, TradeOrderDO::getId));
+    }
+
    /**
     * 获得自身的代理对象，解决 AOP 生效问题
     *
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
@ -51,7 +51,10 @@ public class TradePriceServiceImpl implements TradePriceService {
        // 2.1 计算价格
        TradePriceCalculateRespBO calculateRespBO = TradePriceCalculatorHelper
                .buildCalculateResp(calculateReqBO, spuList, skuList);
-        priceCalculators.forEach(calculator -> calculator.calculate(calculateReqBO, calculateRespBO));
+//        priceCalculators.forEach(calculator -> calculator.calculate(calculateReqBO, calculateRespBO));
+        for (TradePriceCalculator calculator : priceCalculators) {
+            calculator.calculate(calculateReqBO, calculateRespBO);
+        }
        // 2.2  如果最终支付金额小于等于 0，则抛出业务异常
        if (calculateRespBO.getPrice().getPayPrice() <= 0) {
            log.error("[calculatePrice][价格计算不正确，请求 calculateReqDTO({})，结果 priceCalculate({})]",
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserPageReqVO.java
@ -44,7 +44,7 @@ public class MemberUserPageReqVO extends PageParam {
    @Schema(description = "权益id", example = "1")
    private Long noticeInterestId;

-    @Schema(description = "是否绑过卡", example = "1")
+    @Schema(description = "是否激活卡", example = "1")
    private Integer activate;

    // TODO 芋艿：注册用户类型；
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserRespVO.java
@ -52,4 +52,6 @@ public class MemberUserRespVO extends MemberUserBaseVO {
    @Schema(description = "用户经验值", requiredMode  = Schema.RequiredMode.REQUIRED, example = "200")
    private Integer experience;

+    @Schema(description = "是否激活卡", example = "1")
+    private Integer activate;
 }
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationSaveReqVO.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationSaveReqVO.java
@ -31,7 +31,7 @@ public class LitemallReservationSaveReqVO {

    @Schema(description = "预约时间", requiredMode = Schema.RequiredMode.REQUIRED)
    @NotNull(message = "预约时间不能为空")
-    private LocalDateTime reAddTime;
+    private String reAddTime;

    @Schema(description = "预约时间段", requiredMode = Schema.RequiredMode.REQUIRED)
 //    @NotNull(message = "预约时间段不能为空")
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/app/reservation/AppReservationController.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/app/reservation/AppReservationController.java
@ -7,6 +7,7 @@ import cn.iocoder.yudao.module.srbscribe.controller.admin.reservation.vo.Litemal
 import cn.iocoder.yudao.module.srbscribe.controller.admin.reservation.vo.LitemallReservationRespVO;
 import cn.iocoder.yudao.module.srbscribe.controller.admin.reservation.vo.LitemallReservationSaveReqVO;
 import cn.iocoder.yudao.module.srbscribe.dal.dataobject.reservation.LitemallReservationDO;
+import cn.iocoder.yudao.module.srbscribe.dal.dataobject.technician.LitemallTechnicianDO;
 import cn.iocoder.yudao.module.srbscribe.service.reservation.LitemallReservationService;
 import cn.iocoder.yudao.module.srbscribe.util.AjaxResult;
 import cn.iocoder.yudao.module.srbscribe.util.StringUtils;
@ -78,14 +79,40 @@ public class AppReservationController {
 //    }
 //

+//    /**
+//     * 新增预约管理
+//     */
+//    @PostMapping
+//    public CommonResult<Long> createLitemallReservation(@RequestBody LitemallReservationSaveReqVO createReqVO) {
+//        return success(litemallReservationService.createLitemallReservation(createReqVO));
+//    }
+
+//    /**
+//     * 新增预约管理
+//     */
+//    @PostMapping("/add")
+//    public CommonResult<Long> createLitemallReservation(@RequestBody LitemallReservationSaveReqVO litemallReservationDO) {
+//        return success(litemallReservationService.createReservation(litemallReservationDO));
+//    }
+
    /**
     * 新增预约管理
     */
-    @PostMapping
-    public CommonResult<Long> createLitemallReservation(@RequestBody LitemallReservationSaveReqVO createReqVO) {
-        return success(litemallReservationService.createLitemallReservation(createReqVO));
+    @PostMapping("/add")
+    public CommonResult<Long> createLitemallReservation(Integer type,String brandId,String technicianId,String reAddTime,String hsstr,Long userId) {
+
+        LitemallReservationSaveReqVO litemallReservationSaveReqVO = new LitemallReservationSaveReqVO();
+        litemallReservationSaveReqVO.setType(type);
+        litemallReservationSaveReqVO.setBrandId(brandId);
+        litemallReservationSaveReqVO.setTechnicianId(technicianId);
+        litemallReservationSaveReqVO.setReAddTime(reAddTime);
+        litemallReservationSaveReqVO.setHsstr(hsstr);
+        litemallReservationSaveReqVO.setUserId(userId);
+
+        return success(litemallReservationService.createReservation(litemallReservationSaveReqVO));
    }

+
 //    /**
 //     * 修改预约管理
 //     */
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationService.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationService.java
@ -33,6 +33,8 @@ public interface LitemallReservationService {
     */
    Long createLitemallReservation(@Valid LitemallReservationSaveReqVO createReqVO);

+    Long createReservation(LitemallReservationSaveReqVO litemallReservationDO);
+
    /**
     * 更新预约订单
     *
--- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java
+++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java
@ -68,6 +68,13 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic
        return litemallReservation.getId();
    }

+    @Override
+    public Long createReservation(LitemallReservationSaveReqVO litemallReservationDO) {
+        LitemallReservationDO litemallReservation = BeanUtils.toBean(litemallReservationDO, LitemallReservationDO.class);
+        litemallReservationMapper.insert(litemallReservation);
+        return litemallReservation.getId();
+    }
+
    @Override
    public void updateLitemallReservation(LitemallReservationSaveReqVO updateReqVO) {
        // 校验存在
@ -105,7 +112,7 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic
            LitemallBrandDO litemallBrandDO = litemallBrandMapper.selectOne("id", litemallReservationDO.getBrandId());
            litemallReservationDO.setBrandName(litemallBrandDO.getName());

-            LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getId());
+            LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getTechnicianId());
            litemallReservationDO.setTechnicianName(litemallTechnicianDO.getTechnicianName());

            MemberUserDO memberUserDO = memberUserMapper.selectOne("id", litemallReservationDO.getUserId());
Author	SHA1	Message	Date
sonjinyon	6f2f58fbe9	修改预约提交接口	2024-10-14 13:19:30 +08:00
root	ad20ae2c4b	Merge pull request '拼团和秒杀次数整合到get-detail接口' (#41 ) from cxw into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #41	2024-10-12 14:50:00 +08:00
XinWei	e19200eb5b	拼团和秒杀次数整合到get-detail接口	2024-10-12 14:43:32 +08:00
XinWei	d7fbe30e8e	拉镜像超时时间延长	2024-10-12 13:26:17 +08:00
root	9ecb0ff24a	Merge pull request '秒杀活动和拼团活动接口调整' (#40 ) from cxw into master Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone Build is passing Details Reviewed-on: #40	2024-10-12 09:38:26 +08:00
XinWei	8266266387	拼团和秒杀活动获取剩余购买次数接口	2024-10-12 09:35:10 +08:00
XinWei	6c1b724d93	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-11 15:35:47 +08:00
XinWei	7581ebfa77	秒杀活动首页显示正在进行活动修改	2024-10-11 14:23:23 +08:00
root	9ba1fe2fdd	Merge pull request '秒杀和拼团列表过滤已过期活动' (#39 ) from cxw into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #39	2024-10-09 18:26:33 +08:00
XinWei	7954250450	Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw	2024-10-09 16:56:00 +08:00
XinWei	8f7452f7ac	秒杀活动指定显示个数调整	2024-10-09 16:45:06 +08:00
XinWei	ec7046aab0	小程序秒杀活动接口过滤已过期的	2024-10-09 16:39:30 +08:00
XinWei	2a93813e68	小程序拼团活动接口过滤已过期的	2024-10-09 16:22:45 +08:00
XinWei	827563ce06	后台-是否激活卡字段补充	2024-10-09 16:21:56 +08:00
root	0abbd496ae	Merge pull request '修改积分商城订单提交报错' (#38 ) from sjy-two into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #38	2024-10-09 15:42:46 +08:00
root	d1c9060ee8	Merge pull request '更新自定义页面积分页面' (#37 ) from Branch_csl into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #37	2024-10-09 14:22:11 +08:00
77	678b0ef892	优化装修默认列数	2024-10-09 14:20:26 +08:00
root	fc61abbe3b	Merge pull request '修改积分商城报错' (#36 ) from sjy-two into master All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: #36	2024-10-09 11:29:03 +08:00
77	4eca4d4119	更新自定义页面积分页面	2024-10-08 19:58:21 +08:00