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

app/shop/database/sell_order.php

@@ -943,5 +943,20 @@ return array
             'type' => 'count',
             'col' => '*',
         ),
+
+        'getSumCdate' => array
+        (
+            # 匹配的正则或函数 选填项
+            'where' => array
+            (
+                'start' => array('yes-cdate', '>='),
+                'end' => array('yes-cdate', '<='),
+                'card_code_id' => 'yes',
+                // 'status' => array('yes', 'in'),
+                'state' => 1,
+            ),
+            'type' => 'one',
+            'col' => 'sum(card_code_cash) as total',
+        ),
     ),
 );

service/agent/lib/Dhorder.php

@@ -1253,20 +1253,42 @@ class Dhorder
     }
     #权益管理导出
     public function out_member_goods_api($data){
-        $header = array('权益名称', '会员等级', '姓名', '手机号', '剩余数量', '总数量', '单件价值', '获取方式', '获取时间');
+        $header = array('权益名称', '会员等级', '姓名', '手机号', '卡号','剩余数量', '总数量', '单件价值', '未兑换价值', '已用面值','5月已用面值','获取方式', '获取时间');
         $body = array();
         foreach($data as $k => $v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
             $role = Dever::db('setting/role')->find(array('id'=>$member['role']));
+            $wd = ($v['total_num'] - $v['sell_num'])*$v['price'];
+            $card = '-';
+            $mianzhi = '-';
+            $money = '-';
+            if($v['type'] == 2){
+                $code = Dever::db('card/code')->find($v['sku_id']);
+                $start = '1651334400';
+                $end = '1654012799';
+                if($code){
+                    $sell_order = Dever::db('shop/sell_order')->getSumCdate(array('start'=>$start,'end'=>$end,'card_code_id'=>$code['id'],'state'=>1));
+                    if($sell_order && $sell_order['total']){
+                        $money = $sell_order['total'];
+                    }
+                }
+                
+                $card = $code['card']."\t";
+                $mianzhi = $code['total_cash'] - $code['use_cash'];                
+            }
             $d = array
             (
                 $v['name'],
                 $role['name'],
                 $member['name'],
                 $member['mobile'],
+                $card,
                 $v['total_num']-$v['sell_num'],
                 $v['total_num'],
                 $v['price'],
+                $wd,
+                $mianzhi,
+                $money,
                 '',
                 date('Y-m-d H:i',$v['cdate']),
                 

service/agent/lib/Order.php

@@ -117,10 +117,13 @@ class Order
             if($idcard_path['back']){
                 $rest = (array)$idcard_path['back'];
                 $date = explode('-',$rest['validPeriod']);
-                $cdate = strtotime(str_replace('.','-',$date[1]));
-                if(time()>=$cdate){
-                    Dever::alert('身份证背面已过期');
+                if($date[1] && $date[1]!='长期'){
+                    $cdate = strtotime(str_replace('.','-',$date[1]));
+                    if(time()>=$cdate){
+                        Dever::alert('身份证背面已过期');
+                    }
                 }
+                
             }
         }
         if ($data['source_id'] && $data['source_id'] > 0) {

service/agent/src/My.php

@@ -431,9 +431,11 @@ class My extends Core
                 if($idcard_path['back']){
                     $rest = (array)$idcard_path['back'];
                     $date = explode('-',$rest['validPeriod']);
-                    $cdate = strtotime(str_replace('.','-',$date[1]));
-                    if(time()>=$cdate){
-                        Dever::alert('身份证背面已过期');
+                    if($date[1] && $date[1]!='长期'){
+                        $cdate = strtotime(str_replace('.','-',$date[1]));
+                        if(time()>=$cdate){
+                            Dever::alert('身份证背面已过期');
+                        }
                     }
                 }
             }

service/option/src/My.php

@@ -234,9 +234,11 @@ class My extends Core
             if($idcard_path['back']){
                 $rest = (array)$idcard_path['back'];
                 $date = explode('-',$rest['validPeriod']);
-                $cdate = strtotime(str_replace('.','-',$date[1]));
-                if(time()>=$cdate){
-                    Dever::alert('身份证背面已过期');
+                if($date[1] && $date[1]!='长期'){
+                    $cdate = strtotime(str_replace('.','-',$date[1]));
+                    if(time()>=$cdate){
+                        Dever::alert('身份证背面已过期');
+                    }
                 }
             }
         }

service/setting/lib/Idcard.php

@@ -53,10 +53,13 @@ class Idcard
             		foreach($rest as $k =>$v){
                         if (isset($v['data']['validPeriod'])) {
                             $date = explode('-',$v['data']['validPeriod']);
-                            $cdate = strtotime(str_replace('.','-',$date[1]));
-                            if(time()>=$cdate){
-                                Dever::alert('身份证背面已过期');
+                            if($date[1] && $date[1] != '长期'){
+                                $cdate = strtotime(str_replace('.','-',$date[1]));
+                                if(time()>=$cdate){
+                                    Dever::alert('身份证背面已过期');
+                                }
                             }
+                            
                         } else {
                             Dever::alert('请上传正确的身份证背面图片');
                         }