dever 3 年之前
父节点
当前提交
13e02d0af6
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      app/shop/lib/Coupon.php

+ 5 - 1
app/shop/lib/Coupon.php

@@ -26,6 +26,7 @@ class Coupon
     {
         $data = Dever::db('shop/coupon_act')->getData(array('shop_id' => $shop_id, 'act_id' => $act_id));
 
+        $result = array();
         if ($data) {
         	foreach ($data as $k => $v) {
                 $shop_coupon = Dever::db('shop/coupon')->getOne($v['shop_coupon_id']);
@@ -34,18 +35,21 @@ class Coupon
                     if (!$info) {
                         continue;
                     }
+
                     $data[$k]['cash'] = $info['cash'];
                     $data[$k]['total_cash'] = $info['total_cash'];
                     $data[$k]['total'] = $shop_coupon['total'];
                     $data[$k]['shop_coupon_id'] = $v['shop_coupon_id'];
                     $data[$k]['name'] = $info['name'];
+
+                    $result[] = $data[$k];
                 } else {
                     continue;
                 }
         	}
         }
 
-        return $data;
+        return $result;
     }
 
     # 验证是否可以领取