康养城VIP

app/admin/controller/order/KangyangCityController.php

@@ -0,0 +1,171 @@
+<?php
+
+namespace app\admin\controller\order;
+
+use app\admin\validate\order\OrderValidate;
+use app\controller\Curd;
+use app\model\Goods;
+use app\model\Order;
+use app\model\OrderSheet;
+use support\Request;
+use support\Response;
+
+class KangyangCityController extends Curd{
+    public function __construct()
+    {
+        $this->model = new Order();
+        $this->validate = true;
+        $this->validateClass = new OrderValidate();
+    }
+
+    /**
+     * @Desc 列表
+     * @Author Gorden
+     * @Date 2024/3/28 15:01
+     *
+     * @param Request $request
+     * @return Response
+     * @throws \support\exception\BusinessException
+     */
+    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';
+        // $where['order_id'] = '';
+        $where['order_category'] = 'VIP';
+        // $goodsClassify = 'VIP';
+        $goodsName = $request->get('goods_name','');
+        if (!empty($goodsName) && empty($goodsClassify)){
+            $goodsIds = Goods::where('goods_name','like','%'.$request->get('goods_name').'%')->pluck('goods_id')->toArray();
+        }
+        // else if(!empty($goodsClassify)){
+        //     if($goodsClassify == 'SERVICE'){
+        //         $goodsModel = Goods::whereIn('goods_classify',['SERVICE','CHNMED','CHNNCD']);
+        //     }else{
+        //         $goodsModel = Goods::where('goods_classify',$goodsClassify);
+        //     }
+
+        //     if(!empty($goodsName)){
+        //         $goodsModel->where('goods_name','like','%'.$goodsName.'%');
+        //     }
+
+        //     $goodsIds = $goodsModel->pluck('goods_id')->toArray();
+        // }
+        if(!empty($goodsIds)){
+            $orderIds = OrderSheet::whereIn('join_sheet_goods_id',$goodsIds)->pluck('join_sheet_order_id')->toArray();
+            if($orderIds){
+                $where['order_id'] = ['in',implode(',',$orderIds)];
+            }
+        }
+
+        $query = $this->doSelect($where, $field, $order);
+        return $this->doFormat($query, $format, $limit);
+    }
+
+    protected function doSelect(array $where, string $field = null, string $order = 'desc')
+    {
+        $model = $this->model->with([
+            'sheets' => function ($query) {
+                $query->select('join_sheet_order_id', 'order_sheet_id', 'join_sheet_goods_id', 'order_sheet_num','order_sheet_price');
+            },
+            'member' => function ($query) {
+                $query->select('member_id', 'member_mobile');
+            },
+            'cert' => function ($query) {
+                $query->select('join_cert_member_id', 'member_cert_name');
+            },
+//            'return' => function ($query) use ($where){
+//                if (isset($where['return'])){
+//                    dump($where['return']);
+//                    $query = $query->where('order_return_status',$where['return']);
+//                }
+//                $query->select('orders_return_id', 'join_return_order_id', 'order_return_status');
+//            },
+            // 'express' => function ($query) {
+            //     $query->select('join_express_order_id', 'order_express_type');
+            // }
+        ])->leftJoin('order_return','order_return.join_return_order_id','=','order.order_id')
+        ->leftJoin('order_express','order_express.join_express_order_id','=','order.order_id');
+        // ->leftJoin('order_sheet','join_sheet_order_id','=','order.order_id');
+        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);
+        }
+        $model = $model->select('order.*','order_express.join_express_order_id','order_express.order_express_type','order_return.orders_return_id', 'order_return.join_return_order_id', 'order_return.order_return_status','order_return.order_return_apply_json','order_return.order_return_remark');
+        return $model;
+    }
+
+    public function afterQuery($items)
+    {
+        foreach ($items as &$item) {
+            $sheetDeng = '';
+            $item['sheet'] = $item['sheets'][0] ?? [];
+            if (!empty($item['sheet'])) {
+                $goods = Goods::where('goods_id', $item['sheet']['join_sheet_goods_id'])->first();
+                if(count($item['sheets']) > 1 && $goods->goods_classify == 'MEALS'){
+                    $sheetDeng = ' 等餐品';
+                }
+                $item['sheet']['goods_name'] = ($goods && $goods->goods_name) ? $goods->goods_name.$sheetDeng : '';
+                $item['sheet']['goods_classify'] = $goods->goods_classify ?? '';
+                $item['sheet']['order_sheet_num'] = intval($item['sheet']['order_sheet_num']);
+            }
+            unset($item['sheets']);
+            if (isset($item['orders_return_id'])){
+                $item['return'] = [
+                    'orders_return_id'=>$item['orders_return_id'],
+                    'join_return_order_id' => $item['join_return_order_id'],
+                    'order_return_status' => $item['order_return_status'],
+                    'order_return_apply_json' => $item['order_return_apply_json'],
+                    'order_return_remark'=>$item['order_return_remark']
+                ];
+            }
+            if (isset($item['join_express_order_id'])){
+                $item['express'] = [
+                    'join_express_order_id'=>$item['join_express_order_id'],
+                    'order_express_type'=>$item['order_express_type']
+                ];
+                unset($item['join_express_order_id'],$item['order_express_type']);
+            }
+            // if (!empty($item['order_extend_json'])){
+            //     $orderExtendJson = json_decode($item['order_extend_json'],true);
+            //     $item['referee'] = $orderExtendJson['referee'] ?? '';
+            // }
+        }
+
+        return $items;
+    }
+}

app/admin/controller/order/WholeController.php

@@ -494,6 +494,10 @@ class WholeController extends Curd
                 $order->dept_table_id = $orderConfigJson['tableid'];
             }
         }
+        if (!empty($order->order_extend_json)){
+            $orderExtendJson = json_decode($order->order_extend_json,true);
+            $order->referee = $orderExtendJson['referee'] ?? '';
+        }
 
         $order->premises = $premises;
         $data = [
@@ -704,6 +708,9 @@ class WholeController extends Curd
         if (!$order){
             return json_fail('订单异常');
         }
+        if ($order->order_status_system != 'PAYING'){
+            return json_fail('订单不是可支付状态');
+        }
         if (!empty($order->order_config_json)){
             $orderConfigJson = json_decode($order->order_config_json,true);
             if (isset($orderConfigJson['premises'])){
@@ -725,7 +732,7 @@ class WholeController extends Curd
 
         $systemStatus = 'SENDING';  // 待发货
         // 立即结算
-        if(in_array($params['goods_classify'],['SERVICE','CHNMED','CHNNCD','MEALS'])){
+        if(in_array($params['goods_classify'],['SERVICE','CHNMED','CHNNCD','MEALS','VIP'])){
             $systemStatus = 'DONE';
         }
         Db::beginTransaction();
@@ -973,6 +980,11 @@ class WholeController extends Curd
             }
             $order->order_config_json = json_encode($orderConfigJson);
             $order->order_amount_pay = $params['order_amount_pay']+$qrcodePayAmount;
+            // 康养城订单，支付完就结束了
+            if ($order->order_status_payment == 'SUCCESS' && $params['goods_classify'] == 'VIP'){
+                $order->order_is_complete = 'Y';
+            }
+
             // 主订单
             $order->save();
 
@@ -1263,7 +1275,7 @@ class WholeController extends Curd
             // 立即结算
             if($params['settlement_now'] == 'Y'){
                 $params['order_is_complete'] = 'Y';
-                if(in_array($params['goods_classify'],['SERVICE','CHNMED','CHNNCD','MEALS'])){
+                if(in_array($params['goods_classify'],['SERVICE','CHNMED','CHNNCD','MEALS','VIP'])){
                     $systemStatus = 'DONE';
                 }
             }
@@ -1511,16 +1523,16 @@ class WholeController extends Curd
             }
 
             // 配送方式
-            if ($params['delivery'] == 'PICKUP' || $params['delivery'] == 'ARRIVAL') { // 自提/ 到店
+            if (isset($params['delivery']) && ($params['delivery'] == 'PICKUP' || $params['delivery'] == 'ARRIVAL')) { // 自提/ 到店
                 $orderConfigJson['premises'] = $params['dept_premises_id'];
-            } else if ($params['delivery'] == 'LOGISTICS') {
+            } else if (isset($params['delivery']) && $params['delivery'] == 'LOGISTICS') {
                 // $params['order_express_json'] = json_encode([
                 //     'express' => 'Y',
                 // ]);
             }
             $params['order_amount_pay'] = $params['order_amount_pay'] + $qrcodePayAmount;
 
-            if (in_array($params['delivery'],['PICKUP','ARRIVAL']) && !empty($params['dept_premises_id'])){
+            if (isset($params['delivery']) && in_array($params['delivery'],['PICKUP','ARRIVAL']) && !empty($params['dept_premises_id'])){
                 // $premises = SysDept::where('dept_name',$params['dept_premises_id'])->where('dept_category','营业场所')->first();
                 if (!$premises){
                     Db::rollBack();
@@ -1554,11 +1566,11 @@ class WholeController extends Curd
             $this->insertPayDetail($params);
 
             $params['order_express_goods'] = json_encode(['sheet' => [$sheetId]]);
-            if ($params['delivery'] == 'LOGISTICS') {
+            if (isset($params['delivery']) && $params['delivery'] == 'LOGISTICS') {
                 $params['order_express_type'] = '配送';
                 // 入配送
                 $this->saveExpress($params);
-            } else if ($params['delivery'] == 'PICKUP') {
+            } else if (isset($params['delivery']) && $params['delivery'] == 'PICKUP') {
                 $params['order_express_type'] = '自提';
                 if (!$premises) {
                     throw new BusinessException('自提门店不存在');
@@ -1689,11 +1701,13 @@ class WholeController extends Curd
             return json_success('创建订单成功');
         }catch(BusinessException $e){
             Db::rollBack();
+            dump($e->getMessage());
             dump($e->getTrace());
             _syslog("订单",$e->getMessage());
             return json_fail($e->getMessage());
         } catch (\Exception $e) {
             Db::rollBack();
+            dump($e->getMessage());
             dump($e->getTrace());
             _syslog("订单","创建订单失败");
             return json_fail('创建订单失败');
@@ -1712,6 +1726,24 @@ class WholeController extends Curd
     public function insertMain($params)
     {
         try {
+            $orderCategory = 'NORMAL';
+            if (!empty($params['order_category'])){
+                $orderCategory = $params['order_category'];
+            }else if(isset($params['submit_goods_classify']) && $params['submit_goods_classify'] == 'MEALS'){
+                $orderCategory = 'DISHES';
+            }else if (isset($params['goods_classify'])){
+                $orderCategory = $params['goods_classify'];
+            }
+            if (empty($params['order_extend_json'])){
+                $params['order_extend_json'] = [];
+            }else{
+                if(is_json($params['order_extend_json'])){
+                    $params['order_extend_json'] = json_decode($params['order_extend_json'],true);
+                }
+            }
+            // 推荐人
+            $params['order_extend_json']['referee'] = $params['referee']  ?? '';
+            
             $data = [
                 'order_id' => $params['orderId'],
                 'order_groupby' => $params['orderGroupId'],
@@ -1719,7 +1751,7 @@ class WholeController extends Curd
                 'order_name' => date('Y-m-d H:i:s') . '-订单',
                 'order_amount_total' => $params['order_amount_total'],
                 'order_amount_pay' => $params['order_amount_pay'],
-                'order_category' => (isset($params['submit_goods_classify']) && $params['submit_goods_classify'] == 'MEALS') ? 'DISHES' : $params['goods_classify'],
+                'order_category' => $orderCategory,
                 'order_is_complete' => $params['order_is_complete'] ?? 'N',
                 'order_status_system' => $params['order_status_system'],
                 'order_status_payment' => $params['order_status_payment'],
@@ -1728,7 +1760,7 @@ class WholeController extends Curd
                 'order_remark' => $params['order_remark'] ?? '',
                 'order_config_json' => $params['order_config_json'] ?? '[]',
                 'order_express_json' => $params['order_express_json'] ?? '[]',
-                'order_extend_json' => $params['order_extend_json'] ?? '[]',
+                'order_extend_json' => $params['order_extend_json'] ? json_encode($params['order_extend_json']) : '[]',
                 'order_addtimes' => time()
             ];
 

app/admin/controller/sys_manage/CategoryController.php

@@ -49,6 +49,9 @@ class CategoryController extends Curd
     public function afterQuery($items){
         $categoryDatas = [];
         foreach($items as &$item){
+            if (empty($item->category_super_path)){
+                $item->category_super_path = '#'.$item['category_id'].'#';
+            }
             $categorys = SysCategory::where('category_super_path','like',$item->category_super_path.'%')
                 ->where('category_status','ACTIVED')
                 ->paginate(1000)

app/admin/service/goods/GoodsService.php

@@ -518,21 +518,29 @@ class GoodsService
     {
         $categoryIds = $request->get('category_id','');
         $categorySuperId = $request->get('category_super_id','');
-        if (!$categoryIds && !$categorySuperId){
+        $joinGoodsCategoryId = $request->get('join_goods_category_id','');
+        if (!$categoryIds && !$categorySuperId && !$joinGoodsCategoryId){
             return json_fail('参数异常');
         }
         $data = [];
+        $categorys = [];
         if (!empty($categoryIds)){
-            $categorys = SysCategory::whereIn('category_id',$categoryIds);
+            $categorys = SysCategory::whereIn('category_id',$categoryIds)
+            ->where('category_status','ACTIVED')
+            ->select('category_id as id','category_name as name','category_super_id as pid','category_super_path')
+            ->orderBy('category_sort','DESC')
+            ->get()
+            ->toArray();
+            $data = array_merge($data,$categorys);
         }else if(!empty($categorySuperId)){
-            $categorys = SysCategory::where('category_super_id',$categorySuperId);
-        }
-        $categorys = $categorys->where('category_status','ACTIVED')
+            $categorys = SysCategory::where('category_super_id',$categorySuperId)
+            ->where('category_status','ACTIVED')
             ->select('category_id as id','category_name as name','category_super_id as pid','category_super_path')
             ->orderBy('category_sort','DESC')
             ->get()
             ->toArray();
-        $data = array_merge($data,$categorys);
+            $data = array_merge($data,$categorys);
+        }
 
         foreach ($categorys as $category){
             // if(empty($category['category_super_path'])){
@@ -546,8 +554,11 @@ class GoodsService
                 ->toArray();
             $data = array_merge($data,$subCategory);
         }
-
-        $goodsCategoryIds = array_column($data,'id');
+        if (empty($data) && !empty($joinGoodsCategoryId)){
+            $goodsCategoryIds = $joinGoodsCategoryId;
+        }else{
+            $goodsCategoryIds = array_column($data,'id');
+        }
         $goods = Goods::with('sku')
             ->whereIn('join_goods_category_id',$goodsCategoryIds)
             ->where('goods_status','ON')
@@ -556,6 +567,7 @@ class GoodsService
             ->orderBy('goods_addtimes','DESC')
             ->get()
             ->toArray();
+            dump($goods);
         foreach ($goods as &$good) {
             if (!empty($good['sku'])) {
                 foreach ($good['sku'] as $key => $sku) {

app/admin/service/order/OrderService.php

@@ -133,18 +133,21 @@ class OrderService
                 // 订单详情表
                 OrderSheet::where('join_sheet_order_id', $order->order_id)->update(['order_sheet_status' => 'CANCEL']);
                 // 支付表
-                $payDetail = PayDetail::where('pay_id', $order->order_groupby)->first();
-                $payExtendJson = [];
-                if (!empty($payDetail->pay_extend_json)){
-                    $payExtendJson = json_decode($payDetail->pay_extend_json,true);
+                $payDetail = PayDetail::where('join_pay_order_id', $order->order_groupby)->first();
+                if(!empty($payDetail)){
+                    $payExtendJson = [];
+                    if (!empty($payDetail->pay_extend_json)){
+                        $payExtendJson = json_decode($payDetail->pay_extend_json,true);
+                    }
+                    $payExtendJson['cancel_times'] = date('Y-m-d H:i:s'); 
+                    PayDetail::where('join_pay_order_id', $order->order_groupby)->update([
+                        'pay_status' => 'CANCEL',
+                        'pay_extend_json' => json_encode($payExtendJson)
+                    ]);
                 }
-                $payExtendJson['cancel_times'] = date('Y-m-d H:i:s'); 
-                PayDetail::where('pay_id', $order->order_groupby)->update([
-                    'pay_status' => 'CANCEL',
-                    'pay_extend_json' => json_encode($payExtendJson)
-                ]);
             }
 
+            echo date('Y-m-d H:i:s')."执行\n";
             Db::commit();
         } catch (\Exception $e) {
             Db::rollBack();

route/admin.php

@@ -878,6 +878,12 @@ Route::group('/admin', function () {
         })->middleware([
             \app\middleware\AdminAuthCheck::class
         ]);
+        // 康养城订单
+        Route::group('/kangyangCity', function () {
+            Route::get('/list', [\app\admin\controller\order\KangyangCityController::class, 'select']);
+        })->middleware([
+            \app\middleware\AdminAuthCheck::class
+        ]);
         // 服务订单
         Route::group('/services', function () {
             Route::get('/list', [\app\admin\controller\order\ServicesController::class, 'select']);