Your Name 2 years ago
parent
commit
4f243e82b2
3 changed files with 28 additions and 4 deletions
  1. 13 0
      learn/active/database/info_refund.php
  2. 12 2
      learn/active/lib/Excel.php
  3. 3 2
      learn/active/lib/Manage.php

+ 13 - 0
learn/active/database/info_refund.php

@@ -180,5 +180,18 @@ return array
             'order' => array('cdate' => 'desc'),
             'col' => '*',
         ),
+        'getEmoney' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'order_id' => 'yes',
+                'state' => 1,
+                'status' => 2,
+            ),
+            'type' => 'all',
+            'order' => array('cdate' => 'desc'),
+            'col' => 'sum(price) as price',
+        ),
     ),
 );

+ 12 - 2
learn/active/lib/Excel.php

@@ -6,7 +6,7 @@ use Dever;
 Class Excel {
 	#活动订单的导出
   public function out_active_order($data){
-    $header = array('订单单号', '姓名', '手机号', '活动名称', '购买数量', '使用数量','待核销数量','已核销数量','金额', '支付状态', '支付类型','购买时间');
+    $header = array('订单单号', '姓名', '手机号', '活动名称', '购买数量', '使用数量','待核销数量','已核销数量','金额', '已退款数量', '已退款金额','支付状态', '支付类型','购买时间');
     $body = array();
     foreach ($data as $k => $v){
             $user = Dever::db('active/user')->find($v['uid']);
@@ -38,7 +38,15 @@ Class Excel {
         }
     	$yhecode = Dever::db('active/code')->getExcel(array('order_id' => $v['id'],'status'=>2));
         $dhecode = Dever::db('active/code')->getExcel(array('order_id' => $v['id'],'status'=>1));
-
+        $tui_num = 0;
+        if ($v['refund_num']) {
+            $tui_num = $v['refund_num'];
+        }
+        $tui_money = 0;
+        $tui = Dever::db('active/info_refund')->getEmoney(array('order_id'=>$v['id'],'status'=>2));
+        if ($tui && isset($tui['price']) && $tui['price']) {
+            $tui_money = $tui['price'];
+        }
     	$d = array
     	(
     		$v['order_num'],
@@ -50,6 +58,8 @@ Class Excel {
             $dhecode,
             $yhecode,
     		$v['price'],
+            $tui_num,
+            $tui_money,
     		$status,
     		$pay_type,
     		$cdate,

+ 3 - 2
learn/active/lib/Manage.php

@@ -250,13 +250,14 @@ Class Manage
             $user = Dever::db('active/user')->find($info['mid']);
             $info['uid'] = $user['id'];
         }
-        $code = Dever::db('active/code')->getCode(array('order_id' => $id,'status'=>'1,2'));
+        $code = Dever::db('active/code')->getCode(array('order_id' => $id,'status'=>'1,2,3'));
         $use_code = count($code);#已领取的所有数量
         // print_R($use_code);die;
         if (!$info['refund_num']) {
             $info['refund_num'] = 0;
         }
-        $no_code = $info['num'] - $use_code - $info['refund_num'];#未使用的数量
+        // $no_code = $info['num'] - $use_code - $info['refund_num'];#未使用的数量
+        $no_code = $info['num'] - $use_code;#未使用的数量
         if ($info['uid'] && $info['uid'] > 0) {
             $user = Dever::db('active/user')->find($info['uid']);
             $user_name = $user['name'];