Browse Source

Merge branch 'version1.5' into dev_process_action_wf

wufeng 2 years ago
parent
commit
0b816c0a1a
1 changed files with 9 additions and 2 deletions
  1. 9 2
      app/admin/controller/Goodup.php

+ 9 - 2
app/admin/controller/Goodup.php

@@ -373,6 +373,8 @@ class Goodup extends Base
 //        if($is_step==1 &&  $good_ladder==""){
 //            return error_show(1004,"启用阶梯,阶梯价不能为空");
 //        }
+        $is_support_barter = isset($this->post['is_support_barter']) && $this->post['is_support_barter'] !== "" ? intval($this->post['is_support_barter']) : 1;
+
         $token = isset($this->post['token'])&& $this->post['token']!='' ? trim($this->post['token']):"";
         if($token==''){
             return error_show(105,"参数token不能为空");
@@ -447,7 +449,8 @@ class Goodup extends Base
                 "createrid"=>$createrid,
                 "creater"=>$creater,
                 "addtime"=>date("Y-m-d H:i:s"),
-                "updatetime"=>date("Y-m-d H:i:s")
+                "updatetime"=>date("Y-m-d H:i:s"),
+                'is_support_barter'=>$is_support_barter
             ];
             $in = Db::name("good_basic")->insert($data);
             if($in){
@@ -2106,6 +2109,9 @@ class Goodup extends Base
 //            return error_show(1004,"启用阶梯,阶梯价不能为空");
 //        }
         $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;
+
         Db::startTrans();
         try {
             $temp=[
@@ -2162,7 +2168,8 @@ class Goodup extends Base
                 "is_step" => count($good_ladder) > 1 ? 1 : 0,
                 "stock_moq"=>$stock_moq,
                 "status"=>"0",
-                "updatetime"=>date("Y-m-d H:i:s")
+                "updatetime"=>date("Y-m-d H:i:s"),
+                'is_support_barter'=>$is_support_barter
             ];
             $field = array_diff_assoc($temp,$data);
             $temp['field_change'] =empty($field)?"":json_encode(array_keys($field));