d

app/admin/controller/Consult.php

@@ -14,13 +14,13 @@ class Consult extends BaseController
         parent::__construct($app);
         $this->post=$this->request->post();
         $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-//        if($token==""){
-//            return error_show(101,'token不能为空');
-//        }
-//        $effetc = VerifyTokens($token);
-//        if(!empty($effetc) && $effetc['code']!=0) {
-//            return error_show($effetc['code'], $effetc['message']);
-//        }
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0) {
+            return error_show($effetc['code'], $effetc['message']);
+        }
     }
     public function list(){
       $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) :"1";

app/admin/controller/Sale.php

@@ -461,6 +461,27 @@ class Sale extends BaseController
     if(empty($dio)){
         return error_show(1002,"销售单信息未找到");
     }
+        if($status==1 && $dio['order_type']==2) {
+            $zxinfo = Db::name("consult")->where(["zxNo" => $dio['zxNo'], "is_del" => 0])->find();
+            if ($zxinfo == false) {
+                return error_show(1004, "未找到咨询单数据");
+            }
+            if ($zxinfo['zx_type'] == 2) {
+                if ($zxinfo['metals'] == "") {
+                    return error_show(1004, "未找到咨询单贵金属类型数据");
+                }
+                $metals = $zxinfo['metals'] == '18K' ? 1 : ($zxinfo['metals'] == '24K' ? 2 : 3);
+                $gold = Db::name("gold_price")->where(["type" => $metals])->order("addtime desc")->find();
+                if (empty($gold)) {
+                    return error_show(1004, "未找到咨询单贵金属类型数据");
+                }
+            }
+            $wsm = Db::name("warehouse_info")->where(["supplierNo" => $zxinfo['gysNo'], "wsm_type" => 2])->find();
+            if (empty($wsm)) {
+                return error_show(1002, "供应商仓库未找到");
+            }
+            $dio['gold_price']=$gold['gold_price'];
+        }
     Db::startTrans();
     try {
         $dio['status']=$status;
@@ -493,15 +514,6 @@ class Sale extends BaseController
                 }
             }
             if($status==1 && $dio['order_type']==2){
-                $zxinfo = Db::name("consult")->where(["zxNo"=>$dio['zxNo'],"is_del"=>0])->find();
-                if($zxinfo==false){
-                    return error_show(1004,"未找到咨询单数据");
-                }
-                $wsm = Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gysNo'],"wsm_type"=>2])->find();
-                if(empty($wsm)){
-                    Db::rollback();
-                    return error_show(1002,"供应商仓库未找到");
-                }
                 $cgd =makeNo("CG");
                 $clll=[
                     "cgdNo"=>$cgd,
@@ -526,6 +538,7 @@ class Sale extends BaseController
                     "weight"=>isset($zxinfo['weight'])?$zxinfo['weight']:0,
                     "supplierNo"=>$zxinfo['gysNo'],
                     "supplier_name"=>$zxinfo['gysname'],
+                    "gold_price"=>$gold['gold_price'],
                     "send_num"=>0,
                     "wsend_num"=>$dio['good_num'],
                     "remark"=>'',