Merge branch 'develop' of yituan/opkpm into master

app/api/controller/ShopContent.php

@@ -32,7 +32,7 @@ use app\api\logic\ShopContentLogic;
 
 class ShopContent extends Api
 {
-    public $like_not_need_login = ['getShopInfo', 'getShopList','getNearbyShops','smsCode','getShopConfig','getXpath','getAppService','getRunNum','getShopConfig2','subHKSYCount'];
+    public $like_not_need_login = ['getShopInfo', 'getShopList','getNearbyShops','smsCode','getShopConfig','getXpath','getAppService','getRunNum','getShopConfig2','getHKSYCount','subHKSYCount'];
 
     /**
      * 店铺信息

app/api/logic/ShopContentLogic.php

@@ -861,7 +861,7 @@ class ShopContentLogic extends Logic
             return false;
         }
 
-        return ['count' => $shop->hksy_count, 'expire_time' => $shop->expire_time];
+        return ['count' => $shop->hksy_count, 'hksy_type' => $shop->hksy_type, 'expire_time' => $shop->expire_time];
     }
 
     /**
@@ -924,8 +924,16 @@ class ShopContentLogic extends Logic
 
         //判断类型
         if((int)$shop->hksy_type === 0){
+            $expire_time = $shop->expire_time;
+            $expire_time = strtotime($expire_time);
+            if (time() < $expire_time) {
+                self::$errCode = 0;
+                //未过期
+                return true;
+            }
+
             self::$errCode = 10;
-            self::$error = "商家类型是包月,不允许使用次数!";
+            self::$error = "包月商家，时间过期!";
             return false;
         }