合并分支 'master-server' 到 'master'

Master server



查看合并请求 !906

@@ -110,7 +110,7 @@ class DetailController extends BaseController
             'product_id.required' => '产品id不能为空',
             'product_id.required' => '产品id不能为空',
             'data.required' => 'data不能为空',
             'data.required' => 'data不能为空',
         ]);
         ]);
-        $data = $logic->saveDetail();
+        $data = $logic->saveDetail($this->param['product_id'],$this->param['data']);
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 

@@ -94,7 +94,7 @@ class TranslateController extends BaseController
             $resData['route'] = $values['url'];
             $resData['route'] = $values['url'];
             $resData['page'] = $values['page'];
             $resData['page'] = $values['page'];
             $resData['data'] = [];
             $resData['data'] = [];
-            $keyInfo = $keyModel->read(['route'=>$values['route'],'page'=>$values['page']],['id','proof_key']);
+            $keyInfo = $keyModel->read(['route'=>$values['url'],'page'=>$values['page']],['id','proof_key']);
             if($keyInfo !== false){
             if($keyInfo !== false){
                 $result_id_data[] = $keyInfo['id'];
                 $result_id_data[] = $keyInfo['id'];
                 $translate_data = json_decode($values['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
                 $translate_data = json_decode($values['translate_data']['data'],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);

@@ -50,15 +50,15 @@ class DetailLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2024/11/13 9:30
      * @time   :2024/11/13 9:30
      */
      */
-    public function saveDetail(){
-        if(!empty($this->param['data'])){
+    public function saveDetail($product_id,$data){
+        if(!empty($data)){
             try {
             try {
-                foreach ($this->param['data'] as $data){
-                    foreach ($data as $v){
+                foreach ($data as $val){
+                    foreach ($val as $v){
                         $save_data = [
                         $save_data = [
                             'sort'=>$v['sort'],
                             'sort'=>$v['sort'],
                             'column_id'=>$v['column_id'],
                             'column_id'=>$v['column_id'],
-                            'product_id'=>$this->param['product_id'],
+                            'product_id'=>$product_id,
                             'text_type'=>$v['text_type'],
                             'text_type'=>$v['text_type'],
                             'title'=>$v['title'] ?? '',
                             'title'=>$v['title'] ?? '',
                             'content'=>json_encode($v['content'] ?? [],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
                             'content'=>json_encode($v['content'] ?? [],JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES),
@@ -75,6 +75,6 @@ class DetailLogic extends BaseLogic
                 $this->fail('保存失败，请联系管理员.错误：'.$e->getMessage());
                 $this->fail('保存失败，请联系管理员.错误：'.$e->getMessage());
             }
             }
         }
         }
-        return $this->success(['product_id'=>$this->param['product_id']]);
+        return $this->success(['product_id'=>$product_id]);
     }
     }
 }
 }

@@ -67,6 +67,9 @@ class ProductLogic extends  BaseLogic
             //产品分类关联
             //产品分类关联
             CategoryRelated::saveRelated($id, $category_ids);
             CategoryRelated::saveRelated($id, $category_ids);
             KeywordRelated::saveRelated($id,$category_ids);
             KeywordRelated::saveRelated($id,$category_ids);
+            //更新产品新描述
+            $detailLogic = new DetailLogic();
+            $detailLogic->saveDetail($id,$this->param['data'] ?? []);
             //保存扩展字段
             //保存扩展字段
             $this->saveExtendInfo($id,$extend);
             $this->saveExtendInfo($id,$extend);
         }catch (\Exception $e){
         }catch (\Exception $e){

@@ -294,9 +294,7 @@ class TranslateLogic extends BaseLogic
                 $id = $this->model->addReturnId($param);
                 $id = $this->model->addReturnId($param);
                 TranslateData::insert(['trans_id'=>$id,'data'=>json_encode($data,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)]);
                 TranslateData::insert(['trans_id'=>$id,'data'=>json_encode($data,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)]);
             }else{
             }else{
-                if(!empty($data)){
-                    TranslateData::where(['trans_id'=>$info['id']])->update(['data'=>json_encode($data,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)]);
-                }
+                TranslateData::where(['trans_id'=>$info['id']])->update(['data'=>json_encode($data,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)]);
             }
             }
             //写日志
             //写日志
             $userLogModel = new UserLog();
             $userLogModel = new UserLog();