完善功能

app/admin/controller/client/PointsController.php

@@ -33,8 +33,10 @@ class PointsController extends Curd
     protected function doSelect(array $where, string $field = null, string $order = 'desc')
     {
         $model = $this->model->leftJoin('member', 'member.member_id', '=', 'client_points.join_client_points_member_id')
+            ->leftJoin('member_info', 'member_info.join_info_member_id', '=', 'client_points.join_client_points_member_id')
+            ->leftJoin('member_cert', 'member_cert.join_cert_member_id', '=', 'client_points.join_client_points_member_id')
             ->leftJoin('order', 'order.order_id', '=', 'client_points.join_client_points_order_id')
-            ->select('member.member_id', 'member.member_mobile', 'order.order_id', 'order.order_name', 'client_points.*');
+            ->select('member.member_id', 'member.member_mobile','member_info.member_info_nickname','member_cert.member_cert_name', 'order.order_id', 'order.order_name', 'client_points.*');
 
         foreach ($where as $column => $value) {
             if (is_array($value)) {

app/admin/controller/device/DeviceController.php

@@ -27,6 +27,48 @@ class DeviceController extends Curd
         return $this->doFormat($query, $format, $limit);
     }
 
+    protected function doSelect(array $where, string $field = null, string $order = 'desc')
+    {
+        $model = $this->model->with([
+            'ledger' => function ($query) {
+                $query->select('device_ledger_id', 'device_ledger_name');
+            }
+        ]);
+        foreach ($where as $column => $value) {
+            if (is_array($value)) {
+                if ($value[0] === 'like' || $value[0] === 'not like') {
+                    $model = $model->where($column, $value[0], "%$value[1]%");
+                } elseif (in_array($value[0], ['>', '=', '<', '<>'])) {
+                    $model = $model->where($column, $value[0], $value[1]);
+                } elseif ($value[0] == 'in' && !empty($value[1])) {
+                    $valArr = $value[1];
+                    if (is_string($value[1])) {
+                        $valArr = explode(",", trim($value[1]));
+                    }
+                    $model = $model->whereIn($column, $valArr);
+                } elseif ($value[0] == 'not in' && !empty($value[1])) {
+                    $valArr = $value[1];
+                    if (is_string($value[1])) {
+                        $valArr = explode(",", trim($value[1]));
+                    }
+                    $model = $model->whereNotIn($column, $valArr);
+                } elseif ($value[0] == 'null') {
+                    $model = $model->whereNull($column);
+                } elseif ($value[0] == 'not null') {
+                    $model = $model->whereNotNull($column);
+                } elseif ($value[0] !== '' || $value[1] !== '') {
+                    $model = $model->whereBetween($column, $value);
+                }
+            } else {
+                $model = $model->where($column, $value);
+            }
+        }
+        if ($field) {
+            $model = $model->orderBy($field, $order);
+        }
+        return $model;
+    }
+
     /* 设备列表（下拉选项）*/
     public function selectList()
     {

app/admin/controller/order/CompleteController.php

@@ -10,6 +10,7 @@ use app\model\Coupon;
 use app\model\Device;
 use app\model\Order;
 use app\model\OrderSheet;
+use app\model\Supplier;
 use app\model\SysSerial;
 use support\exception\BusinessException;
 use support\Request;
@@ -39,7 +40,7 @@ class CompleteController extends Curd
         $order = $request->get('order', 'desc');
         $field = $field ?? 'order_addtimes';
         $where['order_status_system'] = 'CONFIRM';
-        $where['order_is_complete'] = ['in',['Y', 'R']];
+        $where['order_is_complete'] = ['in', ['Y', 'R']];
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }
@@ -60,13 +61,22 @@ class CompleteController extends Curd
                 $query->select('member_id', 'member_mobile');
             },
             'goods' => function ($query) {
-                $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price');
+                $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'join_goods_supplier_id');
             },
+            'memberInfo',
+            'cert'
         ])->where('join_sheet_order_id', $orderId)
             ->get()
             ->toArray();
         foreach ($orderSheet as &$item) {
             $item['goods']['goods_cover'] = getenv('STORAGE_DOMAIN') . $item['goods']['goods_cover'];
+            $item['goods']['supplier_name'] = '';
+            if (!empty($item['goods']['join_goods_supplier_id'])) {
+                $supplier = Supplier::where('supplier_id',$item['goods']['join_goods_supplier_id'])->value('supplier_name');
+                if ($supplier){
+                    $item['goods']['supplier_name'] = $supplier;
+                }
+            }
         }
 
         $order = Order::where('order_id', $orderId)->first();

app/admin/controller/order/RefundController.php

@@ -4,7 +4,11 @@ namespace app\admin\controller\order;
 
 use app\admin\validate\order\ReturnValidate;
 use app\controller\Curd;
+use app\model\GoodsComponent;
+use app\model\Order;
+use app\model\OrderExpress;
 use app\model\OrderReturn;
+use app\model\OrderSheet;
 use support\exception\BusinessException;
 use support\Request;
 use support\Response;
@@ -89,4 +93,64 @@ class RefundController extends Curd
         unset($data[$primary_key]);
         return [$id, $data];
     }
+
+    /**
+     * @Desc 订单商品详情
+     * @Author Gorden
+     * @Date 2024/3/29 8:50
+     *
+     * @param Request $request
+     * @return Response
+     */
+    public function sheet(Request $request)
+    {
+        $orderId = $request->get('order_id');
+        $orderSheet = OrderSheet::with([
+            'member' => function ($query) {
+                $query->select('member_id', 'member_mobile');
+            },
+            'goods' => function ($query) {
+                $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify');
+            },
+            'memberInfo',
+            'cert',
+            'refund'
+        ])->where('join_sheet_order_id', $orderId)
+            ->get()
+            ->toArray();
+        foreach ($orderSheet as &$item) {
+            $item['goods']['goods_cover'] = getenv('STORAGE_DOMAIN') . $item['goods']['goods_cover'];
+            if (!empty($item['goods']) && $item['goods']['goods_classify'] == 'PACKAGE') {
+                $components = GoodsComponent::with('goods')
+                    ->where('join_component_master_goods_id', $item['goods']['goods_id'])
+                    ->select('join_component_master_goods_id', 'join_component_goods_id', 'goods_component_price',
+                        'goods_component_price', 'goods_component_config_json')
+                    ->get()
+                    ->toArray();
+                $goodsArr = [];
+                foreach ($components as $component) {
+                    $configJson = !empty($component['goods_component_config_json']) ? json_decode($component['goods_component_config_json'], true) : [];
+                    if (!empty($component['goods'])) {
+                        $goodsArr[] = [
+                            'goods_name' => $component['goods']['goods_name'],
+                            'goods_cover' => getenv('STORAGE_DOMAIN') . $component['goods']['goods_cover'],
+                            'nbr' => $configJson['nbr'] ?? 0,
+                        ];
+                    }
+                }
+
+                $item['goods']['components'] = $goodsArr;
+            }
+        }
+
+        $order = Order::where('order_id', $orderId)->first();
+        $express = OrderExpress::where('join_express_order_id', $orderId)->first();
+        $data = [
+            'order' => $order,
+            'sheet' => $orderSheet,
+            'express' => $express
+        ];
+
+        return json_success('', $data);
+    }
 }

app/admin/controller/order/WholeController.php

@@ -13,6 +13,7 @@ use app\model\GoodsComponent;
 use app\model\Order;
 use app\model\OrderExpress;
 use app\model\OrderSheet;
+use app\model\Supplier;
 use app\model\SysSerial;
 use support\Db;
 use support\exception\BusinessException;
@@ -87,9 +88,11 @@ class WholeController extends Curd
                 foreach ($components as $component) {
                     $configJson = !empty($component['goods_component_config_json']) ? json_decode($component['goods_component_config_json'], true) : [];
                     if (!empty($component['goods'])) {
+                        $supplierName = Supplier::where('supplier_id',$component['goods']['join_goods_supplier_id'])->value('supplier_name');
                         $goodsArr[] = [
                             'goods_name' => $component['goods']['goods_name'],
                             'goods_cover' => getenv('STORAGE_DOMAIN') . $component['goods']['goods_cover'],
+                            'supplier_name'=>$supplierName,
                             'nbr' => $configJson['nbr'] ?? 0,
                         ];
                     }

app/admin/service/member/MemberService.php

@@ -19,42 +19,43 @@ class MemberService
     {
         $page = $request->get('page', 1);
         $pageSize = $request->get('pageSize', 10);
-        $id = $request->get('id', '');
+        $name = $request->get('name', '');
         $mobile = $request->get('mobile', '');
 
         $rows = Member::where('member_is_owner', 'N')
-            ->when($id != '', function ($query) use ($id) {
-                $query->where('member_id', 'like', '%' . $id . '%');
+            ->leftJoin('member_info', 'member_info.join_info_member_id', 'member.member_id')
+            ->leftJoin('member_cert', 'member_cert.join_cert_member_id', 'member.member_id')
+            ->when($name != '', function ($query) use ($name) {
+                $query->where('member_cert.member_cert_name', 'like', '%' . $name . '%');
             })->when($mobile != '', function ($query) use ($mobile) {
-                $query->where('member_mobile', 'like', '%' . $mobile . '%');
-            });
+                $query->where('member.member_mobile', 'like', '%' . $mobile . '%');
+            })->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes',
+                'member_info.member_info_nickname', 'member_info.member_info_headimg',
+                'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation'
+            );
         // 总条数
         $total = $rows->count('member_id');
-        $rows = $rows->with([
-            'info' => function ($query) {
-                $query->select('join_info_member_id', 'member_info_nickname', 'member_info_headimg');
-            },
-            'cert' => function ($query) {
-                $query->select('join_cert_member_id', 'member_cert_birth', 'member_cert_gender', 'member_cert_name', 'member_cert_nbr',
-                    'member_cert_province', 'member_cert_city', 'member_cert_addr', 'member_cert_face', 'member_cert_photo', 'member_cert_nation');
-            }
-        ])->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes')
-            ->orderBy('member_addtimes', 'DESC')
+        $rows = $rows->orderBy('member_addtimes', 'DESC')
             ->forPage($page, $pageSize)
             ->get()
             ->toArray();
 
         foreach ($rows as &$row) {
-            if (!empty($row['info']['member_info_headimg'])) {
-                $row['info']['member_info_headimg'] = getenv('STORAGE_DOMAIN') . $row['info']['member_info_headimg'];
-            }
-            if (!empty($row['cert']['member_cert_face'])) {
-                $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']);
-            }
+            $row['info'] = [
+                'member_info_nickname' => $row['member_info_nickname'] ?? '',
+                'member_info_headimg' => !empty($row['member_info_headimg']) ? getenv('STORAGE_DOMAIN') . $row['member_info_headimg'] : ''
+            ];
+            $row['cert'] = [
+                'member_cert_birth' => $row['member_cert_birth'],
+                'member_cert_gender' => $row['member_cert_gender'],
+                'member_cert_name' => $row['member_cert_name'],
+                'member_cert_nbr' => $row['member_cert_nbr'],
+                'member_cert_province' => !empty($row['member_cert_province']) && is_json($row['member_cert_province']) ? json_decode($row['member_cert_province']) : '',
+                'member_cert_addr' => $row['member_cert_addr'],
+                'member_cert_face' => !empty($row['member_cert_face']) ? getenv('STORAGE_DOMAIN') . $row['member_cert_face'] : '',
+                'member_cert_photo' => !empty($row['member_cert_photo']) ? getenv('STORAGE_DOMAIN') . $row['member_cert_photo'] : '',
+                'member_cert_nation' => $row['member_cert_nation'],
+            ];
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
@@ -256,6 +257,7 @@ class MemberService
     public static function updateDevice(Request $request)
     {
         $params = $request->post();
+        Db::beginTransaction();
         try {
             $data = [
                 'member_device_status' => $params['member_device_status'],
@@ -266,21 +268,39 @@ class MemberService
             ];
 
             MemberDevice::where('member_device_id', $request->post('member_device_id'))->update($data);
+
+            Device::where('device_id', $params['join_member_device_id'])->update(['device_status' => $params['member_device_status']]);
+
+            Db::commit();
+
         } catch (\Exception $e) {
+            Db::rollBack();
             dump($e->getMessage());
-            return json_fail('绑定失败');
+            return json_fail('绑定更新失败');
         }
 
-        return json_success('绑定成功');
+        return json_success('绑定更新成功');
     }
 
     public static function deleteDevice(Request $request)
     {
         try {
-            MemberDevice::where('member_device_id', $request->post('member_device_id'))->delete();
+            Db::beginTransaction();
+            $memberDevice = MemberDevice::where('member_device_id', $request->post('member_device_id'))->first();
+            if (!$memberDevice) {
+                return json_fail('数据不存在');
+            }
+
+            Device::where('device_id', $memberDevice->join_member_device_id)->update(['device_status' => 'DISABLED']);
+
+            $memberDevice->delete();
+
+            Db::commit();
 
             return json_success('解除绑定成功');
         } catch (\Exception $e) {
+            Db::rollBack();
+
             return json_fail('绑定失败');
         }
     }

app/admin/service/member/OwnerService.php

@@ -15,41 +15,43 @@ class OwnerService
     {
         $page = $request->get('page', 1);
         $pageSize = $request->get('pageSize', 10);
-        $id = $request->get('id', '');
+        $name = $request->get('name', '');
         $mobile = $request->get('mobile', '');
         $rows = Member::where('member_is_owner', 'Y')
-            ->when($id != '', function ($query) use ($id) {
-                $query->where('member_id', 'like', '%' . $id . '%');
+            ->leftJoin('member_info', 'member_info.join_info_member_id', 'member.member_id')
+            ->leftJoin('member_cert', 'member_cert.join_cert_member_id', 'member.member_id')
+            ->when($name != '', function ($query) use ($name) {
+                $query->where('member_cert.member_cert_name', 'like', '%' . $name . '%');
             })->when($mobile != '', function ($query) use ($mobile) {
-                $query->where('member_mobile', 'like', '%' . $mobile . '%');
-            });
+                $query->where('member.member_mobile', 'like', '%' . $mobile . '%');
+            })->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes',
+                'member_info.member_info_nickname', 'member_info.member_info_headimg',
+                'member_cert.member_cert_birth', 'member_cert.member_cert_gender', 'member_cert.member_cert_name', 'member_cert.member_cert_nbr', 'member_cert.member_cert_province', 'member_cert.member_cert_addr', 'member_cert.member_cert_face', 'member_cert.member_cert_photo', 'member_cert.member_cert_nation'
+            );
+
         // 总条数
         $total = $rows->count('member_id');
-        $rows = $rows->with([
-            'info' => function ($query) {
-                $query->select('join_info_member_id', 'member_info_nickname', 'member_info_headimg');
-            },
-            'cert' => function ($query) {
-                $query->select('join_cert_member_id', 'member_cert_birth', 'member_cert_gender', 'member_cert_name', 'member_cert_nbr',
-                    'member_cert_province', 'member_cert_city', 'member_cert_addr', 'member_cert_face', 'member_cert_photo', 'member_cert_nation');
-            }
-        ])->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes')
-            ->orderBy('member_addtimes', 'DESC')
+        $rows = $rows->orderBy('member_addtimes', 'DESC')
             ->forPage($page, $pageSize)
             ->get()
             ->toArray();
 
         foreach ($rows as &$row) {
-            if (!empty($row['info']['member_info_headimg'])) {
-                $row['info']['member_info_headimg'] = getenv('STORAGE_DOMAIN') . $row['info']['member_info_headimg'];
-            }
-            if (!empty($row['cert']['member_cert_face'])) {
-                $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']);
-            }
+            $row['info'] = [
+                'member_info_nickname' => $row['member_info_nickname'] ?? '',
+                'member_info_headimg' => !empty($row['member_info_headimg']) ? getenv('STORAGE_DOMAIN') . $row['member_info_headimg'] : ''
+            ];
+            $row['cert'] = [
+                'member_cert_birth' => $row['member_cert_birth'],
+                'member_cert_gender' => $row['member_cert_gender'],
+                'member_cert_name' => $row['member_cert_name'],
+                'member_cert_nbr' => $row['member_cert_nbr'],
+                'member_cert_province' => !empty($row['member_cert_province']) && is_json($row['member_cert_province']) ? json_decode($row['member_cert_province']) : '',
+                'member_cert_addr' => $row['member_cert_addr'],
+                'member_cert_face' => !empty($row['member_cert_face']) ? getenv('STORAGE_DOMAIN') . $row['member_cert_face'] : '',
+                'member_cert_photo' => !empty($row['member_cert_photo']) ? getenv('STORAGE_DOMAIN') . $row['member_cert_photo'] : '',
+                'member_cert_nation' => $row['member_cert_nation'],
+            ];
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
@@ -87,7 +89,7 @@ class OwnerService
                 'member_cert_nbr' => $params['cert_nbr'] ?? '',
                 'member_cert_birth' => $params['birth'] ?? '',
                 'member_cert_gender' => $params['gender'] ?? '',
-                'member_cert_province' => $params['province'] ? json_encode($params['province'],JSON_UNESCAPED_UNICODE) : '[]',
+                'member_cert_province' => $params['province'] ? json_encode($params['province'], JSON_UNESCAPED_UNICODE) : '[]',
                 '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

@@ -18,6 +18,7 @@ class AppointmentService
         $pageSize = $request->get('pageSize');
         $id = $request->get('id', '');
         $mobile = $request->get('mobile', '');
+        $status = $request->get('status', '');
 
 
         $rows = Db::table('appointment')
@@ -32,6 +33,8 @@ class AppointmentService
                 $query->where('appointment.appointment_id', 'like', '%' . $id . '%');
             })->when($mobile != '', function ($query) use ($mobile) {
                 $query->where('member.member_mobile', 'like', '%' . $mobile . '%');
+            })->when($status != '', function ($query) use ($status) {
+                $query->where('appointment.appointment_status', $status);
             });
 
         $total = $rows->count('member.member_id');
@@ -86,7 +89,7 @@ class AppointmentService
         Db::beginTransaction();
         try {
             $data = [
-                'appointment_id' => "AP" . str_pad(SysSerial::getSerial(), 16, '0') . random_string(6,'up'),
+                'appointment_id' => "AP" . str_pad(SysSerial::getSerial(), 16, '0') . random_string(6, 'up'),
                 'join_appointment_member_id' => $params['join_appointment_member_id'] ?? '',
                 'join_appointment_goods_id' => $params['join_appointment_goods_id'] ?? '',
                 'appointment_status' => $params['appointment_status'] ?? '',

app/model/Device.php

@@ -23,4 +23,10 @@ class Device extends Model
     {
         return $date->format('Y-m-d H:i:s');
     }
+
+    public function ledger()
+    {
+        return $this->hasOne(DeviceLedger::class, 'device_ledger_id', 'join_device_ledger_id')
+            ->select('device_ledger_id', 'device_ledger_name');
+    }
 }

app/model/GoodsComponent.php

@@ -25,6 +25,6 @@ class GoodsComponent extends Model
     public function goods()
     {
         return $this->hasOne(Goods::class, 'goods_id', 'join_component_goods_id')
-            ->select('goods_id', 'goods_name', 'goods_market_price', 'goods_sales_price', 'goods_cover');
+            ->select('goods_id', 'goods_name', 'goods_market_price', 'goods_sales_price', 'goods_cover','join_goods_supplier_id');
     }
 }

app/model/OrderSheet.php

@@ -34,14 +34,16 @@ class OrderSheet extends Model
         return $this->hasOne(Member::class, 'member_id', 'join_sheet_member_id');
     }
 
-    public function memberInfo(){
-        return $this->hasOne(MemberInfo::class,'join_info_member_id','join_sheet_member_id')
-            ->select('join_info_member_id','member_info_nickname');
+    public function memberInfo()
+    {
+        return $this->hasOne(MemberInfo::class, 'join_info_member_id', 'join_sheet_member_id')
+            ->select('join_info_member_id', 'member_info_nickname');
     }
 
-    public function cert(){
-        return $this->hasOne(MemberCert::class,'join_cert_member_id','join_sheet_member_id')
-            ->select('join_cert_member_id','member_cert_name');
+    public function cert()
+    {
+        return $this->hasOne(MemberCert::class, 'join_cert_member_id', 'join_sheet_member_id')
+            ->select('join_cert_member_id', 'member_cert_name');
     }
 
     /**
@@ -79,4 +81,16 @@ class OrderSheet extends Model
     {
         return $this->hasOne(OrderExpress::class, 'join_express_order_id', 'join_sheet_order_id');
     }
+
+    /**
+     * @Desc 退货退款
+     * @Author Gorden
+     * @Date 2024/4/26 10:16
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function refund()
+    {
+        return $this->hasOne(OrderReturn::class, 'join_return_order_id', 'join_sheet_order_id');
+    }
 }

route/admin.php

@@ -652,6 +652,7 @@ Route::group('/admin', function () {
         // 退款管理
         Route::group('/refund', function () {
             Route::get('/list', [\app\admin\controller\order\RefundController::class, 'select']);
+            Route::get('/sheet', [\app\admin\controller\order\RefundController::class, 'sheet']);
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);