.

app/admin/controller/order/ReturnController.php

@@ -15,6 +15,7 @@ use app\model\SysSerial;
 use support\exception\BusinessException;
 use support\Request;
 use support\Response;
+use Tinywan\Jwt\JwtToken;
 
 class ReturnController extends Curd
 {
@@ -98,6 +99,7 @@ class ReturnController extends Curd
 
             if($data['order_return_status'] == 'DOING'){
                 $data['order_return_accept_datetime'] = date('Y-m-d H:i:s');
+                $data['join_order_return_user_id'] = JwtToken::getCurrentId();
             }
 
             $this->doUpdate($id, $data);

app/admin/service/goods/GoodsService.php

@@ -717,6 +717,20 @@ class GoodsService
 
             $data['goods_on_addtimes'] = date('Y-m-d\TH:i:s.u\Z', $data['goods_on_addtimes'] - 60 * 60 * 8);
 
+            // 详情表数据
+            if (!empty($data['goods_detail_specs_json'])){
+                $specsJson = json_decode($data['goods_detail_specs_json'],true);
+                foreach($specsJson as $itemSpecsJson){
+                    if (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '课时'){
+                        $data['curriculum']['period'] = $itemSpecsJson['val'];
+                    }elseif (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '群体'){
+                        $data['curriculum']['group'] = $itemSpecsJson['val'];
+                    }elseif (isset($itemSpecsJson['key']) && $itemSpecsJson['key'] == '课程'){
+                        $data['curriculum']['course'] = $itemSpecsJson['val'];
+                    }
+                }
+            }
+
             return json_success('', $data);
         } catch (\Exception $e) {
             dump($e->getMessage());
@@ -1422,6 +1436,23 @@ class GoodsService
             $params['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_detail_slider_json']);
             $params['goods_detail_slider_json'] = json_encode(['slider' => $params['goods_detail_slider_json']]);
         }
+
+        if(isset($params['curriculum'])){
+            $params['goods_detail_specs_json'] = json_encode([
+                [
+                    'key'=>'课时',
+                    'val'=>$params['curriculum']['period'] ?? '',
+                ],
+                [
+                    'key'=>'群体',
+                    'val'=>$params['curriculum']['group'] ?? '',
+                ],
+                [
+                    'key'=>'课程',
+                    'val'=>$params['curriculum']['course'] ?? '',
+                ],
+            ]);
+        }
         try {
             $model = new GoodsDetail();
             $model->join_detail_goods_id = $params['goods_id'];
@@ -1839,6 +1870,22 @@ class GoodsService
                 $data['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['goods_detail_slider_json']);
                 $data['goods_detail_slider_json'] = json_encode(['slider' => $data['goods_detail_slider_json']]);
             }
+            if(isset($params['curriculum'])){
+                $data['goods_detail_specs_json'] = json_encode([
+                    [
+                        'key'=>'课时',
+                        'val'=>$params['curriculum']['period'] ?? '',
+                    ],
+                    [
+                        'key'=>'群体',
+                        'val'=>$params['curriculum']['group'] ?? '',
+                    ],
+                    [
+                        'key'=>'课程',
+                        'val'=>$params['curriculum']['course'] ?? '',
+                    ],
+                ]);
+            }
             // 根据goods_id 查详情ID
             $detail = GoodsDetail::where('join_detail_goods_id', $params['goods_id'])->first();
             if ($detail) {