!231 优惠券优化

Merge pull request !231 from 疯狂的世界/coupon

!231 优惠券优化
Merge pull request !231 from 疯狂的世界/coupon
13020895 · 芋道源码 · Gitee · d10530c9 · 7887be6e · 13020895
Commit 13020895 authored Sep 03, 2023 by 芋道源码 Committed by Gitee Sep 03, 2023
4 changed files
--- a/src/api/mall/promotion/coupon/couponTemplate.ts
+++ b/src/api/mall/promotion/coupon/couponTemplate.ts
@@ -9,7 +9,7 @@ export interface CouponTemplateVO {
  takeType: number
  usePrice: number
  productScope: number
-  productSpuIds: number[]
+  productScopeValues: number[]
  validityType: number
  validStartTime: Date
  validEndTime: Date

--- a/src/views/mall/product/category/components/ProductCategorySelect.vue
+++ b/src/views/mall/product/category/components/ProductCategorySelect.vue
@@ -13,21 +13,21 @@
 <script lang="ts" setup>
 import { defaultProps, handleTree } from '@/utils/tree'
 import * as ProductCategoryApi from '@/api/mall/product/category'
-import { oneOf } from 'vue-types'
+import { oneOfType } from 'vue-types'
 import { propTypes } from '@/utils/propTypes'
 /** 商品分类选择组件 */
 defineOptions({ name: 'ProductCategorySelect' })
 const props = defineProps({
-  value: oneOf([propTypes.number, propTypes.array.def([])]).isRequired, // 选中的ID
+  modelValue: oneOfType([propTypes.number.def(undefined), propTypes.array.def([])]).def(undefined), // 选中的ID
  multiple: propTypes.bool.def(false) // 是否多选
 })
 /** 选中的分类 ID */
 const selectCategoryId = computed({
  get: () => {
-    return props.value
+    return props.modelValue
  },
  set: (val: number | number[]) => {
    emit('update:modelValue', val)

--- a/src/views/mall/promotion/coupon/components/CouponSendForm.vue
+++ b/src/views/mall/promotion/coupon/components/CouponSendForm.vue
@@ -75,13 +75,13 @@
      </el-table-column>
    </el-table>
    <!-- 分页 -->
-    <!-- TODO 疯狂：可以看看，为啥弹窗没把分页包进去，可能和 footer 有关？ -->
    <Pagination
      v-model:limit="queryParams.pageSize"
      v-model:page="queryParams.pageNo"
      :total="total"
      @pagination="getList"
    />
+    <div class="clear-both"></div>
  </Dialog>
 </template>
 <script lang="ts" setup>

--- a/src/views/mall/promotion/coupon/template/CouponTemplateForm.vue
+++ b/src/views/mall/promotion/coupon/template/CouponTemplateForm.vue
@@ -36,7 +36,6 @@
          </div>
        </div>
      </el-form-item>
-      <!-- TODO 疯狂：要不把 productSpuIds 改成 productScopeValues，更通用？另外，改完后，涉及到优惠劵的匹配逻辑，要补充分类相关的逻辑，例如说获得匹配的优惠劵列表之类的，包括使用卷的时候； -->
      <el-form-item
        label="分类"
        v-if="formData.productScope === PromotionProductScopeEnum.CATEGORY.scope"
@@ -153,7 +152,7 @@
        <el-date-picker
          v-model="formData.validTimes"
          style="width: 240px"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="x"
          type="datetimerange"
          :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]"
        />
@@ -228,8 +227,9 @@ const formData = ref({
  fixedStartTerm: undefined,
  fixedEndTerm: undefined,
  productScope: PromotionProductScopeEnum.ALL.scope,
-  productSpuIds: [],
+  productScopeValues: [], // 商品范围：值为 品类编号列表 或 商品编号列表 ，用于提交
-  productCategoryIds: []
+  productCategoryIds: [], // 仅用于表单，不提交
+  productSpuIds: [] // 仅用于表单，不提交
 })
 const formRules = reactive({
  name: [{ required: true, message: '优惠券名称不能为空', trigger: 'blur' }],
@@ -246,8 +246,8 @@ const formRules = reactive({
  fixedStartTerm: [{ required: true, message: '开始领取天数不能为空', trigger: 'blur' }],
  fixedEndTerm: [{ required: true, message: '开始领取天数不能为空', trigger: 'blur' }],
  productScope: [{ required: true, message: '商品范围不能为空', trigger: 'blur' }],
-  productSpuIds: [{ required: true, message: '商品范围不能为空', trigger: 'blur' }],
+  productSpuIds: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
-  productCategoryIds: [{ required: true, message: '分类范围不能为空', trigger: 'blur' }]
+  productCategoryIds: [{ required: true, message: '分类不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const productSpus = ref<ProductSpuApi.Spu[]>([]) // 商品列表
@@ -313,12 +313,10 @@ const submitForm = async () => {
        formData.value.validTimes && formData.value.validTimes.length === 2
          ? formData.value.validTimes[1]
          : undefined
-    } as CouponTemplateApi.CouponTemplateVO
+    } as unknown as CouponTemplateApi.CouponTemplateVO
-    if (formData.value.productCategoryIds?.length > 0) {
+    // 设置商品范围
-      // 改个名字？加个字段？
+    setProductScopeValues(data)
-      data.productSpuIds = formData.value.productCategoryIds
-    }
    if (formType.value === 'create') {
      await CouponTemplateApi.createCouponTemplate(data)
@@ -355,6 +353,7 @@ const resetForm = () => {
    fixedStartTerm: undefined,
    fixedEndTerm: undefined,
    productScope: PromotionProductScopeEnum.ALL.scope,
+    productScopeValues: [],
    productSpuIds: [],
    productCategoryIds: []
  }
@@ -366,13 +365,36 @@ const resetForm = () => {
 const getProductScope = async () => {
  switch (formData.value.productScope) {
    case PromotionProductScopeEnum.SPU.scope:
+      // 设置商品编号
+      formData.value.productSpuIds = formData.value.productScopeValues
      // 获得商品列表
-      productSpus.value = await ProductSpuApi.getSpuDetailList(formData.value.productSpuIds)
+      productSpus.value = await ProductSpuApi.getSpuDetailList(formData.value.productScopeValues)
+      break
+    case PromotionProductScopeEnum.CATEGORY.scope:
+      await nextTick(() => {
+        let productCategoryIds = formData.value.productScopeValues
+        if (Array.isArray(productCategoryIds) && productCategoryIds.length > 0) {
+          // 单选时使用数组不能反显
+          productCategoryIds = productCategoryIds[0]
+        }
+        // 设置品类编号
+        formData.value.productCategoryIds = productCategoryIds
+      })
+      break
+    default:
+      break
+  }
+}
+/** 设置商品范围 */
+function setProductScopeValues(data: CouponTemplateApi.CouponTemplateVO) {
+  switch (formData.value.productScope) {
+    case PromotionProductScopeEnum.SPU.scope:
+      data.productScopeValues = formData.value.productSpuIds
      break
    case PromotionProductScopeEnum.CATEGORY.scope:
-      // TODO @疯狂：貌似分类不会选中。
+      data.productScopeValues = Array.isArray(formData.value.productCategoryIds)
-      formData.value.productCategoryIds = formData.value.productSpuIds
+        ? formData.value.productCategoryIds
-      formData.value.productSpuIds = []
+        : [formData.value.productCategoryIds]
      break
    default:
      break