Merge remote-tracking branch 'yudao/dev' into dev-to-dev

src/api/mall/promotion/bargain/bargainActivity.ts

@@ -57,6 +57,11 @@ export const updateBargainActivity = async (data: BargainActivityVO) => {
   return await request.put({ url: '/promotion/bargain-activity/update', data })
 }
 
+// 关闭砍价活动
+export const closeBargainActivity = async (id: number) => {
+  return await request.put({ url: '/promotion/bargain-activity/close?id=' + id })
+}
+
 // 删除砍价活动
 export const deleteBargainActivity = async (id: number) => {
   return await request.delete({ url: '/promotion/bargain-activity/delete?id=' + id })

src/api/mall/promotion/combination/combinationActivity.ts

@@ -55,6 +55,11 @@ export const updateCombinationActivity = async (data: CombinationActivityVO) =>
   return await request.put({ url: '/promotion/combination-activity/update', data })
 }
 
+// 关闭拼团活动
+export const closeCombinationActivity = async (id: number) => {
+  return await request.put({ url: '/promotion/bargain-combination/close?id=' + id })
+}
+
 // 删除拼团活动
 export const deleteCombinationActivity = async (id: number) => {
   return await request.delete({ url: '/promotion/combination-activity/delete?id=' + id })