Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

app/shop/database/info.php

@@ -694,7 +694,7 @@ return array
             'desc'      => '',
             # 只有insert时才生效
             'insert'    => true,
-            //'list'      => 'date("Y-m-d H:i:s", {cdate})',
+            'list'      => 'date("Y-m-d H:i:s", {cdate})',
         ),
     ),
 
@@ -854,6 +854,22 @@ return array
             'col' => 'id,id as value, name',
         ),
 
+        'getguiAll' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'type' => array('yes', '!='),
+                // 'town' => 'yes',
+                // 'area' => array('yes', 'like'),
+                'status' => 1,
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'order' => array('reorder' => 'desc', 'id' => 'desc'),
+            'col' => 'id,id as value, name',
+        ),
+
         'getAllByType' => array
         (
             # 匹配的正则或函数 选填项
@@ -862,6 +878,8 @@ return array
                 'town' => 'yes',
                 'is_agent' => 'yes',
                 'area' => array('yes', 'like'),
+                'type' => array('yes', 'in'),
+                'status' => 'yes',
                 'state' => 1,
             ),
             'type' => 'all',

app/shop/src/Excel.php

@@ -182,7 +182,7 @@ class Excel
         }
         $file = Dever::input('excel_name');
 
-        $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '商品支付金额', '下单时间', '付款时间', '发货时间', '收货时间' , '订单总数量', '订单总金额', '订单实付金额', '礼品卡金额', '钱包金额', '优惠券金额', '代理优惠金额', '订单状态', '退款状态', '退款金额');
+        $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '商品支付金额', '下单时间', '付款时间', '发货时间', '收货时间' , '订单总数量', '订单总金额', '订单实付金额', '礼品卡金额', '钱包金额', '优惠券金额', '代理优惠金额', '订单状态', '退款状态', '退款金额','礼品卡名称');
 
         $table = 'shop/info';
 
@@ -225,6 +225,15 @@ class Excel
             if (!$v['refund_cash']) {
                 $v['refund_cash'] = 0;
             }
+            #礼品卡
+            $card_name= '';
+            $code = Dever::db('card/code')->find(array('id'=>$v['card_code_id']));
+            if(isset($code) && $code && $code['card_id']){
+                $card = Dever::db('card/info')->find(array('id'=>$code['card_id']));
+                if(isset($card) && $card && $card['name']){
+                    $card_name = $card['name'];
+                }
+            }
             foreach ($goods as $k1 => $v1) {
 
                 $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
@@ -285,6 +294,7 @@ class Excel
                     $status[$v['status']],
                     $refund_status,
                     round($v['refund_cash'], 2),
+                    $card_name,
                 );
 
                 $body[] = $d;

service/agent/database/order.php

@@ -650,7 +650,7 @@ return array
             'desc'      => '代理费',
             'match'     => 'option',
             'update'    => 'text',
-            'list'      => $search_auth == 2 ? true : false,
+            'list'      => $search_auth == 2 || $search_pmid  ? true : false,
         ),
 
         'soft_cash'      => array

service/agent/src/My.php

@@ -146,7 +146,8 @@ class My extends Core
     # 获取门店
     public function getShop()
     {
-        $where['type'] = 10;
+        $where['type'] = '1,10';
+        $where['status'] = 1;
         $where['area'] = Dever::input('area');
         $where['is_agent'] = 1;
         $this->data['shop'] = Dever::db('shop/info')->getAllByType($where);

service/bill/lib/Cron.php

@@ -502,7 +502,7 @@ class Cron
         $end_time = date('Y-m-d', strtotime($start_time. ' +1 month -1 day')).' 23:59:59';
         $start = Dever::maketime($start_time);
         $end = Dever::maketime($end_time);
-        $shops = Dever::db('shop/info')->getAll();
+        $shops = Dever::db('shop/info')->getguiAll(array('type'=>2));
         foreach ($shops as $k => $v) {
             $w = array('end' => $end,'new_shop_id'=> $v['id']);
             $member = Dever::db('agent/member_shop_log')->getAllByShop($w);
@@ -606,6 +606,27 @@ class Cron
                 }
                 
 
+                $res = Dever::db('bill/shop_stat')->find(array('month'=>$insert['month'],'shop_id'=>$v['id']));
+                if ($res) {
+                    $insert['where_id'] = $res['id'];
+                    Dever::db('bill/shop_stat')->update($insert);
+                } else {
+                    Dever::db('bill/shop_stat')->insert($insert);
+                }
+            } else {
+                $insert = array();
+                $insert['shop_id'] = $v['id'];
+                $insert['month'] = $start;
+                $insert['c_money'] = 0;
+                $insert['mids'] = '';
+                $insert['month_mids'] = array();
+                $insert['num'] = 0;
+                $insert['dl_num'] = 0;
+                $insert['v_num'] = 0;
+                $insert['ck_num'] = 0;
+                $insert['out_num'] = 0;
+                $insert['out_money'] = 0;
+                $insert['nei_money'] = 0;
                 $res = Dever::db('bill/shop_stat')->find(array('month'=>$insert['month'],'shop_id'=>$v['id']));
                 if ($res) {
                     $insert['where_id'] = $res['id'];
@@ -614,6 +635,7 @@ class Cron
                     Dever::db('bill/shop_stat')->insert($insert);
                 }
             }
+            
         }
 
 /*

service/bill/lib/Manage.php

@@ -330,6 +330,9 @@ class Manage
         foreach($data as $k => $v){
             $month = date('Y-m',$v['month'])."\t";
             $shop = Dever::db('shop/info')->find(array('id'=>$v['shop_id']));
+            if ($shop['type'] != 1) {
+                continue;
+            }
             if($shop['mid'] && $shop['mid'] >0){
                 $member = Dever::db('agent/member')->find($shop['mid']);
                 if($member){