From c3bb0a2ddcc223401ac95c7447a6e19e641fbf8c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 13 Jan 2024 18:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20=E6=8B=BC=E5=9B=A2=EF=BC=9A?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8B=E5=8D=95=E7=9A=84=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/components/groupon/groupon-card-list.vue |  3 ++-
 pages/goods/groupon.vue                              |  3 ++-
 pages/order/confirm.vue                              |  4 ++++
 sheep/api/trade/order.js                             | 10 ++++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pages/goods/components/groupon/groupon-card-list.vue b/pages/goods/components/groupon/groupon-card-list.vue
index 80eb11ef..2fd8f18a 100644
--- a/pages/goods/components/groupon/groupon-card-list.vue
+++ b/pages/goods/components/groupon/groupon-card-list.vue
@@ -73,7 +73,8 @@
   // 初始化
   onMounted(async () => {
     // 查询参团记录
-    const { data } = await CombinationApi.getHeadCombinationRecordList(props.modelValue.id, 1 , 10);
+    // status = 0 表示未成团
+    const { data } = await CombinationApi.getHeadCombinationRecordList(props.modelValue.id, 0 , 10);
     state.list = data;
   });
 </script>
diff --git a/pages/goods/groupon.vue b/pages/goods/groupon.vue
index e30e9cb0..50bba1c4 100644
--- a/pages/goods/groupon.vue
+++ b/pages/goods/groupon.vue
@@ -1,3 +1,4 @@
+<!-- 拼团商品详情 -->
 <template>
   <s-layout :onShareAppMessage="shareInfo" navbar="goods">
     <!-- 标题栏 -->
@@ -152,7 +153,6 @@
   import CombinationApi from "@/sheep/api/promotion/combination";
   import SpuApi from "@/sheep/api/product/spu";
 
-
   const headerBg = sheep.$url.css('/static/img/shop/goods/groupon-bg.png');
   const btnBg = sheep.$url.css('/static/img/shop/goods/groupon-btn.png');
   const disabledBtnBg = sheep.$url.css(
@@ -226,6 +226,7 @@
   }
 
   // 分享信息
+  // TODO @芋艿：分享的接入
   const shareInfo = computed(() => {
     if (isEmpty(state.activity)) return {};
     return sheep.$platform.share.getShareInfo(
diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index b88bd951..6c04c041 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -208,6 +208,8 @@
       addressId: state.addressInfo.id,
       deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId
     });
     if (code !== 0) {
       return;
@@ -231,6 +233,8 @@
       addressId: state.addressInfo.id,
       deliveryType: 1, // TODO 芋艿：需要支持【门店自提】
       pointStatus: false, // TODO 芋艿：需要支持【积分选择】
+      combinationActivityId: state.orderPayload.combinationActivityId,
+      combinationHeadId: state.orderPayload.combinationHeadId
     });
     if (code !== 0) {
       return;
diff --git a/sheep/api/trade/order.js b/sheep/api/trade/order.js
index a6613cbe..2e744deb 100644
--- a/sheep/api/trade/order.js
+++ b/sheep/api/trade/order.js
@@ -13,6 +13,12 @@ const OrderApi = {
     if (!(data.addressId > 0)) {
       delete data2.addressId;
     }
+    if (!(data.combinationActivityId) > 0) {
+      delete data2.combinationActivityId;
+    }
+    if (!(data.combinationHeadId > 0)) {
+      delete data2.combinationHeadId;
+    }
     // 解决 SpringMVC 接受 List<Item> 参数的问题
     delete data2.items;
     for (let i = 0; i < data.items.length; i++) {
@@ -28,6 +34,10 @@ const OrderApi = {
     return request({
       url: `/app-api/trade/order/settlement?${queryString}`,
       method: 'GET',
+      custom: {
+        showError: true,
+        showLoading: true,
+      },
     });
   },
   // 创建订单