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

learn/active/database/info_refund.php

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

learn/active/database/info_refund_log.php

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

learn/active/lib/Manage.php

@@ -287,7 +287,17 @@ Class Manage
                 $user_idcard = $member['idcard'];
             }
         }
-        // $refund = Dever::db('active/info_refund')->getSearch(array('order_id'=>$id,'status'=>2,''));
+        // print_R($id);die;
+        $refund = Dever::db('active/info_refund')->getSearch(array('order_id'=>$id));
+        // echo dever::sql();die;
+        $refund_log = Dever::db('active/info_refund_log')->getSearch(array('order_id'=>$id));
+        $refund_money = $refund['price'] + $refund_log['price'];
+        $refund_desc = '';
+        if ($refund['desc']) {
+            $refund_desc = $refund['desc'];
+        } else if ($refund_log && $refund_log['desc']) {
+            $refund_desc = $refund_log['desc'];
+        }
         // if ($active['col'] && $active['col'] == 'idcard') {
         //     $user_idcard = $user['idcard'];
         // } else {
@@ -332,13 +342,13 @@ Class Manage
                     array('未使用', $no_code),
                     // array('退款数量', $info['refund_num']),
                 ),
-                // array
-                // (
-                //     array('退款数量', $info['refund_num']),
-                //     array('退款总金额', $use_code),
-                //     array('退款备注', $no_code),
+                array
+                (
+                    array('退款数量', $info['refund_num']),
+                    array('退款总金额', $refund_money),
+                    array('退款备注', $refund_desc),
                     
-                // ),
+                ),
             ),
         );
         $result['用户信息'] = array
@@ -642,8 +652,8 @@ Class Manage
                     $insert['status'] = 2;
                     $insert['where_id'] = $refund_id;
                     $insert['audit_admin'] = $admin['id'];
-                    if ($refund_price) {
-                        $insert['desc'] = $refund_price;
+                    if ($refund_desc) {
+                        $insert['desc'] = $refund_desc;
                     }
                     $insert['price'] = $price;
                     Dever::db('active/info_refund')->update($insert);
@@ -652,6 +662,9 @@ Class Manage
                     $add['order_id'] = $data['id'];
                     $add['num'] = 1;
                     $add['price'] = $price;
+                    if ($refund_desc) {
+                        $add['desc'] = $refund_desc;
+                    }
                     Dever::db('active/info_refund')->insert($add);
                 }
                 if (isset($ids) && $ids){