完善功能

app/admin/controller/order/RefundController.php

@@ -38,6 +38,9 @@ class RefundController extends Curd
             'member' => function ($query) {
                 $query->select('member_id', 'member_mobile');
             },
+            'cert'=>function($query){
+                $query->select('join_cert_member_id','member_cert_name');
+            },
             'order' => function ($query) {
                 $query->select('order_id', 'order_name');
             }
@@ -168,7 +171,7 @@ class RefundController extends Curd
             if (!empty($item['refund'])){
                 if (!empty($item['refund']['order_return_apply_json'])  && is_json($item['refund']['order_return_apply_json'])){
                     $json = json_decode($item['refund']['order_return_apply_json'],true);
-                    $item['refund']['order_return_apply_json'] = $json['apply'] ?? '';
+                    $item['refund']['order_return_apply_json'] = $json['reason'] ?? '';
                 }
                 if (!empty($item['refund']['order_return_recharge_json'])  && is_json($item['refund']['order_return_recharge_json'])){
                     $json = json_decode($item['refund']['order_return_recharge_json'],true);

app/admin/controller/order/ReturnController.php

@@ -95,6 +95,11 @@ class ReturnController extends Curd
     {
         try {
             [$id, $data] = $this->updateInput($request);
+
+            if($data['order_return_status'] == 'DOING'){
+                $data['order_return_accept_datetime'] = date('Y-m-d H:i:s');
+            }
+
             $this->doUpdate($id, $data);
         } catch (BusinessException $e) {
             return json_fail($e->getMessage());

app/admin/service/goods/GoodsService.php

@@ -1452,6 +1452,9 @@ class GoodsService
             }
             $data = [];
             foreach ($params['goods_content_list'] as $item) {
+                if(!in_array($item['goods_id'],$params['join_component_goods_id'])){
+                    continue;
+                }
                 $goods = Goods::where('goods_id', $params['goods_id'])->first();
                 if (!$goods) {
                     continue;
@@ -1646,15 +1649,15 @@ class GoodsService
                 if (!empty($params['appointment_label'])) {
                     $attributeJson['label'] = $params['appointment_label'];
                 }
-                if (!empty($params['address'])) {
-                    $attributeJson['address'] = $params['address'];
-                }
-                if (!empty($params['position'])){
-                    $attributeJson['position'] = $params['position'];
-                }
-                if (isset($params['goods_service_premises'])){
-                    $attributeJson['service_premises_id'] = $params['goods_service_premises'];
-                }
+                // if (!empty($params['address'])) {
+                //     $attributeJson['address'] = $params['address'];
+                // }
+                // if (!empty($params['position'])){
+                //     $attributeJson['position'] = $params['position'];
+                // }
+                // if (isset($params['goods_service_premises'])){
+                //     $attributeJson['service_premises_id'] = $params['goods_service_premises'];
+                // }
                 if (isset($params['min_count'])){
                     $attributeJson['min-count'] = $params['min_count'];
                 }else{

app/model/OrderReturn.php

@@ -18,7 +18,11 @@ class OrderReturn extends Model
 
     public function member()
     {
-        return $this->hasOne(Member::class, 'member_id', 'join_order_return_user_id');
+        return $this->hasOne(Member::class, 'member_id', 'join_return_member_id');
+    }
+    public function cert()
+    {
+        return $this->hasOne(MemberCert::class, 'join_cert_member_id', 'join_return_member_id');
     }
 
     public function order()