edit

app/card/database/info.php

@@ -216,6 +216,8 @@ return array
             'fast' => array('生成卡号', '"add&where_id=1&search_option_card_id={id}"', '{status} == 1'),
 
             'list1' => array('卡号列表', '"code&search_option_card_id={id}&oper_table=info"'),
+
+            'location1' => array('商品设置', Dever::url('lib/goods_set.home', 'card')),
         ),
     ),
 

app/card/lib/Goods_set.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Agent\Lib;
+namespace Card\Lib;
 
 use Dever;
 
@@ -15,8 +15,49 @@ class Goods_set
     # 获取商品列表
     public function goods_api()
     {
+        $result = array();
         $id = Dever::input('card_id', 1);
-        return Dever::load('agent/lib/set')->getData($id);
+        $where['project_id'] = 1;
+        $data = Dever::db('category/info')->getTop($where);
+        if ($data) {
+            $i = 0;
+            foreach ($data as $k => $v) {
+
+                $result[$i]['id'] = $v['id'];
+                $result[$i]['name'] = $v['name'];
+                $result[$i]['select'] = 2;
+                $result[$i]['del'] = 1;
+                $result[$i]['children'] = array();
+
+                $w['top_category_id'] = $v['id'];
+                $goods = Dever::db('goods/info')->select($w);
+                if ($goods) {
+                    $i++;
+
+                    foreach ($goods as $v1) {
+                        $children = array
+                        (
+                            'id' => $v['id'] . '-' . $v1['id'],
+                            'name' => $v1['name'],
+                            'del' => 1,
+                            'select' => 2,
+                            'end' => true,
+                        );
+
+                        $bind = Dever::db('card/info_goods')->find(array('card_id' => $id, 'goods_id' => $v1['id']));
+
+                        if ($bind) {
+                            $children['select'] = 1;
+                        }
+                        $result[$i]['children'][] = $children;
+                    }
+                } else {
+                    unset($result[$i]);
+                }
+            }
+        }
+
+        return $result;
     }
 
     # 设置商品
@@ -27,7 +68,7 @@ class Goods_set
         $data['card_id'] = Dever::input('id', 1);
         Dever::setInput('card_id', $data['card_id']);
         $data['host'] = Dever::url('lib/goods_set.home?id=' . $data['card_id'], 'card');
-        $data['url'] = Dever::url('lib/goods_set.goods?card_id=' . $data['card_id'], 'card');
+        $data['url'] = Dever::url('lib/goods_set.goods?json=1&card_id=' . $data['card_id'], 'card');
         $data['submit'] = Dever::url('lib/goods_set.action_commit?json=1', 'card');
 
         return Dever::render('setGoods', $data);
@@ -41,25 +82,15 @@ class Goods_set
             Dever::alert('请传入商品');
         }
         $goods = Dever::json_decode($goods);
-        $prize_id = Dever::input('prize_id');
+        $card_id = Dever::input('card_id');
 
-        $where['option_prize_id'] = $prize_id;
+        $where['option_card_id'] = $card_id;
         $where['set_state'] = 2;
-        Dever::db('setting/prize_goods')->updates($where);
+        Dever::db('goods/info_goods')->updates($where);
 
         foreach ($goods as $k => $v) {
             $type = 1;
             $type_id = $k;
-            $sku_id = -1;
-            if (strstr($k, '_')) {
-                $temp = explode('_', $k);
-                $type_id = $temp[0];
-                $type = $temp[1];
-            } elseif (strstr($k, '-')) {
-                $temp = explode('-', $k);
-                $type_id = $temp[0];
-                $sku_id = $temp[1];
-            }
             
             if ($v['total'] <= 0) {
             	continue;
@@ -67,22 +98,21 @@ class Goods_set
             $w = array();
             $w['type'] = $type;
             $w['type_id'] = $type_id;
-            $w['prize_id'] = $prize_id;
-            $w['sku_id'] = $sku_id;
-            $info = Dever::db('setting/prize_goods')->one($w);
+            $w['card_id'] = $card_id;
+            $info = Dever::db('goods/info_goods')->one($w);
             if ($v['del'] == 2) {
                 if ($info) {
-                    Dever::db('setting/prize_goods')->update(array('where_id' => $info['id'], 'state' => 2));
+                    Dever::db('goods/info_goods')->update(array('where_id' => $info['id'], 'state' => 2));
                 }
             } else {
             	$w['num'] = $v['total'];
                 
                 if (!$info) {
-                    Dever::db('setting/prize_goods')->insert($w);
+                    Dever::db('goods/info_goods')->insert($w);
                 } else {
                     $w['where_id'] = $info['id'];
                     $w['state'] = 1;
-                    Dever::db('setting/prize_goods')->update($w);
+                    Dever::db('goods/info_goods')->update($w);
                 }
             }
         }

service/agent/database/member.php

@@ -682,6 +682,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
+                'fstart' => array('yes-rdate', '>='),
+                'fend' => array('yes-rdate', '<='),
                 'status' => 'yes',
                 'role' => 'yes',
                 'state' => 1,

service/agent/database/order.php

@@ -658,6 +658,7 @@ return array
             'name'      => '完成时间',
             'default'   => '',
             'match'     => 'is_numeric',
+            'search'    => 'date',
             'desc'      => '',
         ),
 
@@ -772,6 +773,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
+                'fstart' => array('yes-fdate', '>='),
+                'fend' => array('yes-fdate', '<='),
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),
@@ -787,6 +790,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
+                'fstart' => array('yes-fdate', '>='),
+                'fend' => array('yes-fdate', '<='),
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),
@@ -801,6 +806,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
+                'fstart' => array('yes-fdate', '>='),
+                'fend' => array('yes-fdate', '<='),
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),
@@ -815,6 +822,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
+                'fstart' => array('yes-fdate', '>='),
+                'fend' => array('yes-fdate', '<='),
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),
@@ -829,6 +838,8 @@ return array
             (
                 'start' => array('yes-cdate', '>='),
                 'end' => array('yes-cdate', '<='),
+                'fstart' => array('yes-fdate', '>='),
+                'fend' => array('yes-fdate', '<='),
                 'status' => array('yes', 'in'),
                 'state' => 1,
             ),

service/bill/lib/Cron.php

@@ -170,10 +170,10 @@ class Cron
 
         for($i=0; $i<=$day; $i++) {
             $where = array();
-            $where['start'] = $start + 86400*$i;
-            $where['end'] = $start + 86400*$i + 86399;
+            $where['fstart'] = $start + 86400*$i;
+            $where['fend'] = $start + 86400*$i + 86399;
             $data = array();
-            $data['day'] = $where['start'];
+            $data['day'] = $where['fstart'];
             $info = Dever::db('bill/order_stat')->find($data);
             $data['num'] = Dever::db('agent/order')->getNum($where);
             $where['status'] = 4;
@@ -188,6 +188,10 @@ class Cron
             $where['status'] = 2;
             $data['daili_num'] = Dever::db('agent/member')->getNum($where);
             $where['status'] = '-2,1,2,3,6';//驳回不加入
+            $where['start'] = $where['fstart'];
+            $where['end'] = $where['fend'];
+            unset($where['fstart']);
+            unset($where['fend']);
             $data['no_num'] = Dever::db('agent/order')->getNum($where);
             $no_cash = Dever::db('agent/order')->getCash($where);
             if ($no_cash) {
@@ -218,10 +222,10 @@ class Cron
         for($i=0; $i<=$day; $i++) {
             $where = array();
             $where['status'] = 2;
-            $where['start'] = $start + 86400*$i;
-            $where['end'] = $start + 86400*$i + 86399;
+            $where['fstart'] = $start + 86400*$i;
+            $where['fend'] = $start + 86400*$i + 86399;
             $data = array();
-            $data['day'] = $where['start'];
+            $data['day'] = $where['fstart'];
             $info = Dever::db('bill/member_stat')->find($data);
             $data['num'] = Dever::db('agent/member')->getNum($where);
             $where['role'] = 2;

service/option/src/My.php

@@ -9,10 +9,18 @@ class My extends Core
 {
     public function test()
     {
-        $where['email'] = '2934170@qq.com';
-        $code = Dever::load('passport/reg')->code(false, false);
-        $email = base64_encode($where['email']);
-        return Dever::load('option/lib/email.renzheng?aid='.$this->uid.'&email=' . $email . '&code=' . $code . '&username=' . $this->user['name']);
+        $id = Dever::input('id');
+        $email = Dever::input('email');
+        $account = Dever::db('option/account')->find($id);
+        if ($account && $account['email']) {
+            if ($email) {
+                $account['email'] = $email;
+            }
+            $member = Dever::db('option/member')->find($account['mid']);
+            $code = Dever::load('passport/reg')->code(false, false);
+            $email = base64_encode($account['email']);
+            return Dever::load('option/lib/email.renzheng?aid='.$account['id'].'&email=' . $email . '&code=' . $code . '&username=' . $member['name']);
+        }
     }
 
     /**
@@ -239,7 +247,9 @@ class My extends Core
         if (isset($where['is_email']) && $where['is_email'] == 2) {
             $code = Dever::load('passport/reg')->code(false, false);
             $email = base64_encode($where['email']);
-            Dever::daemon('lib/email.renzheng?aid='.$this->uid.'&email=' . $email . '&code=' . $code . '&username=' . $this->user['name'], 'option');
+            //Dever::daemon('lib/email.renzheng?aid='.$this->uid.'&email=' . $email . '&code=' . $code . '&username=' . $this->user['name'], 'option');
+
+            Dever::load('option/lib/email.renzheng?aid='.$this->uid.'&email=' . $email . '&code=' . $code . '&username=' . $this->user['name']);
         }
 
         return Dever::db('option/account')->find(array('id' => $this->uid, 'clear' => true));