财务管理--更新

Application/Home/Controller/FinanceController.class.php

@@ -2,6 +2,7 @@
 
 namespace Home\Controller;
 
+use Admin\Model\WithdrawModel;
 use Base\Model\Model;
 use OT\DataDictionary;
 use Base\Repository\PromoteRepository;
@@ -395,6 +396,7 @@ class FinanceController extends BaseController
         $begTime = strtotime(date('Y-m-d', strtotime($initBegTime)));
         $endTime = strtotime(date('Y-m-d', strtotime($initEndTime))) + 3600 * 24;
         $status = '';
+        $settlementType = intval(I('settlement_type', 0));
 
         $parameter['p'] = $page;
         $parameter['row'] = $row;
@@ -419,8 +421,11 @@ class FinanceController extends BaseController
                 $map['status'] = $status;
             }
         }
+        if (!empty($settlementType)) {
+            $map['settlement_type'] = $settlementType;
+        }
 
-        $data = $model->field('id, widthdraw_number, create_time, settlement_begin_time, settlement_end_time, sum_money, status, respond, transfer_proof, op_id, op_type, last_op_id, last_op_type')
+        $data = $model->field('id, widthdraw_number, create_time, settlement_begin_time, settlement_end_time, sum_money, status, respond, transfer_proof, op_id, op_type, last_op_id, last_op_type, settlement_type')
             ->where($map)
             ->order('id desc')
             ->page($page, $row)
@@ -439,6 +444,7 @@ class FinanceController extends BaseController
                 $list['last_op_id'] = $this->getOpIdByType($list['last_op_id'], $list['last_op_type']);
                 $list['op_type'] = getPromoteWithdrawOpType($list['op_type']);
                 $list['last_op_type'] = getPromoteWithdrawOpType($list['last_op_type']);
+                $list['settlement_type_text'] = WithdrawModel::$settlementTypeList[$list['settlement_type']] ?? '未知';
                 switch ($list['status']) {
                     case -2:
                         $list['status_name'] = '<span style="color: #bbbaba;">' . $list['status_name'] . '</span>';
@@ -454,6 +460,8 @@ class FinanceController extends BaseController
 
         $page = set_pagination($count, $row, $parameter);
 
+        $settlementTypeList = WithdrawModel::$settlementTypeList;
+
         $this->assign('listData', $data);
         $this->assign('count', $count);
         $this->assign('initBegTime', $initBegTime);
@@ -462,6 +470,7 @@ class FinanceController extends BaseController
         $this->assign('_page', $page);
         $this->assign('meta_title', $metaTitle);
         $this->assign('modelList', $modelList);
+        $this->assign('settlementTypeList', $settlementTypeList);
         $this->display();
     }
 

Application/Home/View/default/Finance/settlementDtl.html

@@ -143,8 +143,8 @@
                 <th>订单总额</th>
                 <th>直充</th>
                 <th>内充</th>
-                <th>分成比例(直充|内充)</th>
-                <th>收益</th>
+<!--                <th>分成比例(直充|内充)</th>-->
+<!--                <th>收益</th>-->
                 <th>充值时间</th>
                 <th>订单状态</th>
               </tr>
@@ -170,8 +170,8 @@
                       <td>{$vo.pay_amount}</td>
                       <td>0.00</td>
                     </if>
-                    <td>{$vo.selle_ratio}%|{$vo.selle_ratio}%</td>
-                    <td>{$vo.income}</td>
+<!--                    <td>{$vo.selle_ratio}%|{$vo.selle_ratio}%</td>-->
+<!--                    <td>{$vo.income}</td>-->
                     <td>{$vo.pay_time}</td>
                     <td>{$vo.selle_status}</td>
                   </tr>
@@ -184,8 +184,8 @@
                   <td>{$total.pay_amount}</td>
                   <td>{$total.direct_pay_amount}</td>
                   <td>{$total.inner_pay_amount}</td>
-                  <td>--</td>
-                  <td>{$total.income}</td>
+<!--                  <td>&#45;&#45;</td>-->
+<!--                  <td>{$total.income}</td>-->
                   <td>--</td>
                   <td>--</td>
                 </tr>

Application/Home/View/default/Finance/withdrawRecord.html

@@ -97,6 +97,15 @@
                  value="{:I('widthdraw_number','')}">
         </div>
 
+        <div class="form-group normal_space">
+          <select name="settlement_type" class="select_gallery">
+            <option value="">提现模式</option>
+            <?php foreach (getPromoteWithdrawSettlementType() as $key => $value) :?>
+            <option value="<?=$key?>"><?=$value?></option>
+            <?php endforeach;?>
+          </select>
+        </div>
+
         <div class="form-group normal_space">
           <label class="form-title select-title" style="position: relative;">交易时间：</label>
           <div class="select-time">
@@ -151,6 +160,7 @@
                 <th>提现日期</th>
                 <th>结算开始日期</th>
                 <th>结算截止日期</th>
+                <th>提现模式</th>
                 <th>操作人</th>
                 <th>操作人类型</th>
                 <th>最后操作人</th>
@@ -175,6 +185,7 @@
                     <td>{$vo.create_time}</td>
                     <td>{$vo.settlement_begin_time}</td>
                     <td>{$vo.settlement_end_time}</td>
+                    <td>{$vo.settlement_type_text}</td>
                     <td>{$vo.op_id}</td>
                     <td>{$vo.op_type}</td>
                     <td>{$vo.last_op_id}</td>
@@ -226,6 +237,7 @@
   <script type="text/javascript">
       $().ready(function () {
         setValue('row', '{:I("get.row",10)}');
+        setValue('settlement_type', '{:I("get.settlement_type",0)}');
           var date = "{$setdate}";
           $('#sdate').datetimepicker({
               format: 'yyyy-mm-dd',