Browse Source

细节优化

wufeng 2 years ago
parent
commit
152933e22d
2 changed files with 4 additions and 5 deletions
  1. 2 3
      app/admin/controller/After.php
  2. 2 2
      app/admin/controller/Good.php

+ 2 - 3
app/admin/controller/After.php

@@ -1259,9 +1259,8 @@ class After extends Base
             ->findOrEmpty();
         if (empty($info)) return error_show(1005, "未找到售后数据");
 
-//        if(($info['is_receive']==0&&$info['status']!=3)||($info['is_receive']==1&&$info['status']!=4) ){
-//            return error_show(1005,"售后单流程状态有误");
-//        }
+        if (($info['is_receive'] != 0 || $info['status'] != 4)) return error_show(1005, "售后单流程状态有误");
+
         $out = Db::name("order_out")
             ->where(["outCode" => $info["outCode"], "is_del" => 0])
             ->findOrEmpty();

+ 2 - 2
app/admin/controller/Good.php

@@ -842,10 +842,10 @@ class Good extends Base
         }
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
-        if($relaComNo!="") $where[]=['b.companyNo','=', $relaComNo];
+        if($relaComNo!="") $condition[]=['b.companyNo','=', $relaComNo];
 
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']):"";
-        if($supplierNo!=="") $where[]=['b.supplierNo','=', $supplierNo];
+        if($supplierNo!=="") $condition[]=['b.supplierNo','=', $supplierNo];
 
         $count = Db::name("good")
             ->alias("b")