ad

app/admin/controller/After.php

@@ -136,7 +136,7 @@ class After extends Base
         if ($num > ($orderout['send_num'] - $thnum)) return error_show(1004, "可用售后数量不足");
          $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$orderout['orderCode']]);
 				if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-					return json_show(1005, $fininfo['message']??"结算校验失败");
+					return json_show(10005, $fininfo['message']??"结算校验失败",$fininfo['data']??[]);
 				}
 //        $except_code =isset($this->post['except_code']) &&$this->post['except_code']!=''?trim($this->post['except_code']) :"";
 //        $img = isset($this->post['img']) &&$this->post['img']!=''?trim($this->post['img']) :"";
@@ -578,10 +578,10 @@ class After extends Base
             }
 			if(in_array($info['status'],[9,10])&& $param['status'] == 4){
 				$fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$info['orderCode'],"isCgd"=>1]);
-				if(!isset($fininfo['code'])||$fininfo['code']!=0 )throw new Exception($fininfo['message']??"结算校验失败");
+				if(!isset($fininfo['code'])||$fininfo['code']!=0 )return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 			}else{
 				 $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$info['orderCode']]);
-				 if(!isset($fininfo['code'])||$fininfo['code']!=0 )throw new Exception($fininfo['message']??"结算校验失败");
+				 if(!isset($fininfo['code'])||$fininfo['code']!=0 )return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 			}
             //获取最新的供应商负责人
             $s_info = \app\admin\common\User::getIns()->handle('sInfo', ['code' => $info['supplierNo']]);

app/admin/controller/DataChange.php

@@ -32,14 +32,14 @@ class DataChange extends Base
   		$orderinfo = Db::name("purchease_order")->where(["cgdNo"=>$param['code']])->find();
   		  $fininfo =GetFin('admin/orderischeck',['token'=>$this->post['token'],'orderCode'=>$param['code'],'is_cgd_check'=>1]);
 				if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-					return json_show(1005, $fininfo['message']??'结算校验失败');
+					return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 				}
   	}
   	if($param['type']==2){
   		$orderinfo = Db::name('sale')->where(['orderCode'=>$param['code']])->find();
   		$fininfo =GetFin('admin/orderischeck',['token'=>$this->post['token'],'orderCode'=>$param['code'],'is_cgd_check'=>0]);
 		if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-			return json_show(1005, $fininfo['message']??'结算校验失败');
+			return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 		}
   	}
   	if($param['type']==3){
@@ -114,13 +114,13 @@ class DataChange extends Base
     	if($info->type==1){
     		    $fininfo =GetFin('admin/orderischeck',['token'=>$this->post['token'],'orderCode'=>$info->code,"is_cgd_check"=>1]);
 				if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-					return json_show(1005, $fininfo['message']??'结算校验失败');
+					return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 				}
     	}
     	if($info->type==2){
     		    $fininfo =GetFin('admin/orderischeck',['token'=>$this->post['token'],'orderCode'=>$info->code,'is_cgd_check'=>0]);
 				if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-					return json_show(1005, $fininfo['message']??'结算校验失败');
+					return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 				}
     	}
     }

app/admin/controller/Purch.php

@@ -169,7 +169,7 @@ class Purch extends Base
             ->where($where)
             ->where(function ($query) use ($where) {
                 $query->whereOr([['po.order_type', '<>', 1], ['po.order_source', '=', 0]]);
-            })->count();
+            })->count("po.id");
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name("purchease_order")

app/admin/controller/Reorder.php

@@ -56,7 +56,7 @@ class Reorder extends Base
         if (empty($supplier)) return json_show(1005, "未找到商品供应商数据");
 		$fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$ordeCode]);
 		if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-			return json_show(1005, $fininfo['message']??"结算校验失败");
+			return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 		}
 
         $errorCode = isset($this->post['errorCode']) && $this->post['errorCode'] != '' ? trim($this->post['errorCode']) : "";
@@ -861,7 +861,7 @@ class Reorder extends Base
         if (in_array($info['status'], [9, 10]) && $param['status'] == 4) $info['is_th'] = 1;//除了8-11-12-4之外，其余9-4和10-4都属于供应商同意退货
 		$fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$info["orderCode"],"isCgd"=>$info['is_th']]);
 		if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-			return json_show(1005, $fininfo['message']??"结算校验失败");
+			return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 		}
         Db::startTrans();
         try {
@@ -1326,7 +1326,7 @@ class Reorder extends Base
 
         $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$orderCode]);
 		if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-			return json_show(1005, $fininfo['message']??"结算校验失败");
+			return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 		}
         $order = Db::name("sale")->where(["orderCode" => $orderCode, "is_del" => 0])->find();
         if (empty($order)) {

app/admin/controller/Sale.php

@@ -5402,7 +5402,8 @@ class Sale extends Base
                 }
 				 $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$sale['orderCode'], "isCgd"=>1]);
 				if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-					throw new Exception($fininfo['message']??"结算校验失败");
+					Db::rollback();
+					return json_show(10005, $fininfo['message']??'结算校验失败',$fininfo['data']??[]);
 				}
 				$thtemp=[
 					"orderCode"=>$sale["orderCode"],

app/admin/model/OrderUse.php

@@ -0,0 +1,14 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model;
+
+use think\Model;
+
+/**
+ * @mixin \think\Model
+ */
+class OrderUse extends Model
+{
+    //
+}

app/command/caixiao.php

@@ -40,17 +40,14 @@ class caixiao extends Command
     {
         // 指令输出
         $key="caixiao_copy";
-        $rs = Cache::store('redis')->inc($key);
-        if ($rs!=1){
-            Cache::store('redis')->dec($key);
-            return true;
-        }
+        $rs = Cache::store('redis')->get($key);
+        if ($rs!=0) return true;
+	    Cache::store('redis')->set($key,1,180);
         $this->hour=date('Y-m-d H:i:s',strtotime('-1 hours'));
         $this->contect= Db::connect('mysql_cxinv');
         $this->table =$this->contect->name("caixiao_data");
         $this->sale();
         $this->cgd();
-        Cache::store('redis')->dec($key);
         $output->writeln('caixiao');
     }