wugg 1 gadu atpakaļ
vecāks
revīzija
a92ae33d3e

+ 2 - 2
app/admin/controller/Activity.php

@@ -232,8 +232,8 @@ class Activity extends Base
         $good_online = Db::name('good_basic')->where(['spuCode'=>array_column($list,"spuCode")])->column('id',"spuCode");
         foreach ($list as $value){
             $value['cat_info']= made($value['cat_id'],[]);
-            $value['is_basic']=$goodbasice[$value['spuCode']]?:null;
-            $value['order_creater_depart']=$depart[$value['order_createrid']]?:'';
+            $value['is_basic']=$goodbasice[$value['spuCode']]??null;
+            $value['order_creater_depart']=$depart[$value['order_createrid']]??'';
             
             $value['is_online']=isset($good_online[$value['spuCode']])?1:0;
 

+ 6 - 0
app/admin/controller/Goodup.php

@@ -1586,6 +1586,10 @@ class Goodup extends Base
         if($online_remark===""){
             return error_show(1004,"参数online_remark不能为空");
         }
+        $market_url= isset($this->post['market_url'])&&$this->post['market_url']!==''? trim($this->post['market_url']):'';
+        if($market_url===''){
+            return error_show(1004,'参数market_url不能为空');
+        }
         $fixed = isset($this->post['is_fixed'])&&$this->post['is_fixed']!==''? intval($this->post['is_fixed']):1;
         if($fixed==1){
         	//使用实时金价
@@ -1616,6 +1620,7 @@ class Goodup extends Base
             'platform_id'=>$platform,
             'online_reason'=>$online_reason,
             'online_remark'=>$online_remark,
+            'market_url'=>$market_url,
             'good_data'=>$datas,
             'createrid'=>$createrid,
             'creater'=>$creater,
@@ -1677,6 +1682,7 @@ class Goodup extends Base
                     "exam_status"=>$count>0 ?2:1,
                     "is_online"=>0,
                     "is_fixed"=>$fixed,
+                    'market_url'=>$market_url,
                     "status"=>1,
                     "is_del"=>0,
                     "creater"=>$creater,

+ 1 - 0
app/youzan/logic/Goodup.php

@@ -134,6 +134,7 @@ class Goodup
                     "createrid" => $data['createrid'],
                     "creater" => $data['creater'],
                     "updaterid" => $data['createrid'],
+                    'market_url'=>$value['market_url'],
                     "updater" => $data['creater'],
                     "addtime" => date("Y-m-d H:i:s"),
                     "updatetime" => date("Y-m-d H:i:s")