红包 红包验证方式调整

biz/shop/classes/ShopCouponClass.php

@@ -22,21 +22,21 @@ class ShopCouponClass extends BaseClass
 
     public static $defaultCoupon = [
         [
-            'name' => '优惠券',
+            'name' => '红包',
             'amount' => '5',
             'miniCost' => '50',
             'beginTime' => "+6 days",
             'endTime' => "+7 days",
         ],
         [
-            'name' => '优惠券',
+            'name' => '红包',
             'amount' => '10',
             'miniCost' => '50',
             'beginTime' => "+3 days",
             'endTime' => "+7 days",
         ],
         [
-            'name' => '优惠券',
+            'name' => '红包',
             'amount' => '15',
             'miniCost' => '50',
             'beginTime' => "+0 days",
@@ -115,7 +115,7 @@ class ShopCouponClass extends BaseClass
         return $list;
     }
 
-    // 赠送3张优惠券
+    // 赠送3张红包
     public static function addDefaultCoupon($data)
     {
         $couponData = [];
@@ -159,7 +159,7 @@ class ShopCouponClass extends BaseClass
         return $arr;
     }
 
-    // 商家是否有可用优惠券
+    // 商家是否有可用红包
     public static function hasValidCoupon($shopId, $ghsId)
     {
         $current = date("Y-m-d H:i:s");
@@ -180,22 +180,25 @@ class ShopCouponClass extends BaseClass
     public static function valid($coupon, $shopId)
     {
         if (empty($coupon)) {
-            util::fail('没有找到优惠券');
+            util::fail('没有红包');
         }
         if (isset($coupon->shopId) && $coupon->shopId != $shopId) {
-            util::fail('不是您的优惠券');
+            util::fail('不是您的红包');
         }
         if (isset($coupon->take) && $coupon->take == self::TAKE_HAS) {
-            util::fail('优惠券已被使用');
+            util::fail('红包被占用');
         }
         $current = date("Y-m-d H:i:s");
         if ($coupon->endTime < $current) {
-            util::fail('优惠券已经过期');
+            util::fail('红包已过期');
+        }
+        if ($coupon->status != self::STATUS_UN_USE) {
+            util::fail('此红包无法使用');
         }
         return true;
     }
 
-    //优惠券回滚 shish 2021.5.18
+    //红包回滚 shish 2021.5.18
     public static function rollback($coupon)
     {
         if (isset($coupon->take) && $coupon->take == self::TAKE_HAS) {