Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/After.php

@@ -30,7 +30,7 @@ class After extends Base
              ->where("status","not in",[5,8])->sum("error_num");
 
         $th_num =Db::name("order_back")->where(["orderCode"=>$orderout['orderCode'],"outCode"=>$outCode,"is_del"=>0])
-            ->where("status","<>",4)->sum("return_num");
+            ->where("status","<",4)->sum("return_num");
         if($th_num!=0 || $after_num!=0){
             return error_show(1005,"存在售后或售后退货未结束流程");
         }