hot_fix_2

app/Service/CouponService.php

@@ -108,16 +108,23 @@ class CouponService implements CouponServiceInterface
             ->orderBy('u.weigh','desc')
             ->get();
 
-        foreach ($coupons as $k => &$v){
-
-            if($v->active_type == 1 && count($result['not_receive']) < 4){
-                $result['not_receive'][] = $v;
-            }else if($v->active_type == 2 && in_array($v->id,$couponReceiveIds)){
-                $result['jump_data']['coupons'][] = $v->id;
+        foreach ($coupons as $key => $coupon) {
+            //拼接满减文字提示
+            $coupon->full_amount_text = '满' . $coupon->full_amount . "可用";
+            //判断是折扣优惠券还是满减优惠券
+            if($coupon->discount_type == 1){
+                $coupon->discounts_text = '￥'.$coupon->discounts;
+            }elseif($coupon->discount_type == 2){
+                $coupon->discounts_text = floatval($coupon->discounts)."折";
             }
+            //失效时间格式转换
+            $usable_end_time = date('Y-m-d H:i:s',$coupon->usable_end_time);
+            $coupon->usable_end_time_text = '有效期至:'.$usable_end_time;
 
-            if($v->discount_type == 2){
-                $v->discounts = floatval($v->discounts);
+            if ($coupon->usable_end_time < $nowTime || $coupon->number_remain <= 0) {
+                $expired[] = $coupon;
+            } else {
+                $not_expired[] = $coupon;
             }
         }