Merge branch 'master-new' into master-new-dev-wf

.env

@@ -1 +1 @@
-APP_DEBUG = true

default_admin_addcount_role_id = 1
default_supplier_addcount_role_id = 90


[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

[USER]
hosturl=http://user.test241.wanyuhengtong.com/
+APP_DEBUG = true

default_admin_addcount_role_id = 1
default_supplier_addcount_role_id = 90


[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

[USER]
hosturl=http://user.test241.wanyuhengtong.com/

[FIN]
hosturl=http://stockinv.test241.wanyuhengtong.com/

app/abutment/controller/Order.php

@@ -977,7 +977,6 @@ class Order extends HomeBaseController
             })
             ->select()
             ->toArray();
-
         foreach ($list as &$value) {
 
             if ($value['order_type'] == 3) {
@@ -989,9 +988,12 @@ class Order extends HomeBaseController
                 $specinfo = isset($temp['specinfo']) ? json_decode($temp['specinfo'], true) : [];
 
                 $speclist = [];
-                foreach ($specinfo as $val) {
-                    $speclist[] = $val['spec_name'] . ':' . $val['spec_value_name'];
+                if(!empty($specinfo)){
+                	 foreach ($specinfo as $val) {
+                        $speclist[] = $val['spec_name'] . ':' . $val['spec_value_name'];
+                    }
                 }
+
                 $value['税率'] = $temp['tax'] . '%';
             } else {
                 $good_unit = Db::name('good_basic')

app/admin/controller/After.php

@@ -134,7 +134,10 @@ class After extends Base
             ->where("status", "=", 4)
             ->sum("return_num");
         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']??"结算校验失败");
+				}
 //        $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']) :"";
 //        $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";
@@ -622,7 +625,11 @@ class After extends Base
                 //判断 退回供应商 or 退回业务公司
                 if ($info['status'] == 2 && $param['status'] == 11) {
                     $info['return_tag'] = 2;
-
+                    $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$info['orderCode']]);
+					if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
+//						return json_show(1005, $fininfo['message']??"结算校验失败");
+						throw new Exception($fininfo['message']??"结算校验失败");
+					}
                     //退入次品仓，维护
                     $wsm = Db::name('warehouse_info')->where(['is_del' => 0, 'wsm_code' => $param['wsm_code']])->findOrEmpty();
                     if (empty($wsm)) throw new Exception('返回仓库不存在');
@@ -644,7 +651,14 @@ class After extends Base
                     ]);
 //                    }
 
-                } else $info['return_tag'] = 1;
+                } else{
+                	 $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$info['orderCode'],"isCgd"=>1]);
+					if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
+//						return json_show(1005, $fininfo['message']??"结算校验失败");
+						throw new Exception($fininfo['message']??"结算校验失败");
+					}
+					$info['return_tag'] = 1;
+                }
 
                 $var = $info['status'];
                 $info['status'] = $param['status'];

app/admin/controller/Reorder.php

@@ -54,11 +54,10 @@ class Reorder extends Base
         if (!isset($tmp['code']) || $tmp['code'] != 0) return json_show($tmp['code'], $tmp['message'], $tmp['data']);
         $supplier = $tmp['data'];
         if (empty($supplier)) return json_show(1005, "未找到商品供应商数据");
-//        $supplier =Db::name("supplier")->where(["code"=>$goon['supplierNo']])->find();
-//        if($supplier==false){
-//            return json_show(1005,"未找到商品供应商数据");
-//        }
-//        $names = $userCommon->handle('getCodeAndName',['code'=>[$order['supplierNo'],$order['customer_code']]]);
+		$fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$ordeCode]);
+		if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
+			return json_show(1005, $fininfo['message']??"结算校验失败");
+		}
 
         $errorCode = isset($this->post['errorCode']) && $this->post['errorCode'] != '' ? trim($this->post['errorCode']) : "";
         if ($errorCode == '') return json_show(1004, "参数errorCode 不能为空");
@@ -865,7 +864,6 @@ class Reorder extends Base
         $var = $info['status'];
         $orderinfo = Db::name("sale")->where(["orderCode" => $info["orderCode"]])->findOrEmpty();
         if (empty($orderinfo)) return json_show(1004, "未找到订单数据");
-
         if ($status == 4) {
             if ($info['is_addr'] == 1) {
                 $addr = Db::name("sale_returnaddr")
@@ -896,7 +894,11 @@ 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']??"结算校验失败");
+		}
         Db::startTrans();
         try {
 
@@ -1496,6 +1498,11 @@ class Reorder extends Base
         if ($orderCode == '') {
             return json_show(1004, "参数orderCode 不能为空");
         }
+
+        $fininfo =GetFin("admin/orderischeck",["token"=>$this->post['token'],"orderCode"=>$orderCode]);
+		if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
+			return json_show(1005, $fininfo['message']??"结算校验失败");
+		}
         $order = Db::name("sale")->where(["orderCode" => $orderCode, "is_del" => 0])->find();
         if (empty($order)) {
             return json_show(1005, "未找到订单数据");

app/admin/controller/Sale.php

@@ -5175,7 +5175,12 @@ class Sale extends Base
                     $stock = Db::name("good")->where($good)->update(["usable_stock" => $good['usable_stock'] + $sale['wsend_num'], "updatetime" => date("Y-m-d H:i:s")]);
                     if ($stock == false) throw new Exception('商品库存更新失败');
                 }
-
+				 $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']??"结算校验失败");
+//					return json_show(1005, $fininfo['message']??"结算校验失败");
+				}
                 //修改状态，添加待办
                 ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                     "order_code" => $sale['orderCode'],//销售单号

app/common.php

@@ -28,15 +28,6 @@ function GetUserInfo($token){
 
     $userCommon = \app\admin\common\User::getIns();
     return $userCommon->handle('verifyToken',['token'=>$token]);
-
-//    $host = Config::get("app");
-//    $url = $host["api_host"]."/Api/userinfo";
-//    $data=[
-//        "token"=>$token
-//    ];
-//    $response=curl_request($url,$data);
-//
-//    return json_decode($response,true);
 }
 //参数1：访问的URL，参数2：post数据(不填则为GET)，参数3：提交的$cookies,参数4：是否返回$cookies
 function curl_request($url,$post=''){
@@ -110,13 +101,6 @@ function makeSalt(){
  * @throws \think\exception\DbException
  */
 function VerifyTokens($token){
-//    $host = Config::get("app");
-//    $url = $host["api_host"]."/Api/verify_token";
-//    $data=[
-//        "token"=>$token
-//    ];
-//    $response=curl_request($url,$data);
-
     $userCommon = CommonUser::getIns();
     $rs = $userCommon->VerifyTokens(['token'=>$token]);
 
@@ -134,6 +118,14 @@ function GetUserlist($token,$condition){
     return json_decode($userCommon->GetUserlist($condition), true);
 }
 
+if(!function_exists("GetFin")){
+	function GetFin($uri,$post){
+		$host =env("fin.hosturl");
+		$data =curl_request($host.$uri,$post);
+		return $data;
+	}
+}
+
 /**
  * @param $token
  * @param $condition