edit

app/shop/database/sell_order.php

@@ -115,7 +115,12 @@ if ($search_option_shop_type == 1) {
     );
     $refund_search = 'select';
 }
-
+$mul = false;
+if (Dever::load('manage/auth')->checkFunc('menu_61.menu_85', 'piliangfafang', '批量收货')) {
+    $mul = '{status} == 4 && {shop_type} == 2';
+} elseif (Dever::load('manage/auth')->checkFunc('menu_61.menu_218', 'piliangfafang', '批量收货')) {
+    $mul = '{status} == 4 && {shop_type} == 2';
+}
 return array
 (
     # 表名
@@ -132,6 +137,7 @@ return array
     (
         'insert' => 'shop/lib/manage.sellOrderUpdate',
         'update' => 'shop/lib/manage.sellOrderUpdate',
+        'updatemul' => 'shop/lib/manage.setSellOrderStatusMul',
     ),
     # 数据结构
     'struct' => array
@@ -589,6 +595,8 @@ return array
             //'search_after' => '<br />',
             'list'      => true,
             'list_order' => 14,
+            'mul'   => true,
+            'mul_option' => array(5 => '确认收货'),
         ),
 
         'audit'        => array
@@ -699,6 +707,7 @@ return array
         'edit' => false,
         'insert' => false,
         'excel' => $excel,
+        'mul' => $mul,
 
         # 表格使用html模式，默认是js渲染模式
         'list_table' => 'html',

app/shop/lib/Manage.php

@@ -263,6 +263,27 @@ class Manage
         }
     }
 
+    public function setSellOrderStatusMul($id, $name, $data)
+    {
+        Dever::config('base')->hook = true;
+        $status = Dever::param('status', $data);
+        if ($status == 5) {
+            $list = explode(',', $id);
+            if ($list) {
+                foreach ($list as $k => $v) {
+                    if (is_array($v)) {
+                        $id = $v['id'];
+                        $info = Dever::db('shop/sell_order')->one($id);
+                    } else {
+                        $id = $v;
+                        $info = Dever::db('shop/sell_order')->one($id);
+                    }
+                    Dever::load('shop/lib/sell')->finish($info, $info['shop_id']);
+                }
+            }
+        }
+    }
+
     /**
      * 更新信息
      *

app/shop/src/My.php

@@ -15,6 +15,8 @@ class My extends Core
 
 	public function getInfo()
 	{
+		$config = Dever::db('main/sell_config')->find();
+        $this->data['config'] = $config;
 		$this->data['user'] = $this->user;
 
 		# 获取拥有的优惠券数量

service/agent/database/member_agreement.php

@@ -16,12 +16,15 @@ if ($mid) {
 }
 $list_button = array();
 $list_button['new'] = array('查看', '"lib/agreement.location?id={id}"', 'agent');
- if (Dever::load('manage/auth')->checkFunc('agent.member_agreement', 'edit', '作废并生成')) {
+if (Dever::load('manage/auth')->checkFunc('agent.member_agreement', 'edit', '作废并生成')) {
     $list_button['oper'] = array('作废并生成', '"agent/lib/manage.dropAgreement?id={id}"', "{status} == 2");
-    }
+}
 if (Dever::load('manage/auth')->checkFunc('agent.member_agreement', 'edit1', '更新')) {
      $list_button['oper1'] = array('更新', '"agent/lib/manage.upAgreement?id={id}"', "{status} <= 2");
 }
+if (Dever::load('manage/auth')->checkFunc('agent.member_agreement', 'chongxinqianshu', '重新签署')) {
+    $list_button['oper2'] = array('更新并重新签署', '"agent/lib/manage.upSignAgreement?id={id}"', "{status} == 2");
+}
 
 $agreement = function()
 {
@@ -166,6 +169,17 @@ return array
             'list_order' => 7,
         ),
 
+        'sign_old'     => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '合同签名',
+            'default'   => '',
+            'desc'      => '合同签名',
+            'match'     => 'option',
+            //'update'    => 'image',
+            'key'       => '7',
+        ),
+
         'name'      => array
         (
             'type'      => 'varchar-100',
@@ -518,5 +532,21 @@ return array
             'type' => 'one',
             'col' => 'sum(price) as total',
         ),
+
+        'getDataByNew' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'id' => 'yes',
+                'ids' => array('yes-id', '<'),
+                'sign' => array('yes', 'like'),
+                'state' => 1,
+            ),
+            'order' => array('id' => 'asc'),
+            'type' => 'all',
+            //'limit' => '0,2',
+            'col' => 'id,mid,sign',
+        ),
     ),
 );

service/agent/lib/Agreement.php

@@ -217,7 +217,7 @@ class Agreement
 	}
 
     # 更新合同内容
-    public function upContent($id)
+    public function upContent($id, $sign = false)
     {
         $state = false;
         $info = Dever::db('agent/member_agreement')->find($id);
@@ -257,6 +257,11 @@ class Agreement
                 $up['company_pic'] = $member['company_pic'];
                 $role = Dever::db('setting/role')->find($up['role']);
                 $up['agreement_name'] = $this->name($agreement, $up, $role);
+
+                if ($sign) {
+                    $up['sign'] = 'null';
+                    $up['status'] = 1;
+                }
                 $state = Dever::db('agent/member_agreement')->update($up);
             }
         }

service/agent/lib/Import.php

@@ -506,6 +506,38 @@ class Import
         }
     }
 
+    # 合同图片本地化
+    public function agreement_local_api()
+    {
+        $where['ids'] = 50000;
+        $where['sign'] = 'cryl';
+        $data = Dever::db('agent/member_agreement')->getDataByNew($where);
+        $test = Dever::input('test');
+        if ($test == 1) {
+            return $data;
+            print_r($data);die;
+        }
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v['mid'] >= 50000) {
+                    continue;
+                }
+                $member = Dever::db('agent/member')->one($v['mid']);
+                if ($member && $member['sign'] && strstr($v['sign'], 'cryl.')) {
+                    $update = array();
+                    $update['where_id'] = $v['id'];
+                    $update['sign'] = $member['sign'];
+                    $update['sign_old'] = str_replace('https://cryl.yijiuguanfang.com/', 'http://d2.churenyiliao.com:8080/', $v['sign']);
+                    Dever::db('agent/member_agreement')->update($update);
+                } else {
+                    continue;
+                }
+                echo $v['id'];
+                echo "\r\n";
+            }
+        }
+    }
+
     # 图片本地化
     public function local_api()
     {

service/agent/lib/Manage.php

@@ -1035,6 +1035,16 @@ class Manage
         return 'reload';
     }
 
+    public function upSignAgreement_api()
+    {
+        $id = Dever::input('id');
+        if ($id) {
+            Dever::load('agent/lib/agreement')->upContent($id, true);
+        }
+
+        return 'reload';
+    }
+
     public function upAgreement_api()
     {
         $id = Dever::input('id');

service/agent/lib/Order.php

@@ -963,7 +963,7 @@ class Order
                         # 获取直推人数
                         $child_num = Dever::load('invite/api')->getChildNum($v['uid'], 1);
 
-                        if ($parent_level['id'] > 0 && $child_num >= $parent_level['num']) {
+                        if ($parent_level['id'] > 0 && $child_num >= $parent_level['num'] && $role['id'] != 7) {
                             # 达到要求，开始团队分润
                             if ($parent_per > 0) {
                                 $parent_level['value'] = $parent_level['value'] - $parent_per;

service/agent/src/My.php

@@ -1051,7 +1051,14 @@ class My extends Core
         if ($where['id']) {
             $info = Dever::db('agent/member_agreement')->find($where);
             if ($info && $info['status'] == 1) {
-                $state = Dever::db('agent/member_agreement')->update(array('sign' => $sign, 'where_id' => $info['id'], 'status' => 2, 'qdate' => time()));
+                $u = array();
+                $u = array('sign' => $sign, 'where_id' => $info['id'], 'status' => 2);
+                if ($info['qdate'] && $info['qdate'] > 0) {
+                    
+                } else {
+                    $u['qdate'] = time();
+                }
+                $state = Dever::db('agent/member_agreement')->update($u);
                 if ($state) {
                     $role = Dever::db('setting/role')->find($info['role']);
                     $info['sign'] = $sign;