Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

Author: LAPTOP-CNV4CMCJ\cheng

src/api/mall/CouponTemplete/CouponTemplete.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+// 获得商品 SKU 选项的列表
+export function getSkuOptionList() {
+  return request({
+    url: '/product/sku/get-option-list',
+    method: 'get',
+  })
+}

src/api/mall/product/sku.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 创建商品spu
+// 创建商品 SPU
 export function createSpu(data) {
   return request({
     url: '/product/spu/create',
@@ -9,7 +9,7 @@ export function createSpu(data) {
   })
 }
 
-// 更新商品spu
+// 更新商品 SPU
 export function updateSpu(data) {
   return request({
     url: '/product/spu/update',
@@ -18,7 +18,7 @@ export function updateSpu(data) {
   })
 }
 
-// 删除商品spu
+// 删除商品 SPU
 export function deleteSpu(id) {
   return request({
     url: '/product/spu/delete?id=' + id,
@@ -34,19 +34,27 @@ export function getSpu(id) {
   })
 }
 
-// 获得商品spu详情
+// 获得商品 SPU 详情
 export function getSpuDetail(id) {
   return request({
     url: '/product/spu/get/detail?id=' + id,
     method: 'get'
   })
 }
 
-// 获得商品spu分页
+// 获得商品 SPU 分页
 export function getSpuPage(query) {
   return request({
     url: '/product/spu/page',
     method: 'get',
     params: query
   })
 }
+
+// 获得商品 SPU 精简列表
+export function getSpuSimpleList() {
+  return request({
+    url: '/product/spu/get-simple-list',
+    method: 'get',
+  })
+}

src/api/mall/product/spu.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 删除优惠劵
+export function deleteCoupon(id) {
+  return request({
+    url: '/promotion/coupon/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得优惠劵分页
+export function getCouponPage(query) {
+  return request({
+    url: '/promotion/coupon/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/mall/promotion/coupon.js

@@ -18,6 +18,19 @@ export function updateCouponTemplate(data) {
   })
 }
 
+// 更新优惠劵模板的状态
+export function updateCouponTemplateStatus(id, status) {
+  const data = {
+    id,
+    status
+  }
+  return request({
+    url: '/promotion/coupon-template/update-status',
+    method: 'put',
+    data: data
+  })
+}
+
 // 删除优惠劵模板
 export function deleteCouponTemplate(id) {
   return request({

src/api/promotion/couponTemplate.js renamed to src/api/mall/promotion/couponTemplate.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建限时折扣活动
+export function createDiscountActivity(data) {
+  return request({
+    url: '/promotion/discount-activity/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新限时折扣活动
+export function updateDiscountActivity(data) {
+  return request({
+    url: '/promotion/discount-activity/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 关闭限时折扣活动
+export function closeDiscountActivity(id) {
+  return request({
+    url: '/promotion/discount-activity/close?id=' + id,
+    method: 'put'
+  })
+}
+
+// 删除限时折扣活动
+export function deleteDiscountActivity(id) {
+  return request({
+    url: '/promotion/discount-activity/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得限时折扣活动
+export function getDiscountActivity(id) {
+  return request({
+    url: '/promotion/discount-activity/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得限时折扣活动分页
+export function getDiscountActivityPage(query) {
+  return request({
+    url: '/promotion/discount-activity/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/mall/promotion/discountActivity.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 创建满减送活动
+export function createRewardActivity(data) {
+  return request({
+    url: '/promotion/reward-activity/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新满减送活动
+export function updateRewardActivity(data) {
+  return request({
+    url: '/promotion/reward-activity/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 关闭满减送活动
+export function closeRewardActivity(id) {
+  return request({
+    url: '/promotion/reward-activity/close?id=' + id,
+    method: 'put'
+  })
+}
+
+// 删除满减送活动
+export function deleteRewardActivity(id) {
+  return request({
+    url: '/promotion/reward-activity/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得满减送活动
+export function getRewardActivity(id) {
+  return request({
+    url: '/promotion/reward-activity/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得满减送活动分页
+export function getRewardActivityPage(query) {
+  return request({
+    url: '/promotion/reward-activity/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/mall/promotion/rewardActivity.js

@@ -278,3 +278,39 @@ export const PromotionProductScopeEnum = {
     name: '指定商品参与'
   }
 }
+
+/**
+ * 营销的条件类型枚举
+ */
+export const PromotionConditionTypeEnum = {
+  PRICE: {
+    type: 10,
+    name: '满 N 元'
+  },
+  COUNT: {
+    type: 20,
+    name: '满 N 件'
+  }
+}
+
+/**
+ * 促销活动的状态枚举
+ */
+export const PromotionActivityStatusEnum = {
+  WAIT: {
+    type: 10,
+    name: '未开始'
+  },
+  RUN: {
+    type: 20,
+    name: '进行中'
+  },
+  END: {
+    type: 30,
+    name: '已结束'
+  },
+  CLOSE: {
+    type: 40,
+    name: '已关闭'
+  }
+}

src/utils/constants.js

@@ -63,7 +63,11 @@ export const DICT_TYPE = {
   // ========== MALL - PROMOTION 模块 ==========
   PROMOTION_DISCOUNT_TYPE: 'promotion_discount_type', // 优惠类型
   PROMOTION_PRODUCT_SCOPE: 'promotion_product_scope', // 营销的商品范围
-  COUPON_TEMPLATE_VALIDITY_TYPE: 'coupon_template_validity_type', // 优惠劵模板的有限期类型
+  PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE: 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
+  PROMOTION_COUPON_STATUS: 'promotion_coupon_status', // 优惠劵的状态
+  PROMOTION_COUPON_TAKE_TYPE: 'promotion_coupon_take_type', // 优惠劵的领取方式
+  PROMOTION_ACTIVITY_STATUS: 'promotion_activity_status', // 优惠活动的状态
+  PROMOTION_CONDITION_TYPE: 'promotion_condition_type', // 营销的条件类型枚举
 }
 
 /**