From 127e6b202edce8b41cdcd3e726eb4fde45b12441 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 13 Aug 2023 00:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=EF=BC=9A=201.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=8B=BC=E5=9B=A2=E6=B4=BB=E5=8A=A8=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=95=86=E5=93=81=E7=9A=84=E6=8B=BC=E5=9B=A2=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E4=BC=9A=E5=AD=98=E5=9C=A8=20*100=20?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../combination/combinationActivity.ts        |  6 ++---
 .../CombinationActivityForm.vue               | 23 ++++++++++---------
 .../combinationActivity.data.ts               |  4 ++--
 .../combination/{ => activity}/index.vue      | 20 +++++-----------
 .../promotion/combination/record/index.vue    |  0
 .../mall/promotion/seckill/activity/index.vue |  2 ++
 .../mall/promotion/seckill/config/index.vue   |  2 ++
 7 files changed, 27 insertions(+), 30 deletions(-)
 rename src/views/mall/promotion/combination/{ => activity}/CombinationActivityForm.vue (91%)
 rename src/views/mall/promotion/combination/{ => activity}/combinationActivity.data.ts (98%)
 rename src/views/mall/promotion/combination/{ => activity}/index.vue (79%)
 create mode 100644 src/views/mall/promotion/combination/record/index.vue

diff --git a/src/api/mall/promotion/combination/combinationActivity.ts b/src/api/mall/promotion/combination/combinationActivity.ts
index 1e211c86..f89264e4 100644
--- a/src/api/mall/promotion/combination/combinationActivity.ts
+++ b/src/api/mall/promotion/combination/combinationActivity.ts
@@ -10,8 +10,8 @@ export interface CombinationActivityVO {
   startTime?: Date
   endTime?: Date
   userSize?: number
-  totalNum?: number
-  successNum?: number
+  totalCount?: number
+  successCount?: number
   orderUserCount?: number
   virtualGroup?: number
   status?: number
@@ -23,7 +23,7 @@ export interface CombinationActivityVO {
 export interface CombinationProductVO {
   spuId: number
   skuId: number
-  activePrice: number // 拼团价格
+  combinationPrice: number // 拼团价格
 }
 
 // 扩展 Sku 配置
diff --git a/src/views/mall/promotion/combination/CombinationActivityForm.vue b/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue
similarity index 91%
rename from src/views/mall/promotion/combination/CombinationActivityForm.vue
rename to src/views/mall/promotion/combination/activity/CombinationActivityForm.vue
index 265eb98e..3c802ede 100644
--- a/src/views/mall/promotion/combination/CombinationActivityForm.vue
+++ b/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue
@@ -19,7 +19,7 @@
           <el-table-column align="center" label="拼团价格(元)" min-width="168">
             <template #default="{ row: sku }">
               <el-input-number
-                v-model="sku.productConfig.activePrice"
+                v-model="sku.productConfig.combinationPrice"
                 :min="0"
                 :precision="2"
                 :step="0.1"
@@ -45,6 +45,7 @@ import { SpuAndSkuList, SpuProperty, SpuSelect } from '@/views/mall/promotion/co
 import { getPropertyList, RuleConfig } from '@/views/mall/product/spu/components'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import { convertToInteger, formatToFraction } from '@/utils'
+import { cloneDeep } from 'lodash-es'
 
 defineOptions({ name: 'PromotionCombinationActivityForm' })
 
@@ -65,8 +66,8 @@ const spuList = ref<CombinationActivityApi.SpuExtension[]>([]) // 选择的 spu
 const spuPropertyList = ref<SpuProperty<CombinationActivityApi.SpuExtension>[]>([])
 const ruleConfig: RuleConfig[] = [
   {
-    name: 'productConfig.activePrice',
-    rule: (arg) => arg > 0.01,
+    name: 'productConfig.combinationPrice',
+    rule: (arg) => arg >= 0.01,
     message: '商品拼团价格不能小于0.01 ！！！'
   }
 ]
@@ -98,13 +99,12 @@ const getSpuDetails = async (
     let config: CombinationProductVO = {
       spuId: spu.id!,
       skuId: sku.id!,
-      activePrice: 0
+      combinationPrice: 0
     }
     if (typeof products !== 'undefined') {
       const product = products.find((item) => item.skuId === sku.id)
       if (product) {
-        // 分转元
-        product.activePrice = formatToFraction(product.activePrice)
+        product.combinationPrice = formatToFraction(product.combinationPrice)
       }
       config = product || config
     }
@@ -162,13 +162,14 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formRef.value.formModel as CombinationActivityApi.CombinationActivityVO
-    const products = spuAndSkuListRef.value.getSkuConfigs('productConfig')
-    products.forEach((item: CombinationProductVO) => {
-      // 拼团价格元转分
-      item.activePrice = convertToInteger(item.activePrice)
+    // 获得拼团商品配置
+    const products = cloneDeep(spuAndSkuListRef.value.getSkuConfigs('productConfig'))
+    products.forEach((item: CombinationActivityApi.CombinationProductVO) => {
+      item.combinationPrice = convertToInteger(item.combinationPrice)
     })
+    const data = formRef.value.formModel as CombinationActivityApi.CombinationActivityVO
     data.products = products
+    // 真正提交
     if (formType.value === 'create') {
       await CombinationActivityApi.createCombinationActivity(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/mall/promotion/combination/combinationActivity.data.ts b/src/views/mall/promotion/combination/activity/combinationActivity.data.ts
similarity index 98%
rename from src/views/mall/promotion/combination/combinationActivity.data.ts
rename to src/views/mall/promotion/combination/activity/combinationActivity.data.ts
index 4da563b7..ad80bfd1 100644
--- a/src/views/mall/promotion/combination/combinationActivity.data.ts
+++ b/src/views/mall/promotion/combination/activity/combinationActivity.data.ts
@@ -122,13 +122,13 @@ const crudSchemas = reactive<CrudSchema[]>([
   },
   {
     label: '开团组数',
-    field: 'totalNum',
+    field: 'totalCount',
     isSearch: false,
     isForm: false
   },
   {
     label: '成团组数',
-    field: 'successNum',
+    field: 'successCount',
     isSearch: false,
     isForm: false
   },
diff --git a/src/views/mall/promotion/combination/index.vue b/src/views/mall/promotion/combination/activity/index.vue
similarity index 79%
rename from src/views/mall/promotion/combination/index.vue
rename to src/views/mall/promotion/combination/activity/index.vue
index f15863b1..3a859dd4 100644
--- a/src/views/mall/promotion/combination/index.vue
+++ b/src/views/mall/promotion/combination/activity/index.vue
@@ -1,4 +1,6 @@
 <template>
+  <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
+
   <!-- 搜索工作栏 -->
   <ContentWrap>
     <Search :schema="allSchemas.searchSchema" @reset="setSearchParams" @search="setSearchParams">
@@ -10,8 +12,7 @@
           type="primary"
           @click="openForm('create')"
         >
-          <Icon class="mr-5px" icon="ep:plus" />
-          新增
+          <Icon class="mr-5px" icon="ep:plus" /> 新增
         </el-button>
       </template>
     </Search>
@@ -65,7 +66,7 @@
 import { allSchemas } from './combinationActivity.data'
 import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
 import CombinationActivityForm from './CombinationActivityForm.vue'
-import { cloneDeep } from 'lodash-es'
+import { sortTableColumns } from '@/hooks/web/useCrudSchemas'
 import { createImageViewer } from '@/components/ImageViewer'
 
 defineOptions({ name: 'PromotionCombinationActivity' })
@@ -100,17 +101,8 @@ const handleDelete = (id: number) => {
 
 /** 初始化 **/
 onMounted(() => {
-  /**
-   TODO
-   后面准备封装成一个函数来操作 tableColumns 重新排列：比如说需求是表单上商品选择是在后面的而列表展示的时候需要调到位置。
-   封装效果支持批量操作，给出 field 和需要插入的位置，例：[{field:'spuId',index: 1}] 效果为把 field 为 spuId 的 column 移动到第一个位置
-   */
-  // 处理一下表格列让商品往前
-  const index = allSchemas.tableColumns.findIndex((item) => item.field === 'spuId')
-  const column = cloneDeep(allSchemas.tableColumns[index])
-  allSchemas.tableColumns.splice(index, 1)
-  // 添加到开头
-  allSchemas.tableColumns.unshift(column)
+  // 获得活动列表
+  sortTableColumns(allSchemas.tableColumns, 'spuId')
   getList()
 })
 </script>
diff --git a/src/views/mall/promotion/combination/record/index.vue b/src/views/mall/promotion/combination/record/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/mall/promotion/seckill/activity/index.vue b/src/views/mall/promotion/seckill/activity/index.vue
index bd244dad..ca114528 100644
--- a/src/views/mall/promotion/seckill/activity/index.vue
+++ b/src/views/mall/promotion/seckill/activity/index.vue
@@ -1,4 +1,6 @@
 <template>
+  <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
+
   <!-- 搜索工作栏 -->
   <ContentWrap>
     <Search :schema="allSchemas.searchSchema" @reset="setSearchParams" @search="setSearchParams">
diff --git a/src/views/mall/promotion/seckill/config/index.vue b/src/views/mall/promotion/seckill/config/index.vue
index 42f40995..5d245ecd 100644
--- a/src/views/mall/promotion/seckill/config/index.vue
+++ b/src/views/mall/promotion/seckill/config/index.vue
@@ -1,4 +1,6 @@
 <template>
+  <doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
+
   <!-- 搜索工作栏 -->
   <ContentWrap>
     <Search :schema="allSchemas.searchSchema" @reset="setSearchParams" @search="setSearchParams">