Merge branch 'feat/v20241110-同城联盟卡' into dev

src/views/finance/withdrawal/components/DetailModal.vue

@@ -61,19 +61,19 @@
           {{ formData.summaryNotHsbAmount }}
         </el-descriptions-item>
         <el-descriptions-item label="已认证身份姓名">
-          {{ cardData.name || "未认证" }}
+          {{ cardData.name || '未认证' }}
         </el-descriptions-item>
         <el-descriptions-item label="已认证身份证">
-          {{ cardData.idCard || "未认证" }}
+          {{ cardData.idCard || '未认证' }}
         </el-descriptions-item>
         <el-descriptions-item label="已认证电话号码">
-          {{ cardData.phone || "未认证"}}
+          {{ cardData.phone || '未认证' }}
         </el-descriptions-item>
       </el-descriptions>
     </div>
 
     <el-tabs v-model="tabsValue">
-      <el-tab-pane label="结算列表" name="relatedSettlement" v-if="![3, 4].includes(formData.withdrawalType)">
+      <el-tab-pane label="结算列表" name="relatedSettlement" v-if="![3, 4, 50].includes(formData.withdrawalType)">
         <div v-if="formData.relatedSettlement && formData.relatedSettlement.length" style="margin-top: 32px">
           <el-table
             v-loading="!formData.relatedSettlement.length"
@@ -143,6 +143,33 @@
           <el-table-column align="center" prop="createTime" label="出账时间"></el-table-column>
         </el-table>
       </el-tab-pane>
+
+      <el-tab-pane v-if="[50].includes(formData.withdrawalType)" label="入账列表" name="entry">
+        <el-table :data="formData.allianceCardBuyerConsumptionRecords" border stripe>
+          <el-table-column align="center" type="index" label="#" width="50"></el-table-column>
+          <el-table-column align="center" prop="allianceCardId" width="100" label="联盟卡ID"></el-table-column>
+          <el-table-column align="center" prop="buyerUserId" width="100" label="会员ID"></el-table-column>
+          <el-table-column align="center" prop="shopId" label="商家ID"></el-table-column>
+          <el-table-column align="center" prop="shopName" label="商家名称"></el-table-column>
+          <el-table-column align="center" prop="amount" label="消费金额">
+            <template slot-scope="{ row }">
+              <el-tag type="success" size="mini">￥{{ row.amount || 0 }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="actualAmountReceived" label="实际到账金额">
+            <template slot-scope="{ row }">
+              <el-tag type="success" size="mini">￥{{ row.actualAmountReceived || 0 }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="settlementRatio" label="结算比例">
+            <template slot-scope="{ row }">
+              <el-tag type="primary" size="mini">{{ row.settlementRatio ? row.settlementRatio * 100 + '%' : 0 }}</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="withdrawalNo" label="提现单号" width="200"></el-table-column>
+          <el-table-column align="center" prop="createTime" label="消费时间"  width="200"></el-table-column>
+        </el-table>
+      </el-tab-pane>
     </el-tabs>
   </el-dialog>
 </template>
@@ -150,7 +177,7 @@
 <script>
 import RelatedOrders from './RelatedOrders'
 import LedgerInformation from './LedgerInformation'
-import { withdrawalGetById, withdrawalGetById2,getWithdrawalAccount } from '@/api/withdrawal'
+import { withdrawalGetById, withdrawalGetById2, getWithdrawalAccount } from '@/api/withdrawal'
 
 export default {
   name: 'DetailModal',
@@ -191,7 +218,7 @@ export default {
         summaryNotHsbAmount: ''
       },
       //  身份证信息
-      cardData:{}
+      cardData: {}
     }
   },
   methods: {
@@ -210,7 +237,7 @@ export default {
       const loading = this.$loading({ text: '加载中' })
       try {
         let api = null
-        if (![3, 4].includes(this.formData.withdrawalType)) {
+        if (![3, 4, 50].includes(this.formData.withdrawalType)) {
           api = withdrawalGetById
           this.tabsValue = 'relatedSettlement'
         } else {
@@ -241,15 +268,16 @@ export default {
           summaryHsbSplitedAmount: res.data.summaryHsbSplitedAmount,
           summaryHsbSplitRemainAmount: res.data.summaryHsbSplitRemainAmount,
           summaryNotHsbAmount: res.data.summaryNotHsbAmount,
-          withdrawalType: this.formData.withdrawalType
+          withdrawalType: this.formData.withdrawalType,
+          allianceCardBuyerConsumptionRecords: res.data.allianceCardBuyerConsumptionRecords
         })
       } finally {
         loading.close()
       }
     },
     // 单独用来请求提现的身份证以及手机号姓名等
-    async getWithdrawalInfo(id){
-      let {data} = await getWithdrawalAccount({ shopIds: id })
+    async getWithdrawalInfo(id) {
+      let { data } = await getWithdrawalAccount({ shopIds: id })
       this.cardData = data[0]
     }
   }

src/views/finance/withdrawal/index.vue

@@ -28,9 +28,10 @@
             <el-tag v-else-if="row.withdrawalType === 2" effect="plain" type="success">交易金</el-tag>
             <el-tag v-else-if="row.withdrawalType === 3" effect="plain" type="success">代金券</el-tag>
             <el-tag v-else-if="row.withdrawalType === 4" effect="plain" type="success">余额支付</el-tag>
-            <el-tag v-else-if="row.withdrawalType === 5" effect="plain" type="success">佣金支付</el-tag>
+            <el-tag v-else-if="row.withdrawalType === 5" effect="plain" type="success"></el-tag>
             <el-tag v-else-if="row.withdrawalType === 31" effect="plain" type="warning">充值代金券</el-tag>
             <el-tag v-else-if="row.withdrawalType === 32" effect="plain" type="danger">兑换代金券(非兑换专区)</el-tag>
+            <el-tag v-else-if="row.withdrawalType === 50" effect="plain" type="danger">联盟卡支付</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" width="120" label="提现金额" prop="withdrawalMoney" show-overflow-tooltip />