wesmiler 报恩寺项目提交

app/Http/Controllers/Api/v1/IndexController.php

@@ -107,4 +107,8 @@ class IndexController extends BaseController
             return  message('获取订单信息失败', false);
         }
     }
+
+    public function banner(){
+        
+    }
 }

app/Http/Controllers/Api/v1/TradeController.php

@@ -37,6 +37,4 @@ class TradeController extends BaseController
         $params['user_id'] = $this->userId;
         return $this->service->getDataList($params);
     }
-
-
 }

app/Models/WithdrawModel.php

@@ -0,0 +1,39 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Models;
+
+/**
+ * 提现记录管理-模型
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class WithdrawModel
+ * @package App\Models
+ */
+class WithdrawModel extends BaseModel
+{
+    // 设置数据表
+    protected $table = 'withdraw_logs';
+
+    /**
+     * 获取记录信息
+     * @param int $id 记录ID
+     * @return array|string
+     * @author wesmiler
+     * @since 2020/11/11
+     */
+    public function getInfo($id)
+    {
+        $info = parent::getInfo($id); // TODO: Change the autogenerated stub
+        return $info;
+    }
+
+}

app/Services/TradeService.php

@@ -188,8 +188,10 @@ class TradeService extends BaseService
 
         $dataList = $dataList ? $dataList->toArray() : [];
         if ($dataList) {
+            $types = ['','消费支付','充值支付','赠送奖励','平台扣除','平台调整','邀请奖励','工资结算','提现打款'];
             foreach ($dataList['data'] as &$item) {
                 $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+                $item['remark'] = $item['remark']? $item['remark'] : (isset($types[$item['type']])? $types[$item['type']] : '');
             }
             unset($item);
         }

app/Services/WithdrawService.php

@@ -0,0 +1,134 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Services;
+
+use App\Models\MemberModel;
+use App\Models\RechargeModel;
+
+/**
+ * 提现记录管理-服务类
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class WithdrawService
+ * @package App\Services
+ */
+class WithdrawService extends BaseService
+{
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * WithdrawService constructor.
+     */
+    public function __construct()
+    {
+        $this->model = new RechargeModel();
+    }
+
+
+    /**
+     * 获取列表
+     * @return array
+     * @since 2020/11/11
+     * @author wesmiler
+     */
+    public function getList()
+    {
+        $params = request()->all();
+        $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
+        $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
+
+        $dataList = $this->model::from('withdraw_logs as a')
+            ->leftJoin('member as m', 'm.id', '=', 'a.user_id')
+            ->where(function ($query) use ($params) {
+                $query->where('a.mark', 1);
+
+                $type = isset($params['type']) ? $params['type'] : 0;
+                if ($type > 0) {
+                    $query->where('a.type', $type);
+                }
+
+                $payType = isset($params['pay_type']) ? $params['pay_type'] : 0;
+                if ($payType > 0) {
+                    $query->where('a.pay_type', $payType);
+                }
+
+                $userId = isset($params['user_id']) ? $params['user_id'] : 0;
+                if ($userId > 0) {
+                    $query->where('a.user_id', $userId);
+                }
+
+                $datetime = isset($params['datetime'])? $params['datetime'] : [];
+                $dateStart = $datetime && isset($datetime[0])? $datetime[0] : '';
+                $dateEnd = isset($datetime[1])? $datetime[1] : '';
+                if($dateStart && $dateEnd && $dateEnd> $dateStart){
+                    $query->where('a.create_time', '>', strtotime($dateStart))->where('a.create_time','<=', strtotime($dateEnd)+86399);
+                }else if($dateStart && $dateStart == $dateEnd){
+                    $query->where('a.create_time', '>=', strtotime($dateStart))->where('a.create_time','<=', strtotime($dateStart)+86399);
+                }else if ($dateStart){
+                    $query->where('a.create_time', '<=', strtotime($dateStart)+86399);
+                }
+
+                $status = isset($params['status']) ? $params['status'] : 0;
+                if ($status > 0) {
+                    $query->where('a.status', $status);
+                } else {
+                    $query->whereIn('a.status', [1, 2]);
+                }
+
+            })
+            ->where(function ($query) use ($params) {
+                $keyword = isset($params['keyword']) ? trim($params['keyword']) : '';
+                if (!empty($keyword)) {
+                    $query->where('m.nickname','like',"%{$keyword}%")
+                    ->orWhere('a.order_sn','like',"%{$keyword}%");
+                }
+            })
+            ->select(['a.id', 'a.user_id','a.order_sn','a.trade_no','a.pay_at', 'm.nickname','a.realname','a.account','a.qrcode','a.type','a.pay_type','a.money', 'a.balance', 'a.status', 'a.create_time', 'a.update_time','a.remark'])
+            ->orderBy('a.create_time', 'desc')
+            ->paginate($pageSize);
+
+        $dataList = $dataList ? $dataList->toArray() : [];
+        if ($dataList) {
+            foreach ($dataList['data'] as &$item) {
+                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+            }
+            unset($item);
+        }
+
+        return [
+            'code' => 0,
+            'success'=> true,
+            'msg' => '操作成功',
+            'count' => isset($dataList['total']) ? $dataList['total'] : 0,
+            'data' => isset($dataList['data']) ? $dataList['data'] : 0,
+        ];
+    }
+
+    /**
+     * 添加或编辑
+     * @return array
+     * @since 2020/11/11
+     * @author wesmiler
+     */
+    public function edit()
+    {
+        $data = request()->all();
+        $data['update_time'] = time();
+        return parent::edit($data); // TODO: Change the autogenerated stub
+    }
+
+    public function withdraw($userId){
+        $params = request()->all();
+
+    }
+}

app/Services/YigongService.php

@@ -132,7 +132,7 @@ class YigongService extends BaseService
         }
 
         // 验证是否已申请
-        $info = $this->model::where(['user_id'=> $userId,'siyuan_id'=> $siyuanId])
+        $info = $this->model::where(['user_id'=> $userId])
             ->select(['id','user_id','mark','status'])
             ->first();
         if($info && $info->mark==1 && $info->status == 1){

routes/api.php

@@ -113,4 +113,5 @@ Route::post('/address/default', [\App\Http\Controllers\Api\v1\AddressController:
 
 // 交易账户
 Route::post('/trades/list', [\App\Http\Controllers\Api\v1\TradeController::class, 'index']);
+Route::post('/trades/slary', [\App\Http\Controllers\Api\v1\TradeController::class, 'slary']);
 Route::post('/trades/info', [\App\Http\Controllers\Api\v1\TradeController::class, 'info']);