ad

app/admin/controller/Goodup.php

@@ -525,6 +525,14 @@ class Goodup extends Base
         if($good_size==''){
             return error_show(1004,"参数good_size不能为空");
         }
+        $proof_type = isset($this->post['proof_type'])&&$this->post['proof_type']!=""? trim($this->post['proof_type']):"";
+          if($proof_type==''){
+            return error_show(1004,"参数proof_type不能为空");
+        }
+       $proof_url = isset($this->post['proof_url'])&&$this->post['proof_url']!=""? trim($this->post['proof_url']):"";
+         if($proof_url==''){
+            return error_show(1004,"参数proof_url不能为空");
+        }
         $company_id = isset($this->post['company_id'])&&$this->post['company_id']!=""? trim($this->post['company_id']) :"";
         if($company_id==''){
             return error_show(1004,"参数company_id不能为空");
@@ -753,10 +761,21 @@ class Goodup extends Base
                     }
                     $count = Db::name("good_spec")->insertAll($temp);
                     if($count==0){
-                        Db::rollback();
-                        return app_show(1004,"商品规格值创建失败");
+                      throw new \Exception("商品规格值创建失败");
                     }
                 }
+                 $proof=[
+		                    'spuCode'=>$spucode,
+		                    'proof_type'=>$proof_type,
+		                    'proof_url'=>$proof_url,
+		                    'is_del'=>0,
+		                    "creater"=>$creater,
+		                    "createrid"=>$createrid,
+		                    "addtime"=>date("Y-m-d H:i:s"),
+		                    "updatetime"=>date("Y-m-d H:i:s")
+		                    ];
+		                $inproof = Db::name("good_proof")->insert($proof);
+		                if($inproof==false)throw new \Exception("商品凭证新建失败");
 //                $catinfo = Db::name("cat")->where(["id"=>$cat_id])->find();
 //                $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']/100:0;
                 $top_cat_id = made($cat_id);//获取所有分类
@@ -795,8 +814,7 @@ class Goodup extends Base
                     }
                     $count = Db::name("good_nake")->insertAll($temp);
                     if($count==0){
-                        Db::rollback();
-                        return app_show(1004,"商品规格值创建失败");
+                    	throw new \Exception("商品成本创建失败");
                     }
                 }
 
@@ -820,8 +838,7 @@ class Goodup extends Base
                     return app_show(0,"创建成功",["spuCode"=>$spucode]);
 
             }else{
-                Db::rollback();
-                return app_show(1004,"商品创建失败");
+              throw new \Exception("商品创建失败");
             }
         }catch (\Exception $e){
             Db::rollback();
@@ -1000,6 +1017,9 @@ class Goodup extends Base
         }
         $count = Db::name("good_nake")->where(["spuCode"=>$supcode,"is_del"=>0])->count();
         $speclist = isset($this->post['speclist'])&&!empty($this->post['speclist'])? $this->post['speclist']:"";
+        $proof_type = isset($this->post['proof_type'])&&$this->post['proof_type']!=""? trim($this->post['proof_type']):"";
+        $proof_url = isset($this->post['proof_url'])&&$this->post['proof_url']!=""? trim($this->post['proof_url']):"";
+
         Db::startTrans();
         try {
             $temp=[
@@ -1073,6 +1093,21 @@ class Goodup extends Base
                         }
                     }
                 }
+                if($proof_url!=''){
+                $proof=[
+		                    'spuCode'=>$supcode,
+		                    'proof_type'=>$proof_type,
+		                    'proof_url'=>$proof_url,
+		                    'is_del'=>0,
+		                    "creater"=>$this->uid,
+		                    "createrid"=>$this->uname,
+		                    "addtime"=>date("Y-m-d H:i:s"),
+		                    "updatetime"=>date("Y-m-d H:i:s")
+		                    ];
+		                $inproof = Db::name("good_proof")->insert($proof);
+		                if($inproof==false)throw new \Exception("商品凭证新建失败");
+                }
+
                 //修改状态，添加待办
                 ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                     "order_code" =>$supcode,//咨询单详情编号
@@ -1811,18 +1846,6 @@ class Goodup extends Base
 
                     }
                     if ($post['exam_status'] == 3) {
-						 $proof=[
-		                    'spuCode'=>$platform['spuCode'],
-		                    'proof_type'=>$post['proof_type'],
-		                    'proof_url'=>$post['proof_url'],
-		                    'is_del'=>0,
-		                    "creater"=>$creater,
-		                    "createrid"=>$createrid,
-		                    "addtime"=>date("Y-m-d H:i:s"),
-		                    "updatetime"=>date("Y-m-d H:i:s")
-		                    ];
-		                $inproof = Db::name("good_proof")->insert($proof);
-		                if($inproof==false)throw new \Exception("商品凭证新建失败");
 		                if(empty($post['good_ladder']))throw new \Exception("商品阶梯价不能为空");
 		                foreach ($post['good_ladder'] as $value){
 		                	     $lemp=[];
@@ -2377,6 +2400,8 @@ class Goodup extends Base
         $speclist = isset($this->post['speclist'])&&!empty($this->post['speclist'])? $this->post['speclist']:"";
 
         $is_support_barter = isset($this->post['is_support_barter']) && $this->post['is_support_barter'] !== "" ? intval($this->post['is_support_barter']) : 1;
+		$proof_type = isset($this->post['proof_type'])&&$this->post['proof_type']!=""? trim($this->post['proof_type']):"";
+        $proof_url = isset($this->post['proof_url'])&&$this->post['proof_url']!=""? trim($this->post['proof_url']):"";
 
         Db::startTrans();
         try {
@@ -2482,6 +2507,20 @@ class Goodup extends Base
                         }
                     }
                 }
+               if($proof_url!=''){
+                $proof=[
+		                    'spuCode'=>$supcode,
+		                    'proof_type'=>$proof_type,
+		                    'proof_url'=>$proof_url,
+		                    'is_del'=>0,
+		                    "creater"=>$this->uid,
+		                    "createrid"=>$this->uname,
+		                    "addtime"=>date("Y-m-d H:i:s"),
+		                    "updatetime"=>date("Y-m-d H:i:s")
+		                    ];
+		                $inproof = Db::name("good_proof")->insert($proof);
+		                if($inproof==false)throw new \Exception("商品凭证新建失败");
+                }
                 if($good_ladder!=="" && !empty($good_ladder)){
 
 //                    $user =GetUserInfo($this->post['token']);//获取用户信息，下面更新成本表的创建人

app/admin/controller/Sale.php

@@ -5165,7 +5165,7 @@ class Sale extends Base
             foreach ($list as $sale) {
 
                 if ($sale['sale_status'] == 3) throw new \think\Exception($sale['orderCode'] . '已取消，无法重复操作');
-                if (cat_is_gold($sale['cat_id'])) throw new \think\Exception($sale['orderCode'] . '为贵金属，无法取消');
+//                if (cat_is_gold($sale['cat_id'])) throw new \think\Exception($sale['orderCode'] . '为贵金属，无法取消');
 //                if ($sale['sale_status']!=0) throw new \think\Exception($sale['orderCode'] . '已发货，无法取消');
                 if ($sale['order_type'] == 1) {
                     if ($sale['sale_status'] != 0) throw new \think\Exception($sale['orderCode'] . '已发货，无法取消');