优化：平台抽成记录、合伙人佣金结算信息、豆豆和积分信息添加退款信息显示

src/views/marketing/platformCommission/commissionRecord/index.vue

@@ -61,58 +61,97 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="平台抽成" prop="mer_name" min-width="85" align="center">
+        <el-table-column prop="id" label="抽成和佣金" min-width="50" align="center">
-          <template slot-scope="scope">
+          <template slot="header" slot-scope="scope">
-            <el-tag type="success" effect="plain" size="small">{{ scope.row.platform_commission_money || '0.00' }}元</el-tag>
+            抽成和佣金
             <br />
-            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.platform_commission_rate || '0' }}%</el-tag>
+            <el-tag type="info" effect="plain" class="rate-num" size="small">总金额</el-tag>
+            <el-tag effect="plain" class="rate-num" size="small">占有比例</el-tag>
+            <el-tag type="danger" effect="plain" class="rate-num" size="small">退款减少金额</el-tag>
+            <el-tag type="success" effect="plain" size="small">实际有效金额</el-tag>
           </template>
+          <el-table-column label="平台抽成" prop="mer_name" min-width="85" align="center">
+            <template slot-scope="scope">
+              <el-tag type="info" effect="plain" size="small">{{ scope.row.platform_commission_money || '0.00' }}元</el-tag>
+              <br />
+              <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.platform_commission_rate || '0' }}%</el-tag>
+              <br />
+              <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_platform_commission_money || '0' }}元</el-tag>
+              <br />
+              <el-tag type="success" effect="plain" class="rate-num" size="small">{{ scope.row.reality_platform_commission_money || '0' }}元</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="平台佣金" prop="mer_name" min-width="85" align="center">
+            <template slot-scope="scope">
+              <el-tag type="info" effect="plain" size="small">{{ scope.row.commission_platform_money || '0.00' }}元</el-tag>
+              <br />
+              <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_platform_rate || '0' }}%</el-tag>
+              <br />
+              <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_commission_platform_money || '0' }}元</el-tag>
+              <br />
+              <el-tag type="success" effect="plain" class="rate-num" size="small">{{ scope.row.reality_commission_platform_money || '0' }}元</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="合伙人佣金" prop="mer_name" min-width="85" align="center">
+            <template slot-scope="scope">
+              <el-tag type="info" effect="plain" size="small">{{ scope.row.commission_partner_money || '0.00' }}元</el-tag>
+              <br />
+              <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_partner_rate || '0' }}%</el-tag>
+              <br />
+              <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_commission_partner_money || '0' }}元</el-tag>
+              <br />
+              <el-tag type="success" effect="plain" class="rate-num" size="small">{{ scope.row.reality_commission_partner_money || '0' }}元</el-tag>
+              <br />
+              <el-tag v-if="scope.row.commission_partner_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
+              <el-tag v-else-if="scope.row.commission_partner_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
+              <el-tag v-else-if="scope.row.commission_partner_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无合伙人</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="招商员佣金" prop="mer_name" min-width="85" align="center">
+            <template slot-scope="scope">
+              <el-tag type="info" effect="plain" size="small">{{ scope.row.commission_merchants_money || '0.00' }}元</el-tag>
+              <br />
+              <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_merchants_rate || '0' }}%</el-tag>
+              <br />
+              <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_commission_merchants_money || '0' }}元</el-tag>
+              <br />
+              <el-tag type="success" effect="plain" class="rate-num" size="small">{{ scope.row.reality_commission_merchants_money || '0' }}元</el-tag>
+              <br />
+              <el-tag v-if="scope.row.commission_merchants_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
+              <el-tag v-else-if="scope.row.commission_merchants_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
+              <el-tag v-else-if="scope.row.commission_merchants_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无招商员</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="推广员佣金" prop="mer_name" min-width="85" align="center">
+            <template slot-scope="scope">
+              <el-tag type="info" effect="plain" size="small">{{ scope.row.commission_promoter_money || '0.00' }}元</el-tag>
+              <br />
+              <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_promoter_rate || '0' }}%</el-tag>
+              <br />
+              <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_commission_promoter_money || '0' }}元</el-tag>
+              <br />
+              <el-tag type="success" effect="plain" class="rate-num" size="small">{{ scope.row.reality_commission_promoter_money || '0' }}元</el-tag>
+              <br />
+              <el-tag v-if="scope.row.commission_promoter_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
+              <el-tag v-else-if="scope.row.commission_promoter_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
+              <el-tag v-else-if="scope.row.commission_promoter_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无推广员</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="释放金额" prop="mer_name" min-width="85" align="center">
+            <template slot-scope="scope">
+              <el-tag type="info" effect="plain" size="small">{{ scope.row.commission_integral_release_money || '0.00' }}元</el-tag>
+              <br />
+              <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_integral_release_rate || '0' }}%</el-tag>
+              <br />
+              <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_commission_integral_release_money || '0' }}元</el-tag>
+              <br />
+              <el-tag type="success" effect="plain" class="rate-num" size="small">{{ scope.row.reality_commission_integral_release_money || '0' }}元</el-tag>
+            </template>
+          </el-table-column>
         </el-table-column>
-        <el-table-column label="平台分佣" prop="mer_name" min-width="85" align="center">
+        <el-table-column label="退款比例" prop="mer_name" min-width="85" align="center">
           <template slot-scope="scope">
-            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_platform_money || '0.00' }}元</el-tag>
+            <el-tag type="danger" effect="plain" class="rate-num" size="small">{{ scope.row.refund_ratio || '0' }}%</el-tag>
-            <br />
-            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_platform_rate || '0' }}%</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="合伙人分佣" prop="mer_name" min-width="85" align="center">
-          <template slot-scope="scope">
-            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_partner_money || '0.00' }}元</el-tag>
-            <br />
-            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_partner_rate || '0' }}%</el-tag>
-            <br />
-            <el-tag v-if="scope.row.commission_partner_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_partner_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_partner_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无合伙人</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="招商员分佣" prop="mer_name" min-width="85" align="center">
-          <template slot-scope="scope">
-            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_merchants_money || '0.00' }}元</el-tag>
-            <br />
-            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_merchants_rate || '0' }}%</el-tag>
-            <br />
-            <el-tag v-if="scope.row.commission_merchants_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_merchants_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_merchants_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无招商员</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="推广员分佣" prop="mer_name" min-width="85" align="center">
-          <template slot-scope="scope">
-            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_promoter_money || '0.00' }}元</el-tag>
-            <br />
-            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_promoter_rate || '0' }}%</el-tag>
-            <br />
-            <el-tag v-if="scope.row.commission_promoter_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_promoter_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_promoter_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无推广员</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="积分释放" prop="mer_name" min-width="85" align="center">
-          <template slot-scope="scope">
-            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_integral_release_money || '0.00' }}元</el-tag>
-            <br />
-            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_integral_release_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
       </el-table>

src/views/marketing/platformCommission/legumes/index.vue

@@ -13,6 +13,8 @@
           <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
             <el-table-column prop="id" label="ID" min-width="60" align="center"/>
             <el-table-column prop="total_platform_commission_money" label="基金数量" min-width="100" align="center"/>
+            <el-table-column prop="refund_money" label="退款数量" min-width="100" align="center"/>
+            <el-table-column prop="reality_money" label="实际结算基金" min-width="100" align="center"/>
             <el-table-column prop="legumes_price" label="豆豆价格" min-width="100" align="center"/>
             <el-table-column prop="legumes_num" label="豆豆数量" min-width="100" align="center"/>
             <el-table-column prop="legumes_num" label="豆豆数量" min-width="100" align="center"/>
@@ -72,11 +74,39 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="order_money" label="订单金额" min-width="100" align="center"/>
+            <el-table-column label="订单金额" min-width="300" align="center">
+              <el-table-column prop="order_money" label="总金额" min-width="100" align="center"/>
+              <el-table-column prop="refund_order_money" label="退款减少" min-width="100" align="center"/>
+              <el-table-column label="剩余" min-width="100" align="center">
+                <template slot-scope="scope">
+                  {{ (scope.row.order_money - scope.row.refund_order_money).toFixed(2) }}
+                </template>
+              </el-table-column>
+            </el-table-column>
             <el-table-column prop="order_money_rate" label="占比例(%)" min-width="100" align="center"/>
-            <el-table-column prop="get_legumes" label="获得豆豆" min-width="100" align="center"/>
+            <el-table-column label="获得豆" min-width="300" align="center">
-            <el-table-column prop="get_integral" label="获取积分" min-width="100" align="center"/>
+              <el-table-column prop="get_legumes" label="总获得" min-width="100" align="center"/>
-            <el-table-column prop="use_integral" label="已使用积分" min-width="100" align="center"/>
+              <el-table-column prop="refund_get_legumes" label="退款减少" min-width="100" align="center"/>
+              <el-table-column label="剩余" min-width="100" align="center">
+                <template slot-scope="scope">
+                  {{ (scope.row.get_legumes - scope.row.refund_get_legumes).toFixed(2) }}
+                </template>
+              </el-table-column>
+            </el-table-column>
+            <el-table-column label="积分" min-width="400" align="center">
+              <el-table-column label="积分上限" min-width="100" align="center">
+                <template slot-scope="scope">
+                  {{ (scope.row.order_money - scope.row.refund_order_money).toFixed(2) }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="get_integral" label="已获取积分" min-width="100" align="center"/>
+              <el-table-column prop="use_integral" label="已使用积分" min-width="100" align="center"/>
+              <el-table-column label="剩余可用" min-width="100" align="center">
+                <template slot-scope="scope">
+                  {{ (scope.row.get_integral - scope.row.use_integral).toFixed(2) }}
+                </template>
+              </el-table-column>
+            </el-table-column>
             <el-table-column prop="create_time" label="处理时间" min-width="150" align="center"/>
             <el-table-column label="状态" min-width="100" align="center">
               <template slot-scope="scope">
@@ -126,10 +156,20 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="total_get_legumes" label="持有豆豆" min-width="150" align="center"/>
+            <el-table-column label="豆信息" min-width="300" align="center">
+              <el-table-column prop="total_get_legumes" label="总持有" min-width="100" align="center"/>
+              <el-table-column prop="total_refund_get_legumes" label="退款减少" min-width="100" align="center"/>
+              <el-table-column label="剩余" min-width="100" align="center">
+                <template slot-scope="scope">
+                  {{ (scope.row.total_get_legumes - scope.row.total_refund_get_legumes).toFixed(2) }}
+                </template>
+              </el-table-column>
+            </el-table-column>
             <el-table-column label="已获取积分 / 积分上限" min-width="200" align="center">
               <template slot-scope="scope">
-                <el-tag type="success" effect="dark">{{ scope.row.total_get_integral }} / {{ scope.row.total_order_money }}</el-tag>
+                <el-tag type="success" effect="dark">
+                  {{ scope.row.total_get_integral }} / {{ (scope.row.total_order_money - scope.row.total_refund_order_money).toFixed(2) }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column prop="total_freeze_integral" label="冻结中积分" min-width="150" align="center"/>

src/views/marketing/platformCommission/partner/index.vue

@@ -4,6 +4,8 @@
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
         <el-table-column prop="id" label="ID" min-width="60" align="center"/>
         <el-table-column prop="total_commission" label="周期总佣金" min-width="100" align="center"/>
+        <el-table-column label="退款金额" prop="refund_money" min-width="150" align="center"/>
+        <el-table-column label="实际结算金额" prop="reality_money" min-width="150" align="center"/>
         <el-table-column prop="total_weight_value" label="周期总权重值" min-width="100" align="center"/>
         <el-table-column prop="total_people" label="分佣总人数" min-width="100" align="center"/>
         <el-table-column label="周期时间段" min-width="300" align="center">