完善功能

app/admin/controller/finance/GoodsSalesController.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace app\admin\controller\finance;
+
+use support\Request;
+
+class GoodsSalesController{
+
+    public function list(Request $request){
+        // $Total = 
+
+
+    }
+}

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/service/member/MemberService.php

@@ -75,7 +75,7 @@ class MemberService
 
         foreach ($rows as &$row) {
             $row['info'] = [
-                'member_info_nickname' => $row['member_info_nickname'] ?? substr($row['member_mobile'],-4,4).'用户',
+                'member_info_nickname' => !empty($row['member_info_nickname']) ? $row['member_info_nickname'] : substr($row['member_mobile'],-4,4).'用户',
                 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : ''
             ];
             $row['cert'] = [
@@ -142,6 +142,12 @@ class MemberService
     public static function exportMember(Request $request)
     {
         $memberIds = $request->get('member_id','');
+        $name = $request->get('name', '');
+        $mobile = $request->get('mobile', '');
+        $level = $request->get('level','');
+        $isAuth = $request->get('is_auth','');
+        $addtime = $request->get('member_addtimes',[]);
+
         $rows = Member::with('account')
             ->where('member_is_owner', 'N')
             ->leftJoin('member_info', 'member_info.join_info_member_id', 'member.member_id')
@@ -151,6 +157,26 @@ class MemberService
 //            ->where('member_account.member_account_classify', 'CASH')
             ->when($memberIds != '', function ($query) use ($memberIds) {
                 $query->whereIn('member.member_id', $memberIds);
+            })->when($name != '', function ($query) use ($name) {
+                $query->where('member_cert.member_cert_name', 'like', '%' . $name . '%');
+            })->when($mobile != '', function ($query) use ($mobile) {
+                $query->where('member.member_mobile', 'like', '%' . $mobile . '%');
+            })->when($level != '', function ($query) use ($level) {
+                if($level == 'other'){
+                    $query->where('member.join_member_role_id',NULL)->orWhere('member.join_member_role_id','');
+                }else{
+                    $query->where('member_role.member_role_id', $level);
+                }
+            })->when($isAuth != '', function ($query) use ($isAuth) {
+                if($isAuth == 'Y'){
+                    $query->where('member_cert.member_cert_name','<>',NULL)->where('member_cert.member_cert_nbr','<>',NULL)->where('member_cert.member_cert_name','<>','')->where('member_cert.member_cert_nbr','<>','');
+                }else{
+                    $query->where('member_cert.member_cert_name',NULL)->orWhere('member_cert.member_cert_nbr',NULL)->orWhere('member_cert.member_cert_name','')->orWhere('member_cert.member_cert_nbr','');
+                }
+            })->when(!empty($addtime), function ($query) use ($addtime) {
+                $addtime[0] = strtotime($addtime[0]);
+                $addtime[1] = strtotime($addtime[1]);
+                $query->whereBetween('member.member_addtimes', $addtime);
             })->select('member_id', 'member_is_owner', 'member_classify', 'member_status', 'member_mobile', 'member_from', 'member_addtimes', 'member_extend_json',
                 'member_info.member_info_nickname', 'member_info.member_info_headimg',
                 'member_role.member_role_id', 'member_role.member_role_name',
@@ -163,7 +189,7 @@ class MemberService
         $exportData = [];
         foreach ($rows as $row) {
             $row['info'] = [
-                'member_info_nickname' => $row['member_info_nickname'] ?? '',
+                'member_info_nickname' => !empty($row['member_info_nickname']) ? $row['member_info_nickname'] : substr($row['member_mobile'],-4,4).'用户',
                 'member_info_headimg' => !empty($row['member_info_headimg']) ? $row['member_info_headimg'] : ''
             ];
             $row['cert'] = [