完善功能

app/admin/controller/coupon/CouponController.php

@@ -39,15 +39,15 @@ class CouponController extends Curd
         return $this->doFormat($query, $format, $limit);
     }
 
-//    public function afterQuery($items)
-//    {
-//        foreach ($items as &$item) {
-//            $item->coupon_begindate = date('Y-m-d H:i:s', $item->coupon_begindate);
-//            $item->coupon_enddate = date('Y-m-d H:i:s', $item->coupon_enddate);
-//        }
-//
-//        return $items;
-//    }
+    public function afterQuery($items)
+    {
+        foreach ($items as &$item) {
+            $item->coupon_begindate = date('Y-m-d H:i:s', $item->coupon_begindate);
+            $item->coupon_enddate = date('Y-m-d H:i:s', $item->coupon_enddate);
+        }
+
+        return $items;
+    }
 
     protected function insertInput(Request $request): array
     {

app/admin/controller/order/WholeController.php

@@ -43,6 +43,10 @@ class WholeController extends Curd
     public function select(Request $request): Response
     {
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
+        if(!empty($where['order_addtimes'])){
+            $where['order_addtimes'][0] = strtotime($where['order_addtimes'][0]);
+            $where['order_addtimes'][1] = strtotime($where['order_addtimes'][1]);
+        }
         $order = $request->get('order', 'desc');
         $field = $field ?? 'order_addtimes';
         if (!empty($where['order_status_system']) && $where['order_status_system'] == 'RETURN') {
@@ -58,6 +62,9 @@ class WholeController extends Curd
         $model = $this->model->with([
             'sheet' => function ($query) {
                 $query->select('join_sheet_order_id', 'join_sheet_goods_id');
+            },
+            'member' => function ($query) {
+                $query->select('member_id', 'member_mobile');
             }
         ]);
         foreach ($where as $column => $value) {

app/admin/service/member/MemberService.php

@@ -56,6 +56,10 @@ class MemberService
                 'member_cert_photo' => !empty($row['member_cert_photo']) ? getenv('STORAGE_DOMAIN') . $row['member_cert_photo'] : '',
                 'member_cert_nation' => $row['member_cert_nation'],
             ];
+            $row['is_auth'] = "未认证";
+            if (!empty($row['member_cert_nbr']) && !empty($row['member_cert_face']) && !empty($row['member_cert_photo'])) {
+                $row['is_auth'] = "已认证";
+            }
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));

app/admin/service/member/OwnerService.php

@@ -52,6 +52,10 @@ class OwnerService
                 'member_cert_photo' => !empty($row['member_cert_photo']) ? getenv('STORAGE_DOMAIN') . $row['member_cert_photo'] : '',
                 'member_cert_nation' => $row['member_cert_nation'],
             ];
+            $row['is_auth'] = "未认证";
+            if (!empty($row['member_cert_nbr']) && !empty($row['member_cert_face']) && !empty($row['member_cert_photo'])) {
+                $row['is_auth'] = "已认证";
+            }
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));

app/model/Order.php

@@ -29,4 +29,8 @@ class Order extends Model
     public function sheet(){
         return $this->hasOne(OrderSheet::class,'join_sheet_order_id','order_id');
     }
+
+    public function member(){
+        return $this->hasOne(Member::class,'member_id','join_order_member_id');
+    }
 }