自定义充值产品

app/admin/controller/coupon/CouponPacketSequenceController.php

@@ -10,6 +10,7 @@ use app\model\CouponDetail;
 use app\model\CouponGoods;
 use app\model\CouponPacket;
 use app\model\CouponPacketSequence;
+use app\model\MemberRole;
 use app\model\SysCategory;
 use app\model\SysDept;
 use support\Request;
@@ -183,7 +184,10 @@ class CouponPacketSequenceController extends Curd
                 $query->select('coupon_packet_id', 'coupon_packet_name', 'join_coupon_packet_category_id', 'join_coupon_packet_dept_id', 'coupon_packet_status', 'coupon_packet_issue_num', 'coupon_packet_issue_datetime');
             },
             'member' => function ($query) {
-                $query->select('');
+                $query->select('member_id', 'join_member_role_id', 'member_is_owner', 'member_is_vip', 'member_is_partner', 'member_is_referrer');
+            },
+            'info' => function ($query) {
+                $query->select('join_info_member_id', 'member_info_headimg');
             }
         ])->where('coupon_packet_sequence_id', $packetSequenceId)
             ->first();
@@ -205,6 +209,12 @@ class CouponPacketSequenceController extends Curd
                 }
             }
         }
+        if (!empty($sequence->member) && !empty($sequence->member->join_member_role_id)) {
+            $sequence->member->role_name = MemberRole::where('member_role_id', $sequence->member->join_member_role_id)->value('member_role_name');
+        }
+        if (!empty($sequence->info) && !empty($sequence->info->member_info_headimg)){
+            $sequence->info->member_info_headimg = MemberService::getAvatarUrl($sequence->info->member_info_headimg);
+        }
         $coupons = [];
         if (!empty($sequence->coupon_packet_sequence_json)) {
             $sequenceJson = json_decode($sequence->coupon_packet_sequence_json, true);

app/admin/controller/member/MemberController.php

@@ -51,24 +51,11 @@ class MemberController
             })->get();
         $data = [];
         foreach ($res as $item) {
-            // $item->member_mobile = substr($item->member_mobile,0,3).'****'.substr($item->member_mobile,7);
-            $name = '';
-            if (!empty($item->member_cert_name)) {
-                $name = $item->member_cert_name;
-            } else if (!empty($item->member_info_nickname)) {
-                $name = $item->member_info_nickname;
-            }
-            $value = !empty($name) ? $name . '-' : '';
-            if ($item->member_mobile != '0000') {
-                $value .= $item->member_mobile;
-            }
-            if (empty($value)) {
-                $value = $item->member_mobile;
-            }
-            $value = rtrim($value, '-');
+            $certName = $item->member_cert_name ?? '';
+            $mobile = $item->member_mobile ?? '';
             $data[] = [
                 'key' => $item->member_id,
-                'value' => $value,
+                'value' => MemberService::getMemberCertName($mobile, $certName, ''),
             ];
         }
 
@@ -379,22 +366,22 @@ class MemberController
     {
         $todayStart = strtotime(date('Y-m-d'));
         $todayEnd = strtotime(date('Y-m-d 23:59:59'));
-        $todayCount = Member::where('member_addtimes' ,'>=', $todayStart)->where('member_addtimes', '<=', $todayEnd)->count();
+        $todayCount = Member::where('member_addtimes', '>=', $todayStart)->where('member_addtimes', '<=', $todayEnd)->count();
 
         $yesterdayStart = strtotime(date('Y-m-d', strtotime("-1 day")));
         $yesterdayEnd = strtotime(date('Y-m-d 23:59:59', strtotime("-1 day")));
-        $yesterdayCount = Member::where('member_addtimes' ,'>=', $yesterdayStart)->where('member_addtimes', '<=', $yesterdayEnd)->count();
+        $yesterdayCount = Member::where('member_addtimes', '>=', $yesterdayStart)->where('member_addtimes', '<=', $yesterdayEnd)->count();
 
         $monthStart = strtotime(date('Y-m-01'));
         $monthEnd = strtotime(date('Y-m-t 23:59:59'));
         $monthCount = Member::where('member_addtimes', '>=', $monthStart)->where('member_addtimes', '<=', $monthEnd)->count();
 
-        $lastMonthStart = strtotime(date('Y-m-01',strtotime("last day of -1 month")));
-        $lastMonthEnd = strtotime(date('Y-m-t 23:59:59',strtotime("last day of -1 month")));
+        $lastMonthStart = strtotime(date('Y-m-01', strtotime("last day of -1 month")));
+        $lastMonthEnd = strtotime(date('Y-m-t 23:59:59', strtotime("last day of -1 month")));
         $lastMonthCount = Member::where('member_addtimes', '>=', $lastMonthStart)->where('member_addtimes', '<=', $lastMonthEnd)->count();
 
-        return json_success('',[
-            'todayCount'=>$todayCount,
+        return json_success('', [
+            'todayCount' => $todayCount,
             'yesterdayCount' => $yesterdayCount,
             'monthCount' => $monthCount,
             'lastMonthCount' => $lastMonthCount
@@ -780,6 +767,12 @@ class MemberController
             if (!empty($coupon) && !empty($coupon->category)) {
                 $item['category_name'] = $coupon->category->category_name;
             }
+            if (!empty($item['coupon_detail_gain_datetime'])) {
+                $item['coupon_detail_gain_datetime'] = date('Y/m/d H:i:s', strtotime($item['coupon_detail_gain_datetime']));
+            }
+            if (!empty($item['coupon_detail_deadline_datetime'])) {
+                $item['coupon_detail_deadline_datetime'] = date('Y/m/d H:i:s', strtotime($item['coupon_detail_deadline_datetime']));
+            }
         }
 
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));

app/admin/controller/member/RoleController.php

@@ -26,6 +26,7 @@ class RoleController extends Curd
         [$where, $format, $limit, $field, $order] = $this->selectInput($request);
         $order = $request->get('order', 'desc');
         $field = $field ?? 'member_role_addtimes';
+        $where['member_role_status'] = 'ACTIVED';
         $query = $this->doSelect($where, $field, $order);
         return $this->doFormat($query, $format, $limit);
     }

app/admin/controller/order/AppointmentController.php

@@ -68,7 +68,7 @@ class AppointmentController
     public function myAppointments(Request $request)
     {
         $page = $request->get('page',1);
-        $pageSize = $request->get('pageSize',1);
+        $pageSize = $request->get('pageSize',10);
         $memberId = $request->get('member_id', '');
         $datetime = $request->get('order_addtimes',[]);
         $goodsName = $request->get('goods_name','');
@@ -111,6 +111,7 @@ class AppointmentController
             });
         $total = $appointments->count();
         $rows = $appointments->orderBy('appointment.appointment_addtimes', 'desc')
+            ->forPage($page,$pageSize)
             ->get();
         foreach ($rows as &$row) {
             $row->appointment_addtimes = date('Y-m-d H:i:s', $row->appointment_addtimes);

app/admin/controller/order/PayDetailController.php

@@ -38,7 +38,7 @@ class PayDetailController extends Curd
 //        $where['pay_status'] = 'SUCCESS';
         if ($where['pay_category'] == 'OTHER') {
             $where['pay_status'] = 'SUCCESS';
-            $where['pay_category'] = ['not in', ['RECHARGE','REFUND','ROLE_REFUND','CROWN_CONTINUE','CLEAR','GIVE']];
+            $where['pay_category'] = ['not in', ['RECHARGE', 'REFUND', 'ROLE_REFUND', 'CROWN_CONTINUE', 'CLEAR', 'GIVE']];
         } elseif ($where['pay_category'] == 'RECHARGE') {
             $where['pay_category'] = ['in', ['RECHARGE', 'VIP']];
         }
@@ -256,21 +256,6 @@ class PayDetailController extends Curd
                         $item->pay_status = 'BEING';
                     }
                 }
-
-//                $payDetail = PayDetail::where('join_pay_member_id', $item->join_pay_member_id)
-//                    ->where('pay_category', $item['join_pay_order_id'])
-//                    ->select('pay_amount', 'join_pay_object_json')
-//                    ->first();
-//                $item->pay_amount = $payDetail->pay_amount ?? 0;
-//                if (!empty($payDetail->join_pay_object_json)) {
-//                    $payObjectJson = json_decode($payDetail->join_pay_object_json, true);
-//                    if (isset($payObjectJson['order_id'])) {
-//                        $orderStatus = OrderSheet::where('join_sheet_order_id', $payObjectJson['order_id'])->value('order_sheet_status');
-//                        if ($orderStatus == 'BEING') {
-//                            $item->pay_status = 'BEING';
-//                        }
-//                    }
-//                }
             }
             if ($item->pay_category == 'VIP') {
                 $payObjectJson = json_decode($item->join_pay_object_json, true);
@@ -303,7 +288,7 @@ class PayDetailController extends Curd
         }
         $orderSheet = OrderSheet::with([
             'order' => function ($query) {
-                $query->select('order_id', 'order_amount_total', 'order_amount_pay', 'order_is_complete', 'order_category', 'order_status_system', 'order_status_payment', 'order_status_storage', 'order_addtimes');
+                $query->select('order_id', 'order_amount_total', 'order_amount_pay', 'order_is_complete', 'order_category', 'order_status_system', 'order_status_payment', 'order_status_storage', 'order_extend_json', 'order_addtimes');
             },
             'goods' => function ($query) {
                 $query->select('goods_id', 'goods_name', 'goods_status', 'goods_cover', 'goods_market_price', 'goods_sales_price', 'goods_addtimes');
@@ -339,21 +324,37 @@ class PayDetailController extends Curd
         $payDetails = PayDetail::whereJsonContains('join_pay_object_json->order_id', $orderId)
             ->where('pay_status', 'SUCCESS')
             ->select('pay_status', 'pay_amount', 'pay_paytimes', 'pay_prepayid')
+            ->orderBy('pay_paytimes', 'DESC')
             ->get();
 
+        $order = [];
         foreach ($orderSheet as &$item) {
             if (!empty($item['goods']) && !empty($item['goods']['goods_cover'])) {
                 $item['goods']['goods_cover'] = getenv("STORAGE_DOMAIN") . $item['goods']['goods_cover'];
             }
-            if (!empty($item['sku']) && !empty($item['sku']['goods_sku_specs_json'])){
+            if (!empty($item['sku']) && !empty($item['sku']['goods_sku_specs_json'])) {
                 $item['sku']['goods_sku_title'] = GoodsSkuService::getSkuTitle($item['sku']['goods_sku_specs_json']);
             }
+            if (!empty($item['order'])) {
+                if (!empty($item['order']['order_extend_json'])) {
+                    $orderExtendJson = json_decode($item['order']['order_extend_json'], true);
+                    if (!empty($orderExtendJson['referee'])) {
+                        $item['order']['referee'] = $orderExtendJson['referee'];
+                    }
+                    if (!empty($orderExtendJson['referee_premises'])) {
+                        $item['order']['referee_premises'] = $orderExtendJson['referee_premises'];
+                    }
+                }
+            }
+
+            $order = $item['order'];
         }
 
         $data = [
             'payDetails' => $payDetails,
             'goodsOrder' => $orderSheet,
-            'member' => $member
+            'member' => $member,
+            'order'=>$order
         ];
 
         return json_success('', $data);