修改接口问题

app/admin/view/shop/store/lists.html

@@ -168,7 +168,8 @@
             ,{field:"category", width:100, align:"center", title:"主营类目"}
             ,{field:"is_run", width:90, align:"center", title:"营业状态"}
             ,{field:"is_freeze", width:90, align:"center", title:"商家状态"}
-            ,{field:"is_recommend", width:90, align:"center", title:"推荐商家"}
+            //,{field:"is_recommend", width:90, align:"center", title:"推荐商家"}
+            ,{field:"hksy_count", width:90, align:"center", title:"评论次数"}
             ,{field:"create_time", width:160, align:"center", title:"开通日期"}
             ,{field:"expire_desc", width:160, align:"center", title:"到期状态"}
             ,{field:"expire_time", width:160, align:"center", title:"到期时间"}

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'];
+    public $like_not_need_login = ['getShopInfo', 'getShopList','getNearbyShops','smsCode','getShopConfig','getXpath','getAppService','getRunNum','getShopConfig2','subHKSYCount'];
 
     /**
      * 店铺信息
@@ -106,7 +106,9 @@ class ShopContent extends Api
         $data = ShopContentLogic::codeInfo($code,$mcode);
         if($data['status'] == 100){
             //通过
-            $respon = [];
+            $respon = [
+                    'is_gi' => $data['is_gi']  //是否到期  0未到期 或者 1 是到期(但评论数量存在>10条)
+                ];
             return JsonServer::success($data['msg'], $respon);
         }else{
             //失败
@@ -340,6 +342,7 @@ class ShopContent extends Api
 
     /**
      * 查询获客剩余数量
+     * 暂时弃用
      */
     public function getHKSYCount() {
         if ($this->request->isGet()) {
@@ -357,15 +360,16 @@ class ShopContent extends Api
 
     /**
      * 减少获客剩余数量
+     * subHKSYCount
      */
     public function subHKSYCount() {
+
         if ($this->request->isPost()) {
             $post = $this->request->post();
             $count = ShopContentLogic::subHKSYCount($post);
             if ($count === false) {
-                return JsonServer::error(ShopContentLogic::getError(), ['err_code' => ShopContentLogic::getErrCode()]);
+               return JsonServer::error(ShopContentLogic::getError(), ['err_code' => ShopContentLogic::getErrCode()]);
             }
-
             return JsonServer::success('操作成功', ['count' => $count]);
         }
 

app/api/logic/ShopContentLogic.php

@@ -10,6 +10,7 @@ use app\common\enum\ShopEnum;
 use app\common\logic\QrCodeLogic;
 
 use app\common\model\dev\DevRegion;
+use app\common\model\shop\Shop as shopModel;
 use app\common\model\shop\ShopAd;
 
 use app\common\model\shop\ShopGoods as shopGoodsModel;
@@ -23,7 +24,6 @@ use app\common\model\shop\ShopFollow;
 use app\common\model\content\ClosureCategory;
 use app\common\model\content\Closure;
 
-use app\common\model\shop\Shop as shopModel;
 use app\common\model\content\EquiCategory as EquiCategoryModel;
 use app\common\model\shop\ShopHkLog;
 use think\facade\Db;
@@ -56,15 +56,66 @@ class ShopContentLogic extends Logic
 
         //判断商家服务
         if(!empty($item)) {
-            $expire_time = shopModel::where('id', $item['shop_id'])->value('expire_time');
+
+            //判断商户
+            $shop = shopModel::where('id', $item['shop_id'])->find();
+            if(empty($shop)){
+                $data = [
+                    'status' => 110,
+                    'msg' => "商户信息不存在!"
+                ];
+                return $data;
+            }
+
+            //不需要转数组
+            //echo $shop['id'];
+            //$shop = $shop->toArray();
+            //var_dump($shop);die;
+
+            //判断 商家状态 is_freeze
+            if((int)$shop['is_freeze'] === 1){
+                $data = [
+                    'status' => 111,
+                    'msg' => "商家冻结中!"
+                ];
+                return $data;
+            }
+
+            //判断 营业状态  is_run
+            if((int)$shop['is_run'] === 0){
+                $data = [
+                    'status' => 112,
+                    'msg' => "商家暂停营业中!"
+                ];
+                return $data;
+            }
+
+            //模型调用出来的 与 直接查询字段出来的值 不一样
+            $expire_time = strtotime($shop['expire_time']);
             //dump($expire_time);
+            //echo $expire_time;die;
+
             if($expire_time < time()){
+                //判断到期时间
                 $data = [
                    'status' => 107,
                    'msg' => "商户服务当前套餐到期,到期时间".date('Y-m-d H:i:s',$expire_time)."!"
                 ];
-                return $data;
+                //判断剩余数量  hksy_count  当商家已到期
+                if((int)$shop['hksy_count'] < 10){
+                    //判断到期时间
+                    $data = [
+                        'status' => 113,
+                        'msg' => "商户服务可评论次数不足,剩余".$shop['hksy_count']."条,请充值后再使用 或 开通商户包年包月服务!"
+                    ];
+                    return $data;
+                }
+                //可评论次数大于10 即使到期 也继续执行
+                $is_gi = 1;
+            }else{
+                $is_gi = 0;
             }
+            //未到期 不需要扣次数 继续执行即可
         }
 
         if(empty($item))
@@ -93,7 +144,8 @@ class ShopContentLogic extends Logic
                 if ($row == 1) {
                     $data = [
                         'status' => 100,
-                        'msg' => "绑定机器码成功!"
+                        'msg' => "绑定机器码成功!",
+                        'is_gi' => $is_gi
                     ];
                 } else {
                     $data = [
@@ -126,7 +178,8 @@ class ShopContentLogic extends Logic
                 }else{
                     $data = [
                         'status' => 100,
-                        'msg' => "已绑定该机器码!"
+                        'msg' => "已绑定该机器码!",
+                        'is_gi' => $is_gi
                     ];
                 }
             }
@@ -784,8 +837,10 @@ class ShopContentLogic extends Logic
      */
     public static function subHKSYCount($post) {
         $code = $post["code"] ?? '';
-        $count = $post["count"] ?? 0;
+        //$count = $post["count"] ?? 1; //默认就是1
+        $count = 1;
         $remark = $post["remark"] ?? '';
+
         if ($count <= 0 || empty($remark)) {
             self::$errCode = 1;
             self::$error = "参数错误";
@@ -794,12 +849,30 @@ class ShopContentLogic extends Logic
 
         $shop = self::getShopByCode($code);
         if (empty($shop)) {
+            self::$errCode = 9;
+            self::$error = "商家不存在";
+            return false;
+        }
+
+        if((int)$shop->is_freeze === 1){
+            self::$errCode = 7;
+            self::$error = "商家冻结中";
+            return false;
+        }
+
+        //判断 营业状态  is_run
+        if((int)$shop->is_run === 0){
+            self::$errCode = 8;
+            self::$error = "商家暂停营业中";
             return false;
         }
 
         // 判断是否过期
         $expire_time = $shop->expire_time;
+        //echo $expire_time;die;
+        $expire_time = strtotime($expire_time);
         if (time() < $expire_time) {
+            //未过期 不进行扣除
            return true;
         }