完善功能

app/admin/controller/order/PayDetailController.php

@@ -146,48 +146,48 @@ class PayDetailController extends Curd
     {
         $params = $request->post();
         $data = $this->inputFilter($params);
+        $goods = Goods::find($params['goods_id']);
         $extendJson = [];
         if (!$params['is_custom']) {
             try {
                 Db::beginTransaction();
-                $goods = Goods::find($params['goods_id']);
                 $data['pay_amount'] = $goods->goods_sales_price;
 
-                $orderId = "OD" . date("YmdHis") . random_string(6, 'up');
-                $orderGroupId = "OD" . date("YmdHis") . random_string(6, 'up');
-                $orderData = [
-                    'order_id' => $orderId,
-                    'order_groupby' => $orderGroupId,
-                    'join_order_member_id' => $data['join_pay_member_id'],
-                    'order_name' => date('Y-m-d H:i:s') . '-订单',
-                    'order_amount_total' => $data['pay_amount'],
-                    'order_amount_pay' => $data['pay_amount'],
-                    'order_amount_json' => '{"tax": 0, "freight": 0}',
-                    'order_status_payment' => 'SUCCESS',
-                    'order_category' => 'NORMAL',
-                    'order_status_system' => 'WAITING',
-                    'order_status_storage' => 'PENDING',
-                    'order_addtimes' => time()
-                ];
-                $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->first();
-                dump($sku);
-
-                Order::insert($orderData);
-                $orderSheetData = [
-                    'join_sheet_member_id' => $data['join_pay_member_id'],
-                    'join_sheet_order_id' => $orderId,
-                    'join_sheet_goods_id' => $params['goods_id'],
-                    'join_sheet_goods_sku_id' => $sku ? $sku->goods_sku_id : 0,
-                    'order_sheet_status' => 'PAYING',
-                    'order_sheet_category' => 'NORMAL',
-                    'order_sheet_num' => 1,
-                    'order_sheet_price' => $data['pay_amount'],
-                    'order_sheet_amount' => $data['pay_amount'],
-                    'order_sheet_pay' => $data['pay_amount'],
-                    'order_sheet_addtimes' => time()
-                ];
-
-                OrderSheet::insert($orderSheetData);
+                // $orderId = "OD" . date("YmdHis") . random_string(6, 'up');
+                // $orderGroupId = "OD" . date("YmdHis") . random_string(6, 'up');
+                // $orderData = [
+                //     'order_id' => $orderId,
+                //     'order_groupby' => $orderGroupId,
+                //     'join_order_member_id' => $data['join_pay_member_id'],
+                //     'order_name' => date('Y-m-d H:i:s') . '-订单',
+                //     'order_amount_total' => $data['pay_amount'],
+                //     'order_amount_pay' => $data['pay_amount'],
+                //     'order_amount_json' => '{"tax": 0, "freight": 0}',
+                //     'order_status_payment' => 'SUCCESS',
+                //     'order_category' => 'NORMAL',
+                //     'order_status_system' => 'WAITING',
+                //     'order_status_storage' => 'PENDING',
+                //     'order_addtimes' => time()
+                // ];
+                // $sku = GoodsSku::where('join_sku_goods_id', $params['goods_id'])->first();
+                // dump($sku);
+
+                // Order::insert($orderData);
+                // $orderSheetData = [
+                //     'join_sheet_member_id' => $data['join_pay_member_id'],
+                //     'join_sheet_order_id' => $orderId,
+                //     'join_sheet_goods_id' => $params['goods_id'],
+                //     'join_sheet_goods_sku_id' => $sku ? $sku->goods_sku_id : 0,
+                //     'order_sheet_status' => 'PAYING',
+                //     'order_sheet_category' => 'NORMAL',
+                //     'order_sheet_num' => 1,
+                //     'order_sheet_price' => $data['pay_amount'],
+                //     'order_sheet_amount' => $data['pay_amount'],
+                //     'order_sheet_pay' => $data['pay_amount'],
+                //     'order_sheet_addtimes' => time()
+                // ];
+
+                // OrderSheet::insert($orderSheetData);
 
                 Db::commit();
             } catch (\Exception $e) {
@@ -196,8 +196,8 @@ class PayDetailController extends Curd
 
                 throw new BusinessException("数据错误");
             }
-            $data['join_pay_order_id'] = $orderGroupId;
-            $data['join_pay_object_json'] = json_encode(['order_id' => $orderId]);
+            // $data['join_pay_order_id'] = $orderGroupId;
+            // $data['join_pay_object_json'] = json_encode(['order_id' => $orderId]);
 
             $rate = 0;
             if (!empty($goods->goods_attribute_json)) {

app/admin/controller/order/WholeController.php

@@ -278,7 +278,7 @@ class WholeController extends Curd
 
         $order = Order::where('order_id', $orderId)->first();
         $payDetail = PayDetail::where('join_pay_order_id', $order->order_groupby)
-            ->select('pay_id', 'pay_category', 'pay_prepayid')
+            ->select('pay_id', 'pay_category', 'pay_prepayid','pay_paytimes')
             ->first();
 
         if(!empty($payDetail->pay_prepayid)){

app/admin/service/member/MemberService.php

@@ -284,9 +284,13 @@ class MemberService
             ->toArray();
         $data = [];
         foreach ($info as $key => $item) {
-            $orderIds = Order::where('order_groupby', $item['join_pay_order_id'])->pluck('order_id');
-            $goodsIds = OrderSheet::whereIn('join_sheet_order_id', $orderIds)->pluck('join_sheet_goods_id');
-            $categoryIds = Goods::whereIn('goods_id', $goodsIds)->pluck('join_goods_category_id');
+            $categoryIds = [];
+            if(!empty($item['join_pay_order_id'])){
+                $orderIds = Order::where('order_groupby', $item['join_pay_order_id'])->pluck('order_id');
+                $goodsIds = OrderSheet::whereIn('join_sheet_order_id', $orderIds)->pluck('join_sheet_goods_id');
+                $categoryIds = Goods::whereIn('goods_id', $goodsIds)->pluck('join_goods_category_id');
+            }
+            
 
             $categoryName = [];
             foreach ($categoryIds as $id) {