rabin 2 years ago
parent
commit
8c6f1ded69

+ 2 - 0
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;
 
 		# 获取拥有的优惠券数量

+ 11 - 0
service/agent/database/member_agreement.php

@@ -166,6 +166,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',

+ 25 - 0
service/agent/lib/Import.php

@@ -506,6 +506,31 @@ class Import
         }
     }
 
+    # 合同图片本地化
+    public function agreement_local_api()
+    {
+        $data = Dever::db('agent/member_agreement')->select();
+        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($member['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()
     {

+ 1 - 1
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;