gorden 5 сар өмнө
parent
commit
af33bedc29

+ 33 - 10
app/admin/controller/order/PartnerController.php

@@ -98,7 +98,7 @@ class PartnerController extends Curd
                 $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');
+                $query->select('member_id', 'member_mobile','join_invite_member_id');
             },
             'cert' => function ($query) {
                 $query->select('join_cert_member_id', 'member_cert_name');
@@ -159,9 +159,6 @@ class PartnerController extends Curd
             $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']);
@@ -183,6 +180,17 @@ class PartnerController extends Curd
                 ];
                 unset($item['join_express_order_id'], $item['order_express_type']);
             }
+            if (!empty($item['member']['join_invite_member_id'])) {
+                $inviteMember = Member::with([
+                    'cert' => function ($query) {
+                        $query->select('join_cert_member_id', 'member_cert_name');
+                    }
+                ])->where('member_id', $item['member']['join_invite_member_id'])
+                    ->first();
+                $inviteMobile = $inviteMember['member_mobile'] ?? '';
+                $inviteCertName = !empty($inviteMember['cert']) && !empty($inviteMember['cert']['member_cert_name']) ? $inviteMember['cert']['member_cert_name'] : '';
+                $item['invite_name'] = MemberService::getMemberCertName($inviteMobile, $inviteCertName, '');
+            }
             // if (!empty($item['order_extend_json'])){
             //     $orderExtendJson = json_decode($item['order_extend_json'],true);
             //     $item['referee'] = $orderExtendJson['referee'] ?? '';
@@ -791,7 +799,7 @@ class PartnerController extends Curd
             $orderId = $request->get('order_id');
             $orderSheet = OrderSheet::with([
                 'member' => function ($query) {
-                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id', 'member_is_vip', 'member_is_partner', 'member_is_referrer');
+                    $query->select('member_id', 'member_mobile', 'member_is_owner', 'join_member_role_id', 'member_is_vip', 'member_is_partner', 'member_is_referrer','join_invite_member_id');
                 },
                 'goods' => function ($query) {
                     $query->select('goods_id', 'goods_name', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_classify', 'goods_if_express');
@@ -813,10 +821,6 @@ class PartnerController extends Curd
 
             $order = Order::where('order_id', $orderId)->first();
             $express = OrderExpress::where('join_express_order_id', $orderId)->first();
-            $premises = '';
-            if ($express && $express->order_express_type == '自提') {
-                $premises = $express->order_express_company;
-            }
             $sheetAmount = 0;
             foreach ($orderSheet as &$item) {
                 $sheetAmount += $item['order_sheet_amount'];
@@ -942,6 +946,18 @@ class PartnerController extends Curd
                         $item['member_info']['member_info_headimg'] = "https://img.wanyuewellness.com.cn/images/avatar_default.png";
                     }
                 }
+                // 推荐人
+                if (!empty($item['member']['join_invite_member_id'])) {
+                    $inviteMember = Member::with([
+                        'cert' => function ($query) {
+                            $query->select('join_cert_member_id', 'member_cert_name');
+                        }
+                    ])->where('member_id', $item['member']['join_invite_member_id'])
+                        ->first();
+                    $inviteMobile = $inviteMember['member_mobile'] ?? '';
+                    $inviteCertName = !empty($inviteMember['cert']) && !empty($inviteMember['cert']['member_cert_name']) ? $inviteMember['cert']['member_cert_name'] : '';
+                    $order->invite_name = MemberService::getMemberCertName($inviteMobile, $inviteCertName, '');
+                }
             }
             $order->sheet_amount = number_format($sheetAmount, 2);
 
@@ -1014,6 +1030,13 @@ class PartnerController extends Curd
                 if (isset($orderExtendJson['dept_id'])) {
                     $order->dept_id = $orderExtendJson['dept_id'];
                 }
+                if (isset($orderExtendJson['dept_name'])) {
+                    $order->premises = $orderExtendJson['dept_name'];
+                }
+                if (isset($orderExtendJson['referee'])) {
+                    $order->invite_name = $orderExtendJson['referee'];
+                }
+
             }
             $discount = ['coupon_name' => '', 'classify' => '', 'value' => 0];
             if (!empty($order->order_discount_json)) {
@@ -1054,7 +1077,7 @@ class PartnerController extends Curd
             $discount['value'] = sprintf("%.2f", $discount['value']);
             $order->discount = $discount;
 
-            $order->premises = $order->premises ?? $premises;
+            $order->premises = $order->premises ?? '';
             $data = [
                 'order' => $order,
                 'refund' => json_decode(json_encode($refund)),