From 7da77cf19d8b64b22d4a67a222d113920dc67411 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Fri, 13 May 2022 14:26:29 +0800
Subject: [PATCH] edit-admin-order_list

---
 admin/controllers/receiver/orderv2/Orders.php | 18 ++++++++++
 admin/libraries/Ordersv2List.php              |  3 +-
 admin/views/auto/cars/get.php                 |  2 ++
 admin/views/auto/cars/lists.php               | 12 +++++--
 admin/views/receiver/orderv2/edit_status.php  | 15 ++++++++
 admin/views/receiver/orderv2/lists.php        |  4 +++
 common/libraries/entity/Deal_entity.php       | 34 +++++++++++--------
 7 files changed, 68 insertions(+), 20 deletions(-)
 create mode 100644 admin/views/receiver/orderv2/edit_status.php

diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index ee306b26..93f287b0 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -942,4 +942,22 @@ class Orders extends HD_Controller
             return $this->show_json(SYS_CODE_FAIL, '保存失败');
         }
     }
+    //修改支付订单状态
+    public function edit_status(){
+        if($this->input->method()=='post'){
+            $id = $this->input->post('id');
+            $row = $this->receiver_orders_v2_model->get(['id'=>$id]);
+            if(!$row){
+                return $this->show_json(SYS_CODE_FAIL, '订单不存在');
+            }
+            $res = $this->receiver_orders_v2_model->update(['status'=>2],['id'=>$id]);
+            if($res){
+                $this->app_liche_orders_model->update(['status'=>-1],['o_id'=>$row['id']]);
+                return $this->show_json(SYS_CODE_SUCCESS, '修改成功');
+            }else{
+                return $this->show_json(SYS_CODE_FAIL, '保存失败');
+            }
+        }
+        return $this->show_view('receiver/orderv2/edit_status');
+    }
 }
diff --git a/admin/libraries/Ordersv2List.php b/admin/libraries/Ordersv2List.php
index a827a397..5efd2c1d 100644
--- a/admin/libraries/Ordersv2List.php
+++ b/admin/libraries/Ordersv2List.php
@@ -218,7 +218,7 @@ class Ordersv2List
         if ($params['status_pid'] == 4) { //交付需要开票后才显示
             $where["{$this->t1}.id in (select o_id from lc_receiver_order_status where pid_status=3 and status=1)"] = null;
         }
-        if (strlen($params['status_pid']) && $params['status_pid']) {
+        if (strlen($params['status_pid']) && $params['status_pid'] && $params['status_pid']!=21) {
             $where["{$this->t1}.id>="] = Orders_v2_entity::V2_START_ID;
         }
 
@@ -229,7 +229,6 @@ class Ordersv2List
         } else {
             $orderby = "{$this->t1}.c_time desc";
         }
-//        print_r($params);exit;
         if (strlen($params['status_pid']) && $params['status'] && $params['status_pid']!=21) {
             $where["{$this->t2}.pid_status"] = $params['status_pid'];
             $up_key = $params['status'] + 1;
diff --git a/admin/views/auto/cars/get.php b/admin/views/auto/cars/get.php
index d64b0c05..8ebe4757 100644
--- a/admin/views/auto/cars/get.php
+++ b/admin/views/auto/cars/get.php
@@ -13,6 +13,7 @@
             <span>元</span>
         </div>
     </div>
+    <!--
     <div class="am-form-group wp50 fl">
         <label class="am-para-label">定金：</label>
         <div class="am-para-input">
@@ -69,6 +70,7 @@
             <span>元</span>
         </div>
     </div>
+    -->
     <div class="am-form-group" style="margin-bottom: 2rem">
         <div class="am-para-input"><button class="am-btn am-btn-secondary" type="button" @click="saveEdit">提交</button></div>
     </div>
diff --git a/admin/views/auto/cars/lists.php b/admin/views/auto/cars/lists.php
index 2604e7c5..6a5d108a 100644
--- a/admin/views/auto/cars/lists.php
+++ b/admin/views/auto/cars/lists.php
@@ -49,8 +49,9 @@
                     <label><input type="checkbox" data-check-target=".ids"></label>
                     <span>ID</span>
                 </th>
-                <th width="9%"><span>裸车报价</span></th>
-                <th width="7%"><span>车辆底价</span></th>
+                <th width="30%"><span>裸车报价</span></th>
+                <th width="30%"><span>车辆底价</span></th>
+                <!--
                 <th width="7%"><span>定金</span></th>
                 <th width="7%"><span>保险报价</span></th>
                 <th width="7%"><span>精品报价</span></th>
@@ -59,13 +60,14 @@
                 <th width="7%"><span>公司加价</span></th>
                 <th width="9%"><span>一级分销佣金</span></th>
                 <th width="9%"><span>二级分销佣金</span></th>
+                -->
                 <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
                 <template v-for="(v,i) in lists">
                     <tr class="tl">
-                        <td colspan="12">车型：<span style="font-weight: 600;color:#FF7F50;">{{v.title}}</span></td>
+                        <td colspan="4">车型：<span style="font-weight: 600;color:#FF7F50;">{{v.title}}</span></td>
                     </tr>
                     <tr >
                         <td>
@@ -75,6 +77,7 @@
                         <template v-if="1==v.edit">
                             <td><input style="width: 100%" type="text" name="price_car" v-model="info_edit.price_car" placeholder=""></td>
                             <td><input style="width: 100%" type="text" name="price_floor" v-model="info_edit.price_floor" placeholder=""></td>
+                            <!--
                             <td><input style="width: 100%" type="text" name="price_book" v-model="info_edit.price_book" placeholder=""></td>
                             <td><input style="width: 100%" type="text" name="price_insure" v-model="info_edit.price_insure" placeholder=""></td>
                             <td><input style="width: 100%" type="text" name="price_fine" v-model="info_edit.price_fine" placeholder=""></td>
@@ -83,10 +86,12 @@
                             <td><input style="width: 100%" type="text" name="price_coplus" v-model="info_edit.price_coplus" placeholder=""></td>
                             <td><input style="width: 100%" type="text" name="brokerage_1" v-model="info_edit.brokerage_1" placeholder=""></td>
                             <td><input style="width: 100%" type="text" name="brokerage_2" v-model="info_edit.brokerage_2" placeholder=""></td>
+                            -->
                         </template>
                         <template v-else>
                             <td @dblclick="set_edit(i,1)">{{v.price_car}}</td>
                             <td @dblclick="set_edit(i,1)">{{v.price_floor}}</td>
+                            <!--
                             <td @dblclick="set_edit(i,1)">{{v.price_book}}</td>
                             <td @dblclick="set_edit(i,1)">{{v.price_insure}}</td>
                             <td @dblclick="set_edit(i,1)">{{v.price_fine}}</td>
@@ -95,6 +100,7 @@
                             <td @dblclick="set_edit(i,1)">{{v.price_coplus}}</td>
                             <td @dblclick="set_edit(i,1)">{{v.brokerage_1}}</td>
                             <td @dblclick="set_edit(i,1)">{{v.brokerage_2}}</td>
+                            -->
                         </template>
                         <td>
                             <template v-if="1==v.edit">
diff --git a/admin/views/receiver/orderv2/edit_status.php b/admin/views/receiver/orderv2/edit_status.php
new file mode 100644
index 00000000..3a954e0a
--- /dev/null
+++ b/admin/views/receiver/orderv2/edit_status.php
@@ -0,0 +1,15 @@
+<form class="am-form am-form-horizontal" action="/receiver/orderv2/orders/edit_status" data-auto="true" method="post"
+      style="width: 90%;padding-top: 10px">
+    <div class="am-form-group">
+        <label class="am-para-label">订单id：</label>
+        <div class="am-para-input">
+            <input type="text" value="" name="id"/>
+        </div>
+    </div>
+
+    <div class="am-form-group" style="margin-bottom: 2rem">
+        <div class="am-para-input">
+            <button class="am-btn am-btn-secondary" type="submit">确定</button>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/admin/views/receiver/orderv2/lists.php b/admin/views/receiver/orderv2/lists.php
index 4413991e..2bfc7d8c 100644
--- a/admin/views/receiver/orderv2/lists.php
+++ b/admin/views/receiver/orderv2/lists.php
@@ -228,6 +228,10 @@
                     <button type="button" @click="export_out(0)" class="am-btn am-btn-success am-btn-sm w100">导出
                     </button>
                 </div>
+                <div class="am-form-group fl ml10">
+                    <a type="button" data-modal="/receiver/orderv2/orders/edit_status" class="am-btn am-btn-success am-btn-sm w100">退款
+                    </a>
+                </div>
                 <!--
                 <div class="am-form-group fl ml10">
                     <button type="button" @click="export_out(1)" class="am-btn am-btn-success am-btn-sm">导出保险明细
diff --git a/common/libraries/entity/Deal_entity.php b/common/libraries/entity/Deal_entity.php
index fcb2639f..bd6d869a 100755
--- a/common/libraries/entity/Deal_entity.php
+++ b/common/libraries/entity/Deal_entity.php
@@ -54,19 +54,20 @@ class Deal_entity
         if($this->ci->mdDealLog->get(['ex_id'=>$clue['id'],'status>='=>0])){
             return array('code' => 0, 'msg' => '该线索已存在分销记录');
         }
-        $car = $this->app_licheb_brokerage_model->get(['biz_id'=>$order['biz_id']],'brokerage_1,brokerage_2');
-        if(!$car){
-            $where = [
-                'brand_id' => $order['brand_id'],
-                's_id' => $order['s_id'],
-                'v_id' => $order['v_id'],
-                'status' => 1
-            ];
-            $car = $this->ci->auto_cars_model->get($where,'brokerage_1,brokerage_2');
-        }
-        if(!$car['brokerage_1'] && !$car['brokerage_2']){
-            return array('code' => 0, 'msg' => '该车辆未设置分销佣金');
-        }
+//        $car = $this->app_licheb_brokerage_model->get(['biz_id'=>$order['biz_id']],'brokerage_1,brokerage_2');
+//        if(!$car){
+//            $where = [
+//                'brand_id' => $order['brand_id'],
+//                's_id' => $order['s_id'],
+//                'v_id' => $order['v_id'],
+//                'status' => 1
+//            ];
+//            $car = $this->ci->auto_cars_model->get($where,'brokerage_1,brokerage_2');
+//        }
+//
+//        if(!$car['brokerage_1'] && !$car['brokerage_2']){
+//            return array('code' => 0, 'msg' => '该车辆未设置分销佣金');
+//        }
         $app_uid = $clue['recommend_id'];
         $reU = $this->ci->mdUser->get(array('id' => $app_uid), 'id,dealer,up_uid');
         if (!$reU) {
@@ -76,8 +77,11 @@ class Deal_entity
             return array('code' => 0, 'msg' => '不是分销用户');
         }
         $res = array();
-        $brokerage_1 = $car['brokerage_1'];
-        $brokerage_2 = $car['brokerage_2'];
+//        $brokerage_1 = $car['brokerage_1'];
+//        $brokerage_2 = $car['brokerage_2'];
+        //写死分销金额
+        $brokerage_1 = 100;
+        $brokerage_2 = 600;
         $brokerage = $brokerage_1 + $brokerage_2; 
         $reU2 = $this->ci->mdUser->get(array('id' => $reU['up_uid']), 'dealer');
         if ($reU['up_uid'] && $reU2['dealer']) {//存在上一级并且是分销人员