完善功能

app/admin/controller/asset/HouseTypeController.php

@@ -98,12 +98,12 @@ class HouseTypeController extends Curd
         $data['asset_id'] = 'AE' . date('YmdHis') . random_string(6, 'up');
         if (!empty($request->post('floor_plan'))) {
             $data['asset_house_json'] = json_encode(['floor_plan' => str_replace(getenv('STORAGE_DOMAIN'), '', $request->post('floor_plan'))]);
-        }else{
+        } else {
             $data['asset_house_json'] = [];
         }
         if (!empty($request->post('asset_house_address'))) {
             $data['asset_json'] = json_encode(['address' => $request->post('asset_house_address')]);
-        }else{
+        } else {
             $data['asset_json'] = '[]';
         }
 
@@ -122,13 +122,13 @@ class HouseTypeController extends Curd
 
         if (!empty($request->post('floor_plan'))) {
             $data['asset_house_json'] = json_encode(['floor_plan' => str_replace(getenv('STORAGE_DOMAIN'), '', $request->post('floor_plan'))]);
-        }else{
+        } else {
             $data['asset_house_json'] = [];
         }
 //        dump($request->post('asset_house_address'));
         if (!empty($request->post('asset_house_address'))) {
             $data['asset_json'] = json_encode(['address' => $request->post('asset_house_address')]);
-        }else{
+        } else {
             $data['asset_json'] = '[]';
         }
 

app/admin/service/member/MemberService.php

@@ -52,6 +52,9 @@ class MemberService
                 $row['cert']['member_cert_face'] = getenv('STORAGE_DOMAIN') . $row['cert']['member_cert_face'];
                 $row['cert']['member_cert_photo'] = getenv('STORAGE_DOMAIN') . $row['cert']['member_cert_photo'];
             }
+            if (!empty($row['cert']['member_cert_province']) && is_json($row['cert']['member_cert_province'])) {
+                $row['cert']['member_cert_province'] = json_decode($row['cert']['member_cert_province']);
+            }
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
@@ -89,7 +92,7 @@ class MemberService
                 'member_cert_nbr' => $params['cert_nbr'] ?? '',
                 'member_cert_birth' => $params['birth'] ? date('Y-m-d', strtotime($params['birth'])) : '',
                 'member_cert_gender' => $params['gender'] ?? '',
-                'member_cert_province' => $params['province'] ?? '',
+                'member_cert_province' => $params['province'] ? json_encode($params['province']) : '[]',
                 'member_cert_city' => $params['city'] ?? '',
                 'member_cert_addr' => $params['addr'] ?? '',
                 'member_cert_face' => str_replace(getenv('STORAGE_DOMAIN'), '', $params['member_cert_face']),
@@ -148,7 +151,7 @@ class MemberService
                 'member_cert_nbr' => $params['cert_nbr'] ?? '',
                 'member_cert_birth' => $params['birth'] ? date('Y-m-d', strtotime($params['birth'])) : '',
                 'member_cert_gender' => $params['gender'] ?? '',
-                'member_cert_province' => $params['province'] ?? '',
+                'member_cert_province' => $params['province'] ? json_encode($params['province']) : '[]',
                 'member_cert_city' => $params['city'] ?? '',
                 'member_cert_addr' => $params['addr'] ?? '',
                 'member_cert_face' => str_replace(getenv('STORAGE_DOMAIN'), '', $params['member_cert_face']),

app/admin/service/member/OwnerService.php

@@ -47,6 +47,9 @@ class OwnerService
                 $row['cert']['member_cert_face'] = getenv('STORAGE_DOMAIN') . $row['cert']['member_cert_face'];
                 $row['cert']['member_cert_photo'] = getenv('STORAGE_DOMAIN') . $row['cert']['member_cert_photo'];
             }
+            if (!empty($row['cert']['member_cert_province']) && is_json($row['cert']['member_cert_province'])) {
+                $row['cert']['member_cert_province'] = json_decode($row['cert']['member_cert_province']);
+            }
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
@@ -84,7 +87,7 @@ class OwnerService
                 'member_cert_nbr' => $params['cert_nbr'] ?? '',
                 'member_cert_birth' => $params['birth'] ?? '',
                 'member_cert_gender' => $params['gender'] ?? '',
-                'member_cert_province' => $params['province'] ?? '',
+                'member_cert_province' => $params['province'] ? json_encode($params['province']) : '[]',
                 'member_cert_city' => $params['city'] ?? '',
                 'member_cert_addr' => $params['addr'] ?? '',
                 'member_cert_face' => str_replace(getenv('STORAGE_DOMAIN'), '', $params['member_cert_face']),

app/admin/service/order/AppointmentService.php

@@ -20,6 +20,8 @@ class AppointmentService
 
         $rows = Db::table('appointment')
             ->leftJoin('member', 'member.member_id', '=', 'appointment.join_appointment_member_id')
+            ->leftJoin('member_cert', 'member_cert.join_cert_member_id', '=', 'appointment.join_appointment_member_id')
+            ->leftJoin('member_info', 'member_info.join_info_member_id', '=', 'appointment.join_appointment_member_id')
             ->leftJoin('goods', 'goods.goods_id', '=', 'appointment.join_appointment_goods_id')
             ->leftJoin('order', 'order.order_id', '=', 'appointment.join_appointment_order_id')
             ->leftJoin('member_benefit', 'member_benefit.member_benefit_id', '=', 'appointment.join_appointment_member_benefit_id')
@@ -31,7 +33,11 @@ class AppointmentService
             });
 
         $total = $rows->count('member.member_id');
-        $rows = $rows->select('member.member_mobile', 'appointment.*', 'goods.goods_name', 'goods.goods_cover',
+        $rows = $rows->select( 'appointment.*',
+            'member.member_mobile',
+            'member_cert.member_cert_name',
+            'member_info.member_info_nickname',
+            'goods.goods_name', 'goods.goods_cover','goods.goods_sales_price',
             'order.order_name', 'goods_sku.goods_sku_specs_json', 'order.order_amount_total', 'order.order_amount_pay',
             'order.order_category', 'order.order_status_system', 'order.order_status_payment', 'order.order_status_storage',
             'order.order_addtimes',
@@ -44,6 +50,7 @@ class AppointmentService
         foreach ($rows as &$row) {
             $row->goods_cover = getenv('STORAGE_DOMAIN') . $row->goods_cover;
             $row->goods_sku_specs_json = !empty($row->goods_sku_specs_json) ? json_decode($row->goods_sku_specs_json, true) : [];
+            $row->order_addtimes = date('Y-m-d H:i:s', $row->order_addtimes);
             $row->appointment_addtimes = date('Y-m-d H:i:s', $row->appointment_addtimes);
         }