Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

# Conflicts:
#	sql.sql

app-hd/controllers/PurchaseController.php

@@ -50,6 +50,7 @@ class PurchaseController extends BaseController
             ProductClass::valid($productList, $currentShopId);
             $post['product'] = $productList;
             $post['sendCost'] = isset($post['sendCost']) && is_numeric($post['sendCost']) ? $post['sendCost'] : 0;
+            $post['couponId'] = isset($post['couponId']) ? $post['couponId'] : 0;
             $respond = PurchaseService::createPurchase($post, $ghsInfo);
             $orderSn = $respond->orderSn ?? '';
             $actPrice = $respond->actPrice ?? '';

app-hd/controllers/ShopCouponController.php

@@ -2,6 +2,7 @@
 
 namespace hd\controllers;
 
+use biz\shop\classes\ShopCouponClass;
 use biz\shop\services\ShopCouponService;
 use common\components\util;
 use Yii;
@@ -28,10 +29,10 @@ class ShopCouponController extends BaseController
     //有可用红包 shish 2021.5.15
     public function actionHas()
     {
+        $has = ShopCouponClass::hasUnUseCoupon($this->shopId);
         $data = [
-            'has' => rand(0, 1)
+            'has' => $has
         ];
         util::success($data);
     }
-
-}
+}

biz/shop/classes/ShopCouponClass.php

@@ -62,4 +62,20 @@ class ShopCouponClass extends BaseClass
 
         return self::batchAdd($couponData);
     }
+
+    public static function expire($coupon)
+    {
+        $coupon->status = ShopCouponClass::STATUS_EXPIRE;
+        return $coupon->save();
+    }
+
+    // 商家是否有可用优惠券
+    public static function hasUnUseCoupon($shopId)
+    {
+        $count = ShopCouponClass::getCount([
+            'shopId' => $shopId,
+            'status' => ShopCouponClass::STATUS_UN_USE,
+        ]);
+        return $count > 0 ? true : false;
+    }
 }

console/controllers/ShopCouponController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace console\controllers;
+
+use biz\shop\classes\ShopCouponClass;
+use bizHd\purchase\classes\PurchaseClass;
+use bizHd\purchase\models\Purchase;
+use bizHd\purchase\services\PurchaseService;
+use common\components\noticeUtil;
+use yii\console\Controller;
+use Yii;
+
+class ShopCouponController extends Controller
+{
+    // 优惠券过期
+    // ./yii shop-coupon/expire
+    // /usr/local/nginx/html/huahuibao/yii shop-coupon/expire
+    public function actionExpire()
+    {
+        $coupons = ShopCouponClass::getLimitList('*', [
+            'status' => ShopCouponClass::STATUS_UN_USE,
+            'endTime<' => date("Y-m-d H:i:s"),
+        ], '1000', 'id asc');
+
+        try {
+            foreach ($coupons as $coupon) {
+                $couponAr = ShopCouponClass::getById($coupon['id'], true);
+                ShopCouponClass::expire($couponAr);
+
+                $log = "过期的优惠券：{$coupon['id']} json:" . json_encode($coupon);
+                Yii::info($log);
+            }
+        } catch (Exception $e) {
+            $msg = $e->getMessage();
+            noticeUtil::push("零售商优惠券过期变更报错：{$msg}", '15280215347');
+        }
+    }
+}