完善功能

app/admin/controller/member/BenefitController.php

@@ -59,8 +59,11 @@ class BenefitController extends Curd
         return $model;
     }
 
-    public function my($id)
+    public function my(Request $request)
     {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 20);
+        $id = $request->get('member_id','');
         $benefit = MemberBenefit::with([
             'package' => function ($query) {
                 $query->select('goods_id', 'goods_name');
@@ -71,17 +74,19 @@ class BenefitController extends Curd
             'order'
         ])
             ->where('join_benefit_member_id', $id)
-            ->where('join_benefit_package_id', '<>', '')
-            ->orderBy('member_benefit_addtimes','DESC')
+            ->where('join_benefit_package_id', '<>', '');
+        $total = $benefit->count('*');
+        $rows = $benefit->orderBy('member_benefit_addtimes','DESC')
+            ->forPage($page, $pageSize)
             ->get()
             ->toArray();
-        foreach ($benefit as &$item){
+        foreach ($rows as &$item){
             $item['member_benefit_limit_count'] = intval($item['member_benefit_limit_count']);
             $item['member_benefit_used_count'] = intval($item['member_benefit_used_count']);
         }
 
-
-        return json_success('', $benefit);
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+        // return json_success('', $benefit);
 
     }
 
@@ -289,6 +294,8 @@ class BenefitController extends Curd
 
     public function service(Request $request)
     {
+        $page = $request->get('page', 1);
+        $pageSize = $request->get('pageSize', 20);
         $memberId = $request->get('member_id', '');
         $benefit = MemberBenefit::with([
             'goods' => function ($query) {
@@ -297,15 +304,21 @@ class BenefitController extends Curd
 //            'order'
         ])
             ->where('join_benefit_member_id', $memberId)
-            ->where('join_benefit_package_id', '')
+            ->where('join_benefit_package_id', '');
             // ->where('member_benefit_category','SERVICE')
-            ->orderBy('member_benefit_addtimes','DESC')
+
+            
+        $total = $benefit->count('*');
+        $rows = $benefit->orderBy('member_benefit_addtimes','DESC')
+            ->forPage($page, $pageSize)
             ->get()
             ->toArray();
         foreach ($benefit as &$item){
             $item['member_benefit_limit_count'] = intval($item['member_benefit_limit_count']);
             $item['member_benefit_used_count'] = intval($item['member_benefit_used_count']);
         }
-        return json_success('', $benefit);
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+        // return json_success('', $benefit);
     }
 }

app/admin/controller/order/WholeController.php

@@ -169,6 +169,13 @@ class WholeController extends Curd
             ->toArray();
 
         $express = OrderExpress::where('join_express_order_id', $orderId)->first();
+        if (!empty($express->order_express_code)){
+            $expressCode = explode(':',$express->order_express_code);
+            if(count($expressCode) == 2){
+                $express->order_express_company = $expressCode[0];
+                $express->order_express_code = $expressCode[1];
+            }
+        }
         foreach ($orderSheet as &$item) {
             $item['goods']['goods_cover'] = getenv('STORAGE_DOMAIN') . $item['goods']['goods_cover'];
             if (!empty($item['goods']) && $item['goods']['goods_classify'] == 'PACKAGE') {
@@ -430,10 +437,22 @@ class WholeController extends Curd
             // 支付记录
             $this->insertPayDetail($params);
 
-
             $params['order_express_goods'] = json_encode(['sheet' => [$sheetId]]);
             if ($params['delivery'] == 'LOGISTICS') {
+                $params['order_express_type'] = '配送';
                 // 入配送
+                $this->saveExpress($params);
+            }else if($params['delivery'] = 'PICKUP'){
+                $premises = SysDept::where('dept_name', $params['dept_premises_id'])->first();
+                $params['order_express_type'] = '自提';
+                if(!$premises){
+                    throw new BusinessException('自提门店不存在');
+                }
+
+                $params['order_express_city'] = $premises->dept_city;
+                $params['order_express_address'] = $premises->dept_address;
+                $params['order_express_telephone'] = $premises->dept_telephone;
+                
                 $this->saveExpress($params);
             }
             // 买的单个服务
@@ -699,7 +718,7 @@ class WholeController extends Curd
 
         try {
             Db::beginTransaction();
-            if ($params['express_type'] == 'S') {
+            if ($params['express_type'] == '自提') {
                 $premises = SysDept::where('dept_name', $params['order_express_premises'])->first();
                 if (!$premises) {
                     return json_fail("门店不存在，请重新填写");
@@ -754,11 +773,11 @@ class WholeController extends Curd
             if (isset($params['order_express_goods'])) {
                 $model->order_express_goods = $params['order_express_goods'];
             }
-            if (isset($params['order_express_type'])) {
-                $model->order_express_type = $params['order_express_type'];
-            }
+            // if (isset($params['order_express_type'])) {
+            //     $model->order_express_type = $params['order_express_type'];
+            // }
             if (isset($params['order_express_code'])) {
-                $model->order_express_code = $params['order_express_code'];
+                $model->order_express_code = $params['order_express_company'].':'.$params['order_express_code'];
             }
             if (isset($params['order_express_city'])) {
                 $model->order_express_city = $params['order_express_city'];
@@ -933,12 +952,14 @@ class WholeController extends Curd
     {
         try {
             $express = new OrderExpress();
+            $express->order_express_type = $params['order_express_type'];
             $express->join_express_order_id = $params['orderId'];
             $express->order_express_goods = $params['order_express_goods'];
             $express->order_express_city = $params['order_express_city'];
             $express->order_express_address = $params['order_express_address'];
-            $express->order_express_mobile = $params['order_express_mobile'];
-            $express->order_express_person = $params['order_express_person'];
+            $express->order_express_mobile = $params['order_express_mobile'] ?? '';
+            $express->order_express_telephone = $params['order_express_telephone'] ?? '';
+            $express->order_express_person = $params['order_express_person'] ?? '';
             $express->order_express_addtimes = time();
             $express->save();
         } catch (\Exception $e) {

route/admin.php

@@ -593,7 +593,7 @@ Route::group('/admin', function () {
         /* 核销管理 */
         Route::group('/benefit', function () {
             Route::get('/list', [\app\admin\controller\member\BenefitController::class, 'select']);
-            Route::get('/my/{id:[0-9a-zA-Z\_]+}', [\app\admin\controller\member\BenefitController::class, 'my']);
+            Route::get('/my', [\app\admin\controller\member\BenefitController::class, 'my']);
             Route::get('/service', [\app\admin\controller\member\BenefitController::class, 'service']);
             Route::post('/add', [\app\admin\controller\member\BenefitController::class, 'insert']);
             Route::post('/update', [\app\admin\controller\member\BenefitController::class, 'update']);