rabin 3 年之前
父节点
当前提交
b2cbb31a05
共有 4 个文件被更改,包括 34 次插入2 次删除
  1. 15 1
      service/agent/database/order.php
  2. 2 0
      service/agent/lib/Manage.php
  3. 16 0
      service/agent/lib/Tool.php
  4. 1 1
      service/bill/lib/Cron.php

+ 15 - 1
service/agent/database/order.php

@@ -28,7 +28,11 @@ $source_id = function()
     }
     return $array;
 };
-
+$prize_type = array
+(
+    1 => '名额外',
+    2 => '名额内',
+);
 
 $status = array
 (
@@ -695,6 +699,16 @@ return array
             'search'    => 'hidden',
         ),
 
+        'prize_type'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '是否名额内',
+            'default'   => '1',
+            'desc'      => '是否名额内',
+            'match'     => 'is_numeric',
+            'option'    => $prize_type,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

+ 2 - 0
service/agent/lib/Manage.php

@@ -980,6 +980,8 @@ class Manage
                 # 判断是否名额内
                 if (isset($t['prize_type']) && $t['prize_type'] == 2) {
                     Dever::db('agent/member')->update(array('where_id' => $order['mid'], 'prize_type' => $t['prize_type']));
+
+                    Dever::db('agent/order')->update(array('where_id' => $order['id'], 'prize_type' => $t['prize_type']));
                 }
                 $parent_order = $order;
                 $parent_order['mid'] = $t['parent_mid'];

+ 16 - 0
service/agent/lib/Tool.php

@@ -1076,4 +1076,20 @@ class Tool
 
         return 'ok';
     }
+
+    # 同步prize_type
+    public function prizeType_api()
+    {
+        $data = Dever::db('agent/member')->select(array('prize_type' => 2));
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $order = Dever::db('agent/order')->find(array('role' => 8, 'mid' => $v['id']));
+                if ($order) {
+                    Dever::db('agent/order')->update(array('where_id' => $order['id'], 'prize_type' => $v['prize_type']));
+                }
+            }
+        }
+
+        return 'ok';
+    }
 }

+ 1 - 1
service/bill/lib/Cron.php

@@ -578,7 +578,7 @@ class Cron
                 }
 
                 foreach ($member as $k1 => $v1) {
-                    $vinfo = Dever::db('agent/member')->select(array('parent_mid' => $v1['mid'], 'role' => 8));
+                    $vinfo = Dever::db('agent/order')->select(array('parent_mid' => $v1['mid'], 'role' => 8));
                     if ($vinfo) {
                         foreach ($vinfo as $v2) {
                             if ($v2['prize_type'] == 1) {