1

application/api_broker/controller/OfficeOrderLog.php

@@ -160,6 +160,8 @@ class OfficeOrderLog extends Basic{
             return $this->response("101", "付款类型或支付方式错误");
         } elseif ($is_ok == -2) {
             return $this->response("101", "调整金额不能多于可被调整的金额");
+        } elseif($is_ok == -3){
+            return $this->response("101", "门店未查询到");
         }
         return $this->response("101", "request faild");
     }

application/api_broker/controller/OrderLog.php

@@ -190,6 +190,8 @@ class OrderLog extends Basic
             return $this->response("101", "付款类型或支付方式错误");
         } elseif ($is_ok == -2) {
             return $this->response("101", "调整金额不能多于可被调整的金额");
+        } elseif ($is_ok == -3) {
+            return $this->response("101", "门店未查询到");
         }
         return $this->response("101", "request faild");
     }
@@ -201,10 +203,10 @@ class OrderLog extends Basic
     public function isShowAdjustment()
     {
         $params = $this->params;
-     /*   $params = array(
-            "pay_id"   => 1,
-            "agent_id" => 11,
-        );*/
+        /*   $params = array(
+               "pay_id"   => 1,
+               "agent_id" => 11,
+           );*/
         if (empty($params["pay_id"]) || empty($params["agent_id"])) {
             return $this->response("101", "请求参数错误");
         }
@@ -212,12 +214,12 @@ class OrderLog extends Basic
         $agent_id = $params["agent_id"];
 
         $result = $this->service_->verifyIsShowAdjustment($pay_id, $agent_id);
-        if($result["code"] == 101){
-            return $this->response("101",$result["msg"]);
-        }else if($result["code"] == 200){
-            return $this->response("200","success",["is_show" => $result["is_show"]]);
+        if ($result["code"] == 101) {
+            return $this->response("101", $result["msg"]);
+        } else if ($result["code"] == 200) {
+            return $this->response("200", "success", ["is_show" => $result["is_show"]]);
         }
-        return $this->response("200","success",["is_show" => false]);
+        return $this->response("200", "success", ["is_show" => false]);
     }
 
 
@@ -362,7 +364,7 @@ class OrderLog extends Basic
         }
 
         try {
-            $list = $this->service_->searchBargainAgents($params["type"], $params["order_id"],$this->siteId);
+            $list = $this->service_->searchBargainAgents($params["type"], $params["order_id"], $this->siteId);
             if (count($list) > 0) {
                 return $this->response("200", "request success", $list);
             } else {

application/api_broker/service/OfficeOrderLogService.php

@@ -88,6 +88,9 @@ class OfficeOrderLogService
         $redis_service = new RedisCacheService();
         $agent_data    = $redis_service->getRedisCache(2, $agent_id);
         $store_id      = $agent_data['store_id'];
+        if($store_id <= 0){
+            return -3;
+        }
         foreach ($collecting_bill as $collecting) {
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
                 if (!$this->verifyType($collecting["type"], $collecting["pay_type"], $receipt_number)) {

application/api_broker/service/OrderLogService.php

@@ -87,6 +87,9 @@ class OrderLogService
         $redis_service = new RedisCacheService();
         $agent_data    = $redis_service->getRedisCache(2, $agent_id);
         $store_id      = $agent_data['store_id'];
+        if($store_id <= 0){
+            return -3;
+        }
         foreach ($collecting_bill as $collecting) {
             if (isset($collecting["type"]) && isset($collecting["pay_type"]) && isset($collecting["money"])) {
                 if (!$this->verifyType($collecting["type"], $collecting["pay_type"], $receipt_number)) {

application/index/controller/Finance.php

@@ -4051,6 +4051,8 @@ class Finance extends Basic
             return $this->response("101", "付款类型或支付方式错误");
         } elseif ($is_ok == -2) {
             return $this->response("101", "调整金额不能多于可被调整的金额");
+        }elseif($is_ok == -3){
+            return $this->response("101", "门店未查询到");
         }
         return $this->response("101", "request faild");
     }

application/index/controller/OfficePayLog.php

@@ -2390,6 +2390,8 @@ class OfficePayLog extends Basic
             return $this->response("101", "付款类型或支付方式错误");
         } elseif ($is_ok == -2) {
             return $this->response("101", "调整金额不能多于可被调整的金额");
+        }elseif($is_ok == -3){
+            return $this->response("101", "门店未查询到");
         }
         return $this->response("101", "request faild");
     }