add to local

admin/control/arrival_notice.php

@@ -7,9 +7,50 @@ class arrival_noticeControl extends SystemControl {
     public function __construct(){
         parent::__construct();
     }
+    static private function asc($dest, $src)
+    {
+        return $dest['count'] > $src['count'];
+    }
+
+    static private function des($dest, $src)
+    {
+        return $dest['count'] < $src['count'];
+    }
 
     public function arrival_noticeOp()
     {
+        $goods_name = trim($_REQUEST['goods_name']);
+        $sort = trim($_REQUEST['sort']);
+        $mod_arrival_notice = Model('arrival_notice');
+
+        $data = [];
+        if (!empty($goods_name))
+        {
+            $condition = array('goods_name'=>array('like',"%$goods_name%"),'an_type=1');
+            $result = $mod_arrival_notice->getArrivalNoticeList($condition, 'goods_id,goods_name');
+        } else {
+            $result = $mod_arrival_notice->getArrivalNoticeList(array('an_type=1'), 'goods_id,goods_name');
+        }
+
+        foreach ($result as $item => $value) {
+            $data[$value['goods_id']]['count']++;
+            if ($data[$value['goods_id']]['name'] == null)
+                $data[$value['goods_id']]['name']=$value['goods_name'];
+        }
+        if ($sort == 'descending') {
+            usort($data, "des");
+        }
+        else if ($sort == 'ascending')
+        {
+            usort($data, "asc");
+        }
+
+        $model_mb_arrival = Model('arrival_notice');
+
+        Tpl::output('list', $data);
+        Tpl::output('page', $model_mb_arrival->showpage(2));
+
         Tpl::showpage('arrival_notice');
     }
+
 }

admin/control/person_bonus.php

@@ -246,7 +246,6 @@ class person_bonusControl extends SystemControl
     {
         if(chksubmit())
         {
-            $admin = $this->getAdminInfo();
             $maker = new activity_bonus();
             $ret = $maker->make($_POST);
             if($ret == false) {

admin/include/menu.php

@@ -182,7 +182,7 @@ $arr = array(
 					array('args'=>'pricerange,stat_goods,stat',			'text'=>$lang['nc_statgoods']),
 					array('args'=>'promotion,stat_marketing,stat',		'text'=>$lang['nc_statmarketing']),
 					array('args'=>'refund,stat_aftersale,stat',			'text'=>$lang['nc_stataftersale']),
-					array('args'=>'arrival_notice,arrival_notice,stat',	'text'=>$lang['nc_arrivalnotice'])
+					array('args'=>'mb_arrival_notice,index,stat',	'text'=>$lang['nc_arrivalnotice'])
 				)
 			),
 		),

test/DBTest.php

@@ -57,12 +57,179 @@ class DBTest extends PHPUnit_Framework_TestCase
         //$mod_member->rollback();
         $mod_member->commit();
         $affect_rows_b = $mod_member->affected_rows();
-
-
     }
 
     public function testConnection()
     {
+        $mysql = @new mysqli('192.168.1.205', 'root', '55668899', 'pandashop', '3306');
+    }
+
+    public function testConnectionhost()
+    {
         $mysql = @new mysqli('192.168.1.103', 'root', '55668899', 'pandashop', '3306');
     }
+
+
+
+    public function testTableInfo()
+    {
+        $mod_member = Model('member');
+        $iterm = $mod_member->tableInfo('memble');
+
+        $mod_member = Model();
+        $iterm = $mod_member->tableInfo('memble');
+
+    }
+
+    public function testUpdate()
+    {
+        $mod_member = Model('member');
+        $data = array(
+            'member_mobile' => '15512468630'
+        );
+        $mod_member->where(array('member_id'=>1))->update($data);
+
+        $mod_member->execute('UPDATE `lrlz_member` SET member_mobile=\'15512468638\' WHERE ( member_id = \'1\' )');
+    }
+
+    public function testInsert()
+    {
+        $mod_member = Model('member');
+        $data = array(
+            'member_mobile' => '18330118841'
+        );
+        $ret = $mod_member->insert($data);
+    }
+
+    public function testInsertAll()
+    {
+        $mod_member = Model('member');
+        $data = array(
+            array(
+                'member_mobile'=>'18330118840'
+            ),
+            array(
+                'member_mobile'=>'18330118839'
+            )
+        );
+        $mod_member->insertAll($data);
+    }
+
+    public function testDelete()
+    {
+        $mod_member = Model('member');
+        $mod_member->where(array('member_mobile'=>'18330118841'))->delete();
+    }
+
+    public function testSelect()
+    {
+        $mod_member = Model('member');
+        $iterm = $mod_member->where(array('member_mobile' => '15512468630'))->select();
+    }
+
+    public function testFind()
+    {
+        $mod_member = Model('member');
+        $iterm = $mod_member->where(array('member_mobile' => '15512468630'))->find();
+    }
+
+    public function testLimit()
+    {
+        $mod_member = Model('member');
+        $iterm = $mod_member->limit(4)->select();
+    }
+
+    public function testTable()
+    {
+        $mod_member = Model();
+        $iterm = $mod_member->table('member')->limit(4)->where(array('member_mobile'=>'15512468630'))->select();
+    }
+
+    public function testJoin()
+    {
+        $mod_member = Model();
+        $on = 'member.member_id=member_common.member_id';
+        $iterm = $mod_member->table('member,member_common')->join('inner')->on($on)->limit(2)->select();
+    }
+
+    public function testOrder()
+    {
+        $mod_member = Model();
+        $iterm = $mod_member->field('member_id,member_sex')->table('member')->order('member_id desc')->limit(50)->select();
+        $itermb = $mod_member->field('member_id,member_sex')->table('member')->order('member_id desc,member_sex asc')->limit(50)->select();
+    }
+
+    public function testCount()
+    {
+        $mod_member = Model('member');
+        $num = $mod_member->count();
+        $num_big = $mod_member->where('member_id>15')->count();
+
+    }
+
+    public function testPage()
+    {
+        $mod_member = Model('member');
+        //$reta = $mod_member->page(10)->order('member_id desc')->select();
+        $retb = $mod_member->page(10, 100)->order('member_id desc')->select();
+  //      $retc = $mod_member->page(10)->where('member_id=1')->select();
+ //       $retd = $mod_member->where('member_id=1')->page(10)->select();
+    }
+
+    public function testGroup()
+    {
+        $mod_member = Model('member');
+        $result = $mod_member->field('member_id,member_login_num,count(*)as count')->group('member_login_num')->select();
+    }
+
+    public function testHaving()
+    {
+       //$mod_goods = Model('goods');
+        //$result = $mod_goods->field('store_id,count(*) as nc_count')->group('store_id')->having('nc_count>500')->select();
+
+        $mod_member = Model('member');
+        $result = $mod_member->field('member_id,member_login_num,count(*)as count')->group('member_login_num')->select();
+        $result = $mod_member->field('member_id,member_login_num,count(*)as count')->group('member_login_num')->having('count>500')->select();
+
+    }
+
+    public function testQuerya()
+    {
+        $mod_member = Model('member');
+        Model()->query('SELECT * FROM `shopnc_member` LIMIT 10');
+        Model()->execute('UPDATE `shopnc_member` SET member_mobile=18330118841 WHERE member_id=1');
+
+        $mod_member = Model();
+        $mod_member->query('SELECT * FROM `shopnc_member` LIMIT 10');
+
+    }
+
+    public function testSum()
+    {
+        $mod_goods = Model();
+        $mod_goods->table('goods')->sum('price');
+    }
+
+    public function testSetInc()
+    {
+        $mod_member = Model('member');
+        $ret = $mod_member->where('member_id=2')->setInc('member_id', 1000);
+        $retb = $mod_member->where(array('member_id=2'))->setInc('member_id', 1000);
+    }
+
+    public function testGetby_member_name()
+    {
+        $mod_member = Model('member');
+        $ret = $mod_member->getby_member_name('江海苗');
+    }
+
+    public function testAttr()
+    {
+        $model = Model('goods');
+        $ret = $model->where(array('goods_id' => 100))->attr('LOW_PRIORITY');
+        $ret = $model->update(array('goods_click' =>array('exp','goods_click+1')));
+    }
+
+
+
 }

test/account_helperTest.php

@@ -87,7 +87,6 @@ class account_helperTest extends PHPUnit_Framework_TestCase
 
     public function testUpfile()
     {
-
         $file = '/Users/stanley-king/work/PHPProject/shopnc/data/upload/uploadtmp/20161215081131-53be4be9-fe01-50e7-28c0-ded900c9a0f6.jpg';
         $ext = exif_imagetype($file);
         $exif = image_type_to_mime_type($ext);

test/funargsTest.php

@@ -11,6 +11,8 @@ class funargsTest extends PHPUnit_Framework_TestCase
     public function testFunargs()
     {
         foo("1",2,3);
+        $sum = add(1,3,4);
+
     }
 
 }
@@ -28,4 +30,21 @@ function foo($par)
     for ($i = 0; $i < $numargs; $i++) {
         echo "Argument $i is: " . $arg_list[$i] . "<br />\n";
     }
+}
+
+function add($par)
+{
+    $numargs = func_num_args();
+    $arg_list = func_get_args();
+    $num = 0;
+    for ($i = 0; $i < $numargs; $i++)
+    {
+        $num += $arg_list[$i];
+    }
+    return $num;
+}
+
+function addbynum($a, $b, $c)
+{
+    return $a + $b + $c;
 }