同步服务器代码

application/admin/controller/users/Agent.php

@@ -4,6 +4,7 @@ namespace app\admin\controller\users;
 
 use app\common\controller\Backend;
 use app\admin\controller\auth\Admin;
+use app\admin\model\device\Chargedevice;
 use think\Db;
 use think\Exception;
 
@@ -64,6 +65,9 @@ class Agent extends Backend
             ->where($where)
             ->order($sort, $order)
             ->paginate($limit);
+        foreach($list as $k=>$v){
+            $list[$k]['deviceCount']=Chargedevice::where(['user_id'=>$v['agent_user_id']])->count('1');
+        }
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }

application/admin/controller/users/Withdraw.php

@@ -210,7 +210,7 @@ class Withdraw extends Backend
                 $bankcard = $this->Bankcardmodel->where(['id' =>$val['bankcard_id']])->find();
                 switch ($val['withdraw_way']){
                     case 1://提现至零钱
-                        $result = $wxpayConstants->crteateMchPayV2($usersinfo['wx_openid'], $desc, $val['cash_sn'], $val['money'], $val['name'], $jsonMap);
+                        $result = $wxpayConstants->transfer($usersinfo['wx_openid'], $desc, $val['cash_sn'], $val['money'], $val['name'], $jsonMap);
                         break;
                     case 2://提现至银行卡
                         if($withraw_money <= 1000*100){

application/api/controller/Createorder.php

@@ -253,34 +253,69 @@ class Createorder extends Api
         if ($siteList) {
             //遍历所有设备写入订单数据
             foreach ($siteList as $k => $v) {
-                if ($v['profit_rank'] == 1) {
-                    //生成的充电订单数
-                    $chargeOrderNum = 10;
-                    //生成的包月订单数
-                    $chargeCardOrderNum = 2;
-                    //生成的广告订单数
-                    $chargeAdOrderNum = 12;
-                } elseif ($v['profit_rank'] == 2) {
-                    //生成的充电订单数
-                    $chargeOrderNum = 12;
-                    //生成的包月订单数
-                    $chargeCardOrderNum = 2;
-                    //生成的广告订单数
-                    $chargeAdOrderNum = 15;
-                } elseif ($v['profit_rank'] == 3) {
-                    //生成的充电订单数
-                    $chargeOrderNum = 15;
-                    //生成的包月订单数
-                    $chargeCardOrderNum = 1;
-                    //生成的广告订单数
-                    $chargeAdOrderNum = 15;
-                } elseif ($v['profit_rank'] == 4) {
-                    //生成的充电订单数
-                    $chargeOrderNum = 11;
-                    //生成的包月订单数
-                    $chargeCardOrderNum = 2;
-                    //生成的广告订单数
-                    $chargeAdOrderNum = 13;
+                //分为两个周期，第一个周期，第一年，每月平均2600左右，第二个周期，第二年后，每月平均1300左右
+                $secondYear = strtotime("+1 year", $v['authorizetime']);
+                $fourYear = strtotime("+5 year", $v['authorizetime']);
+                if (time() <= $secondYear) {
+                    if ($v['profit_rank'] == 1) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 10;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 2;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 12;
+                    } elseif ($v['profit_rank'] == 2) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 12;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 2;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 15;
+                    } elseif ($v['profit_rank'] == 3) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 15;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 1;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 15;
+                    } elseif ($v['profit_rank'] == 4) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 11;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 2;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 13;
+                    }
+                }else{
+                    if ($v['profit_rank'] == 1) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 5;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 1;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 6;
+                    } elseif ($v['profit_rank'] == 2) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 6;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 1;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 8;
+                    } elseif ($v['profit_rank'] == 3) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 8;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 1;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 8;
+                    } elseif ($v['profit_rank'] == 4) {
+                        //生成的充电订单数
+                        $chargeOrderNum = 6;
+                        //生成的包月订单数
+                        $chargeCardOrderNum = 1;
+                        //生成的广告订单数
+                        $chargeAdOrderNum = 7;
+                    }
                 }
                 //是否需要生成订单标记
                 $addOrderFlag = 0;

public/assets/js/backend/users/agent.js

@@ -43,11 +43,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'mobile', title: __('Mobile'), operate: 'LIKE',visible:false},
                         {field: 'identity_number', title: __('Identity_number'), operate: 'LIKE',visible:true},
                         {field: 'parent_user_id', title: __('Parent_user_id'), operate: false,visible:false},
-                        {field: 'area.MergerName', title: __('所属区域')},
+                        // {field: 'area.MergerName', title: __('所属区域')},
                        /* {field: 'city_id', title: __('City_id')},
                         {field: 'area_id', title: __('Area_id')},*/
-                        {field: 'detail_address', title: __('Detail_address'), operate: 'LIKE'},
-                        {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.status},
+                        // {field: 'detail_address', title: __('Detail_address'), operate: 'LIKE'},
+                        // {field: 'type', title: __('Type'), searchList: {"1":__('Type 1'),"2":__('Type 2')}, formatter: Table.api.formatter.status},
+                        {field: 'deviceCount', title: __('deviceCount'), operate: 'LIKE'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,