完善功能

app/admin/controller/member/BenefitController.php

@@ -71,6 +71,10 @@ class BenefitController extends Curd
             ->where('join_benefit_package_id', '<>', '')
             ->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);
@@ -180,4 +184,24 @@ class BenefitController extends Curd
 
         return json_success('', $quotas);
     }
+
+    public function service(Request $request)
+    {
+        $memberId = $request->get('member_id', '');
+        $benefit = MemberBenefit::with([
+            'goods' => function ($query) {
+                $query->select('goods_id', 'goods_name');
+            },
+//            'order'
+        ])
+            ->where('join_benefit_member_id', $memberId)
+            ->where('join_benefit_package_id', '')
+            ->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);
+    }
 }

app/admin/controller/order/WholeController.php

@@ -221,12 +221,6 @@ class WholeController extends Curd
                 $account->member_account_expend = $account->member_account_expend + $params['order_sheet_pay'];
                 $account->save();
             }
-
-            $params['orderId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
-            $params['orderGroupId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
-            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
-            $params['packageId'] = $params['join_sheet_goods_id'];
-
             $goods = Goods::where('goods_id', $params['join_sheet_goods_id'])
                 ->select('goods_id', 'goods_name', 'goods_classify')
                 ->first();
@@ -235,6 +229,10 @@ class WholeController extends Curd
             }
             $goods = $goods->toArray();
 
+            $params['orderId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
+            $params['orderGroupId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
+            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+
             // 写入主订单
             $this->insertMain($params);
             // 订单详情
@@ -255,6 +253,7 @@ class WholeController extends Curd
                 // 权益表
                 $this->insertMemberBenefit($params, $goods);
             } elseif ($goods['goods_classify'] == 'PACKAGE') {  // 一个套餐买多个
+                $params['packageId'] = $params['join_sheet_goods_id'];
                 $components = GoodsComponent::with([
                     'goods' => function ($query) {
                         $query->select('goods_id', 'goods_name', 'goods_classify');
@@ -346,7 +345,7 @@ class WholeController extends Curd
                 'join_sheet_order_id' => $params['orderId'],
                 'join_sheet_goods_id' => $params['join_sheet_goods_id'],
                 'join_sheet_goods_sku_id' => $params['join_sheet_goods_sku_id'],
-                'order_sheet_status' => 'CONFIRM',
+                'order_sheet_status' => 'DONE',
                 'order_sheet_category' => 'NORMAL',
                 'order_sheet_num' => $params['order_sheet_num'],
                 'order_sheet_price' => $params['order_sheet_price'],
@@ -409,7 +408,7 @@ class WholeController extends Curd
                 'join_appointment_order_id' => $params['orderId'],
                 'join_appointment_member_benefit_id' => $params['benefitId'],
                 'appointment_classify' => 'SERVICE',
-                'appointment_status' => 'INIT',
+                'appointment_status' => $params['order_status_system'] == 'DONE' ? 'DONE' : 'INIT',
                 'appointment_category' => 'NORMAL',
                 'appointment_addtimes' => time(),
             ];
@@ -444,6 +443,7 @@ class WholeController extends Curd
                 'member_benefit_category' => $goods['category'],
                 'member_benefit_name' => $goods['goods_name'],
                 'member_benefit_limit_count' => $params['order_sheet_num'],
+                'member_benefit_used_count' => $params['order_status_system'] == 'DONE' ? $params['order_sheet_num'] : 0,
                 'member_benefit_addtimes' => time()
             ];
             MemberBenefit::insert($data);

app/admin/service/member/MemberService.php

@@ -121,6 +121,7 @@ class MemberService
             ->orderByDesc('pay_addtimes')
             ->get()
             ->toArray();
+        dump($info);
         $money = 0;
         $data = [];
         foreach ($info as $key => $item) {

route/admin.php

@@ -568,6 +568,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('/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']);
             Route::delete('/delete', [\app\admin\controller\member\BenefitController::class, 'delete']);