'新增签到模块'

app/Http/Controllers/Admin/ReliefController.php

@@ -42,18 +42,21 @@ class ReliefController extends PublicController
         if (strlen($request->get('userName'))) {
             $getReliefWhere['name'] = $request->get('userName');
         }
-        $getReliefBetween = [];
+
+        $startTime = strtotime(date('Y-m-d').'-6 day');
+        $endTime   = strtotime(date('Y-m-d').'+1 day');
         if (strlen($request->get('time'))) {
-            $time      = explode(",", $request->get('time'));
+            $time      = explode(',', ($request->get('time')));
             $startTime = strtotime($time[0]);
-            $endTime   = strtotime($time[1]);
-            // 时间区间.
-            $getReliefBetween = [
-                $startTime,
-                $endTime,
-            ];
+            $endTime   = strtotime($time[1].'+1 day');
         }
 
+        // 时间区间.
+        $getReliefBetween = [
+            $startTime,
+            $endTime,
+        ];
+
         $getReliefSelect = [
             'getrelief_id',
             'getrelief_identity',

app/Http/Controllers/Admin/SignController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
-use App\Http\Models\ReliefData;
+use App\Http\Models\Sign;
 use App\Models\GetRelief;
 use Illuminate\Http\Request;
 use App\Http\Controllers\PublicController;
@@ -36,35 +36,38 @@ class SignController extends PublicController
      */
     public function data(Request $request)
     {
-        $reliefDataModel = new ReliefData;
-        $getReliefWhere  = [];
+        $signModel = new Sign;
+        $getSignWhere  = [];
         // 查询参数.
         if (strlen($request->get('userName'))) {
-            $getReliefWhere['name'] = $request->get('userName');
+            $getSignWhere['name'] = $request->get('userName');
         }
-        $getReliefBetween = [];
+
+        $startTime = strtotime(date('Y-m-d').'-6 day');
+        $endTime   = strtotime(date('Y-m-d').'+1 day');
         if (strlen($request->get('time'))) {
-            $time      = explode(",", $request->get('time'));
+            $time      = explode(',', ($request->get('time')));
             $startTime = strtotime($time[0]);
-            $endTime   = strtotime($time[1]);
-            // 时间区间.
-            $getReliefBetween = [
-                $startTime,
-                $endTime,
-            ];
+            $endTime   = strtotime($time[1].'+1 day');
         }
 
-        $getReliefSelect = [
-            'getrelief_id',
-            'getrelief_identity',
+        // 时间区间.
+        $getSignBetween = [
+            $startTime,
+            $endTime,
+        ];
+
+        $getSignSelect = [
+            'getsign_id',
+            'getsign_identity',
             'name',
-            'getrelief_mony',
-            'getrelief_begin_money',
-            'getrelief_end_money',
-            'getrelief_addtime',
+            'getsign_mony',
+            'getsign_begin_money',
+            'getsign_end_money',
+            'getsign_addtime',
         ];
         // 查询数据.
-        $res = $reliefDataModel->getRelief($getReliefSelect, $request->get('limit', 30), $getReliefWhere, $getReliefBetween);
+        $res = $signModel->getSignRecord($getSignSelect, $request->get('limit', 30), $getSignWhere, $getSignBetween);
         // 返回参数.
         $data = [
             'code'  => 0,
@@ -86,20 +89,19 @@ class SignController extends PublicController
      */
     public function setting()
     {
-        $reliefDataModel = new ReliefData;
-        $getConfigSelect = [
-            'systemconfig_data',
-            'systemconfig_status',
-            'systemconfig_id',
+        $signModel                = new Sign;
+        $getConfigSelect          = [
+            'sign_data',
+            'sign_title',
+            'sign_name',
         ];
-        $getConfigWhere['systemconfig_name'] = 'relief';
-        // 获取系统设置信息.
-        $getSystemconfig = $reliefDataModel->getSystemconfig($getConfigSelect, $getConfigWhere);
-        // 重组数据.
-        $data                    = json_decode($getSystemconfig[0]['systemconfig_data'], true);
-        $data['systemconfig_id'] = $getSystemconfig[0]['systemconfig_id'];
-        $data['systemconfig_status'] = $getSystemconfig[0]['systemconfig_status'];
-        return view('admin.relief.setting', compact('data'));
+        $getDayWhere['sign_type'] = '1';
+        // 获取周设置信息.
+        $getDayConfig               = $signModel->signConfig($getConfigSelect, $getDayWhere, '');
+        $getMonthWhere['sign_type'] = '2';
+        // 获取月设置信息.
+        $getMonthConfig = $signModel->signConfig($getConfigSelect, $getMonthWhere, '');
+        return view('admin.sign.setting', compact('getDayConfig', 'getMonthConfig'));
 
     }//end setting()
 
@@ -113,25 +115,34 @@ class SignController extends PublicController
      */
     public function onSetting(Request $request)
     {
-        $reliefDataModel                   = new ReliefData;
-        $getConfigWhere['systemconfig_id'] = $_REQUEST['systemconfig_id'];
+        $signModel       = new Sign;
+        $allSignTitle    = $signModel->signConfig('sign_title', '', '');
+        $allSignTitleArr = [];
+        foreach ($allSignTitle as $v) {
+            $allSignTitleArr[] = $v['sign_title'];
+        }
+
+        $success = true;
         // 设置数据.
-        $data          = [
-            'condition' => $_REQUEST['condition'],
-            'count'     => $_REQUEST['count'],
-            'mony'      => $_REQUEST['mony'],
-        ];
-        $getConfigData = [
-            'systemconfig_status' => $_REQUEST['systemconfig_status'],
-            'systemconfig_data'   => json_encode($data),
-            'systemconfig_uptime'   => time(),
-        ];
-        $back = $reliefDataModel->upSystemconfig($getConfigWhere, $getConfigData);
+        foreach ($_REQUEST as $k => $v) {
+            if (in_array($k, $allSignTitleArr) === true) {
+                $upSignWhere['sign_title'] = $k;
+                $upSignData                = [
+                    'sign_upTime' => time(),
+                    'sign_data'   => $v,
+                ];
+                $back = $signModel->upSignConfig($upSignWhere, $upSignData);
+                if (empty($back) === true) {
+                    $success = false;
+                }
+            }
+        }
 
-        if ($back){
-            return redirect()->to(route('admin.relief.setting'))->with(['status'=>'更新成功']);
+        if ($success === true) {
+            return redirect()->to(route('admin.sign.setting'))->with(['status' => '更新成功']);
         }
-        return redirect()->to(route('admin.relief.setting'))->withErrors('系统错误');
+
+        return redirect()->to(route('admin.sign.setting'))->withErrors('系统错误');
 
     }//end onSetting()
 

app/Http/Controllers/Api/AgentController.php

@@ -25,7 +25,7 @@ class AgentController extends Controller
         $msg = '操作失败';
         try {
             // 获取Token url及参数.
-            $gmenuId = $req->input('id');
+            $gmenuId = $req->input('id') ?? 7;
             $sportsAgentModel = new Models\SportsAgent;
             $backData = $sportsAgentModel->getSportsToken($gmenuId);
             if ($backData !== 1) {
@@ -141,7 +141,42 @@ class AgentController extends Controller
             return toJson($code, $msg, []);
         }
 
-    }//end login()
+    }//end turnOutMoney()
+
+
+    /**
+     * 获取用户盈利
+     *
+     * @access public
+     * @param mixed $req 数据传输
+     * @return array JsonString
+     */
+    public function userProfit()
+    {
+        $code = -2;
+        $msg = '操作失败';
+        try {
+            $agentModel = new Models\Agent;
+            $sportsAgentModel = new Models\SportsAgent;
+            $gmenuId = 7;
+            // 查询盈利.
+            $backData = $sportsAgentModel->sportsProfit($gmenuId);
+            if ($backData === 2) {
+                $msg = '链接失败';
+                return toJson($code, $msg, []);
+            }
+
+
+
+            $msg = '成功';
+            $code = 1;
+
+            return toJson($code, $msg, $backData);
+        } catch (Exception $e) {
+            return toJson($code, $msg, []);
+        }
+
+    }//end turnOutMoney()
 
 
 }

app/Http/Controllers/Api/ReliefController.php

@@ -92,7 +92,7 @@ class ReliefController extends Controller
                     DB::rollBack();
                 }
             } else {
-                return toJson(-30004);
+                return toJson(-30003);
             }//end if
         } catch (Exception $e) {
             echo $e->getMessage();

app/Http/Controllers/Api/SignController.php

@@ -0,0 +1,222 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Http\Models\Sign;
+use App\Http\Models\UserInfo;
+use Illuminate\Support\Facades\DB;
+use \Exception;
+
+/**
+ * 签到控制器
+ */
+class SignController extends Controller
+{
+
+    /**
+     * 签到次数
+     *
+     * @access public
+     * @param  mixed $req 参数.
+     * @return string
+     */
+    public function signCount(Request $req){
+        try {
+            $signModel = new Sign;
+            $uid       = S('token_user_id');
+            // 查询用户ID.
+            $getSignWhere['members_id'] = $uid;
+            // 获取当周1.
+            $timeMonday = date('Y-m-d', (time()-((date('w',time()) == 0?7:date('w',time()))-1)*24*3600));
+            // 获取当月一号.
+            $monthOne = date('Y-m-01');
+            // 时间区间.
+            $weekBetween  = [
+                strtotime($timeMonday),
+                time(),
+            ];
+            $monthBetween = [
+                strtotime($monthOne),
+                time(),
+            ];
+            // 查询用户签到次数.
+            $countWeek  = $signModel->countSign($getSignWhere, $weekBetween);
+            $countMonth = $signModel->countSign($getSignWhere, $monthBetween);
+            $return     = [
+                'countWeek'  => $countWeek,
+                'countMonth' => $countMonth,
+            ];
+
+            return toJson(1, '成功', $return);
+        } catch (Exception $e) {
+            echo $e->getMessage();
+        }//end try
+
+    }//end signCount()
+
+
+    /**
+     * 签到
+     *
+     * @access public
+     * @param  mixed $req 参数.
+     * @return string
+     */
+    public function pullSign(Request $req){
+        try {
+            // 查询参数.
+            $signModel     = new Sign;
+            $userInfoModel = new UserInfo;
+            $uid           = S('token_user_id');
+            // 获取当周1.
+            $timeMonday = date('Y-m-d', (time()-((date('w',time())==0?7:date('w',time()))-1)*24*3600));
+            // 获取当月一号.
+            $monthOne = date('Y-m-01');
+            // 时间区间.
+            $weekBetween  = [
+                strtotime($timeMonday),
+                time(),
+            ];
+            $monthBetween = [
+                strtotime($monthOne),
+                time(),
+            ];
+            $dayBetween = [
+                strtotime(date('Y-m-d')),
+                time(),
+            ];
+            // 查询用户ID.
+            $getSignWhere['members_id'] = $uid;
+            // 查询用户是否已签到.
+            $countDay = $signModel->countSign($getSignWhere, $dayBetween);
+            if ($countDay) {
+                return toJson(-30004);
+            }
+
+            // 查询用户签到次数.
+            $countWeek  = $signModel->countSign($getSignWhere, $weekBetween);
+            $countMonth = $signModel->countSign($getSignWhere, $monthBetween);
+            // 查询设置表.
+            $signSelect     = [
+                'sign_title',
+                'sign_data',
+                'sign_id',
+            ];
+            $signWeekWhere  = [];
+            $signMonthWhere = [];
+            // 根据签到天数获取查询条件.
+            switch ($countWeek) {
+                case 0:
+                    $signWeekWhere['sign_title'] = 'day1';
+                    break;
+                case 1:
+                    $signWeekWhere['sign_title'] = 'day2';
+                    break;
+                case 2:
+                    $signWeekWhere['sign_title'] = 'day3';
+                    break;
+                case 3:
+                    $signWeekWhere['sign_title'] = 'day4';
+                    break;
+                case 4:
+                    $signWeekWhere['sign_title'] = 'day5';
+                    break;
+                case 5:
+                    $signWeekWhere['sign_title'] = 'day6';
+                    break;
+                case 6:
+                    $signWeekWhere['sign_title'] = 'day7';
+                    break;
+            }
+            switch ($countMonth) {
+                case 4:
+                    $signMonthWhere['sign_title'] = 'accumulate1';
+                    break;
+                case 9:
+                    $signMonthWhere['sign_title'] = 'accumulate2';
+                    break;
+                case 14:
+                    $signMonthWhere['sign_title'] = 'accumulate3';
+                    break;
+                case 19:
+                    $signMonthWhere['sign_title'] = 'accumulate4';
+                    break;
+                case 24:
+                    $signMonthWhere['sign_title'] = 'accumulate5';
+                    break;
+            }
+            $getWeekConfig = [];
+            $getMonthConfig = [];
+            // 查询周签到设置.
+            if ($signWeekWhere) {
+                $getWeekConfig = $signModel->signConfig($signSelect, $signWeekWhere, '');
+            }
+            // 查询月签到设置.
+            if ($signMonthWhere) {
+                $getMonthConfig = $signModel->signConfig($signSelect, $signMonthWhere, '');
+            }
+            // 查询用户余额.
+            $getUserSelect              = ['membersDetailed_cash'];
+            $getUserWhere['members_id'] = $uid;
+            $cash = $userInfoModel->userInfo($getUserSelect, $getUserWhere);
+            $nowCash = $cash['membersDetailed_cash'];
+            // 添加记录，修改用户信息.
+            DB::beginTransaction();
+            $upUserInfo = 1;
+            $receiveMoney = 0;
+            $signId = '';
+            // 如果有签到奖励则修改用户余额.
+            if ($signWeekWhere || $signMonthWhere) {
+                $signIdArr = [];
+                $getWeekMoney = 0;
+                $getMonthMoney = 0;
+                if ($getWeekConfig) {
+                    $signIdArr[] = $getWeekConfig[0]['sign_id'];
+                    $getWeekMoney = $getWeekConfig[0]['sign_data'];
+                }
+                if ($getMonthConfig) {
+                    $signIdArr[] = $getMonthConfig[0]['sign_id'];
+                    $getMonthMoney = $getMonthConfig[0]['sign_data'];
+                }
+                $signId = json_encode($signIdArr);
+                // 计算签到后余额.
+                $receiveMoney = intval($getWeekMoney) + intval($getMonthMoney);
+                $nowCash += $receiveMoney;
+                $upUserInfoWhere['members_id']          = $uid;
+                $upUserInfoData['membersDetailed_cash'] = $nowCash;
+                // 修改用户信息.
+                $upUserInfo = $userInfoModel->upUserInfo($upUserInfoWhere, $upUserInfoData);
+            }
+            // 新增签到记录.
+            $orderId       = getOrderId();
+            $addSignData = [
+                'getsign_identity'    => $orderId,
+                'members_id'            => $uid,
+                'getsign_addtime'     => time(),
+                'getsign_mony'        => $receiveMoney,
+                'getsign_begin_money' => $cash['membersDetailed_cash'],
+                'getsign_end_money'   => $nowCash,
+                'sign_id'   => $signId,
+            ];
+            $addSign     = $signModel->addSign($addSignData);
+            if ($addSign && $upUserInfo) {
+                DB::commit();
+                $return = [
+                    'money' => $nowCash,
+                    'countWeek'  => $countWeek + 1,
+                    'countMonth' => $countMonth + 1,
+                ];
+                return toJson(1, '成功', $return);
+            } else {
+                return toJson(-2);
+                DB::rollBack();
+            }
+        } catch (Exception $e) {
+            echo $e->getMessage();
+        }//end try
+    }//end pullSign()
+
+
+}

app/Http/Models/Sign.php

@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Http\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use \App\Models;
+
+/**
+ * 签到模型类
+ */
+class Sign extends Model
+{
+
+
+    /**
+     * 查询签到记录
+     *
+     * @access public
+     * @param mixed $where 查询条件
+     * @param mixed $between 查询条件
+     * @param mixed $paginate 分页
+     * @return array
+     */
+    public function getSignRecord($select, $paginate, $where='', $between='')
+    {
+        // 获取签到记录.
+        $getSignModel = new Models\GetSign;
+        $getSignModel = $getSignModel
+            ->select($select)
+            ->join('members', 'members.id', 'getsign.members_id');
+        if (empty($where) === false) {
+            $getSignModel = $getSignModel->where($where);
+        }
+
+        if (empty($between) === false) {
+            $getSignModel = $getSignModel->whereBetween('getsign_addtime', $between);
+        }
+
+        $getSignModel = $getSignModel
+            ->orderBy('getsign_addtime','desc')
+            ->paginate($paginate)
+            ->toArray();
+
+        return $getSignModel;
+
+    }//end getSignRecord()
+
+
+    /**
+     * 添加签到记录
+     *
+     * @access public
+     * @param mixed $data 数据
+     * @return array
+     */
+    public function addSign($data)
+    {
+        // 获取救济金记录.
+        $getSignModel = new Models\GetSign;
+        $result = $getSignModel->insert($data);
+
+        return $result;
+
+    }//end addSign()
+
+
+    /**
+     * 查询签到记录
+     *
+     * @access public
+     * @param mixed $where 查询条件
+     * @param mixed $between 查询条件
+     * @param mixed $paginate 分页
+     * @return array
+     */
+    public function countSign($where, $between)
+    {
+        // 获取救济金记录.
+        $getSignModel = new Models\GetSign;
+        $result = $getSignModel
+            ->where($where)
+            ->whereBetween('getsign_addtime', $between)
+            ->count();
+
+        return $result;
+
+    }//end countSign()
+
+
+    /**
+     * 查询签到设置
+     *
+     * @access public
+     * @param mixed $select 查询字段
+     * @param mixed $where 查询条件
+     * @param mixed $orWhere 查询条件
+     * @return array
+     */
+    public function signConfig($select, $where, $orWhere)
+    {
+        // 查询救济金系统设置.
+        $signModel = new Models\Sign;
+        $signModel = $signModel->select($select);
+        if ($where) {
+            $signModel = $signModel->Where($where);
+        }
+        if ($orWhere) {
+            $signModel = $signModel->orWhere($orWhere);
+        }
+        $signModel = $signModel->orderBy('sign_title', 'asc')->get();
+
+        return $signModel;
+
+    }//end signConfig()
+
+
+    /**
+     * 修改签到设置
+     *
+     * @access public
+     * @param mixed $where 查询条件
+     * @param mixed $data 数据
+     * @return array
+     */
+    public function upSignConfig($where, $data)
+    {
+        // 查询救济金系统设置.
+        $signModel = new Models\Sign;
+        $signModel = $signModel
+            ->where($where)
+            ->update($data);
+
+        return $signModel;
+
+    }//end upSignConfig()
+
+
+}

app/Http/Models/SportsAgent.php

@@ -215,6 +215,46 @@ class SportsAgent extends Model
     }//end transferSports()
 
 
+    /**
+     * 盈利
+     *
+     * @access public
+     * @param mixed $gmenuId 游戏ID
+     * @param mixed $money 金额
+     * @param mixed $cash 余额
+     * @param mixed $getMemberInfo 用户信息
+     * @param mixed $type IN转入OUT转出
+     * @return string
+     */
+    public function sportsProfit($gmenuId)
+    {
+        $agentModel = new HttpModel\Agent;
+        // 获取查询盈利 url及参数.
+        $getGameUrlWhere = [
+            'gmenu_id' => $gmenuId,
+            'gameUrl_type' => 'getSportsProfit',
+        ];
+        $getGameUrl = $agentModel->getGameUrl($getGameUrlWhere);
+        // 获取查询盈利传参.
+        $data = json_decode($getGameUrl->gameUrl_data);
+        // 获取查询盈利url.
+        $url = $getGameUrl->gameUrl_url;
+        // 查询盈利.
+        $transferParams = [
+            'agent' => $data->agent,
+            'method' => $data->method,
+        ];
+        $commonModel = new HttpModel\Common;
+        $transferUrl = $commonModel->sportsAgentParams($transferParams, $url);
+        $transferData = $commonModel->make_request($transferUrl, '');
+        if ($transferData && json_decode($transferData)->status === 1) {
+            return json_decode($transferData)->data;
+        } else {
+            return 2;
+        }
+    }//end transferSports()
+
+
     /**
      * 查看体育余额
      *

app/Models/GetSign.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * 救济金记录模型类
+ */
+class GetSign extends Model
+{
+
+    protected $table = 'getsign';
+
+
+}

app/Models/Sign.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+/**
+ * 救济金记录模型类
+ */
+class Sign extends Model
+{
+
+    protected $table = 'sign';
+    const UPDATED_AT = null;
+
+
+}

public/function.php

@@ -115,3 +115,18 @@ function  createDir($path){
     if  (is_dir($path)) { return true ; }
     return  mkdir($path,0777,true);
 }
+
+// 获取当周时间.
+function get_week($time, $format = "Y-m-d") {
+    $week = date('w',$time);
+    $weekname=array('星期一','星期二','星期三','星期四','星期五','星期六','星期日');
+    //星期日排到末位
+    if(empty($week)){
+        $week=7;
+    }
+    for ($i=0;$i<=6;$i++){
+        $demo[$i]['date'] = date($format,strtotime( '+'. $i+1-$week .' days',$time));
+        $demo[$i]['week'] = $weekname[$i];
+    }
+    return $demo;
+}

resources/lang/zh-CN/error.php

@@ -15,7 +15,7 @@ return array(
     '-30001' => 'TOKEN无效',
     '-30002' => '今日领取次数已用完，明天再来哟亲',
     '-30003' => '您还未达到领取条件',
-    '-30004' => '您还未达到领取条件',
+    '-30004' => '您今天已签过到',
 
     //图片上传
     '-40001' => '不支持该类型图片格式',

resources/views/admin/relief/index.blade.php

@@ -69,7 +69,9 @@
                         ,{field: 'getrelief_mony', title: '领取金额'}
                         ,{field: 'getrelief_begin_money', title: '用户初始金额'}
                         ,{field: 'getrelief_end_money', title: '领取后金额'}
-                        ,{field: 'getrelief_addtime', title: '生成时间'}
+                        ,{field: 'getrelief_addtime', title: '生成时间', templet: function(d){
+                            return customFormatDateTime(d.getrelief_addtime, '', 3);
+                      }}
 
                         /*,{fixed: 'right', width: 120, align:'center', toolbar: '#options'}*/
                     ]]

resources/views/admin/relief/setting.blade.php

@@ -3,7 +3,7 @@
 @section('content')
     <div class="layui-card">
         <div class="layui-card-header layuiadmin-card-header-auto">
-            <h2>站点配置</h2>
+            <h2>救济金配置</h2>
         </div>
         <div class="layui-card-body">
             <form class="layui-form" action="{{route('admin.relief.onSetting')}}" method="post">

resources/views/admin/sign/index.blade.php

@@ -8,7 +8,7 @@
                     <button class="layui-btn layui-btn-sm layui-btn-danger" id="listDelete">删除</button>
                 @endcan--}}
                 @can('config.gameUrl.create')
-                    <a class="layui-btn layui-btn-sm" href="{{ route('admin.relief.setting') }}">设置</a>
+                    <a class="layui-btn layui-btn-sm" href="{{ route('admin.sign.setting') }}">设置</a>
                 @endcan
                 <button class="layui-btn layui-btn-sm" id="memberSearch">搜索</button>
             </div>
@@ -58,18 +58,20 @@
                 var dataTable = table.render({
                     elem: '#dataTable'
                     ,height: 500
-                    ,url: "{{ route('admin.relief.data') }}" //数据接口
-                    ,where:{model:"relief"}
+                    ,url: "{{ route('admin.sign.data') }}" //数据接口
+                    ,where:{model:"sign"}
                     ,page: true //开启分页
                     ,cols: [[ //表头
                         {checkbox: true,fixed: true}
-                        ,{field: 'getrelief_id', title: 'ID', sort: true,width:80}
-                        ,{field: 'getrelief_identity', title: '工单号'}
+                        ,{field: 'getsign_id', title: 'ID', sort: true,width:80}
+                        ,{field: 'getsign_identity', title: '工单号'}
                         ,{field: 'name', title: '用户名'}
-                        ,{field: 'getrelief_mony', title: '领取金额'}
-                        ,{field: 'getrelief_begin_money', title: '用户初始金额'}
-                        ,{field: 'getrelief_end_money', title: '领取后金额'}
-                        ,{field: 'getrelief_addtime', title: '生成时间'}
+                        ,{field: 'getsign_mony', title: '领取金额'}
+                        ,{field: 'getsign_begin_money', title: '用户初始金额'}
+                        ,{field: 'getsign_end_money', title: '领取后金额'}
+                        ,{field: 'getsign_addtime', title: '生成时间', templet: function(d){
+                            return customFormatDateTime(d.getsign_addtime, '', 3);
+                      }}
 
                         /*,{fixed: 'right', width: 120, align:'center', toolbar: '#options'}*/
                     ]]

resources/views/admin/sign/setting.blade.php

@@ -3,45 +3,38 @@
 @section('content')
     <div class="layui-card">
         <div class="layui-card-header layuiadmin-card-header-auto">
-            <h2>站点配置</h2>
+            <h2>签到配置</h2>
         </div>
         <div class="layui-card-body">
-            <form class="layui-form" action="{{route('admin.relief.onSetting')}}" method="post">
+            <form class="layui-form" action="{{route('admin.sign.onSetting')}}" method="post">
                 {{csrf_field()}}
                 {{method_field('put')}}
-                <input type="hidden" name="systemconfig_id" value="{{$data['systemconfig_id']}}">
-                <div class="layui-form-item">
-                    <label for="" class="layui-form-label">领取条件：</label>
-                    <div class="layui-input-block" style="display: flex">
-                        <span style="line-height: 2.5;">当玩家金币额度低于</span>
-                        <input style="width: 70px; text-align: right; padding-right: 10px; margin-left: 5px" type="text" name="condition" value="{{ $data['condition']??'' }}" lay-verify="required" placeholder="请输入金额" class="layui-input" >
-                        <span style="line-height: 2.5; margin-left: 5px">可领取</span>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label for="" class="layui-form-label">领取次数：</label>
-                    <div class="layui-input-block" style="display: flex">
-                        <span style="line-height: 2.5;">每日最大领取次数</span>
-                        <input style="width: 70px; text-align: right; padding-right: 10px; margin-left: 5px" type="text" name="count" value="{{ $data['count']??'' }}" lay-verify="required" placeholder="请输入金额" class="layui-input" >
-                    </div>
+                <div class="layui-card-header layuiadmin-card-header-auto">
+                    <h3>七日奖励</h3>
                 </div>
-                <div class="layui-form-item">
-                    <label for="" class="layui-form-label">领取金额：</label>
-                    <div class="layui-input-block" style="display: flex">
-                        <span style="line-height: 2.5;">每次可以领取金币</span>
-                        <input style="width: 70px; text-align: right; padding-right: 10px; margin-left: 5px" type="text" name="mony" value="{{ $data['mony']??'' }}" lay-verify="required" placeholder="请输入金额" class="layui-input" >
+                @foreach($getDayConfig as $v)
+                    <div class="layui-form-item">
+                        <label for="" class="layui-form-label">{{ $v['sign_name'] }}：</label>
+                        <div class="layui-input-block" style="display: flex">
+                            <span style="line-height: 2.5;">金币数量</span>
+                            <input style="width: 70px; text-align: right; padding-right: 10px; margin-left: 5px" type="text" name="{{ $v['sign_title']??'' }}" value="{{ $v['sign_data']??'' }}" lay-verify="required" placeholder="请输入金额" class="layui-input" >
+                        </div>
                     </div>
+                @endforeach
+
+                <div class="layui-card-header layuiadmin-card-header-auto">
+                    <h3>累积奖励</h3>
                 </div>
-                <div class="layui-form-item">
-                    <label for="" class="layui-form-label">启用：</label>
-                    <div class="layui-input-block" style="width: 100px;">
-                        <select name="systemconfig_status" lay-verify="required">
-                            <option value=""></option>
-                            <option value="1" {{$data['systemconfig_status']==1?'selected': ''}}>启用</option>
-                            <option value="2" {{$data['systemconfig_status']==2?'selected': ''}}>停用</option>
-                        </select>
+                @foreach($getMonthConfig as $v)
+                    <div class="layui-form-item">
+                        <label for="" class="layui-form-label">{{ $v['sign_name'] }}：</label>
+                        <div class="layui-input-block" style="display: flex">
+                            <span style="line-height: 2.5;">金币数量</span>
+                            <input style="width: 70px; text-align: right; padding-right: 10px; margin-left: 5px" type="text" name="{{ $v['sign_title']??'' }}" value="{{ $v['sign_data']??'' }}" lay-verify="required" placeholder="请输入金额" class="layui-input" >
+                        </div>
                     </div>
-                </div>
+                @endforeach
+
                 <div class="layui-form-item" style="margin-top: 50px;">
                     <div class="layui-input-block">
                         <button type="submit" class="layui-btn" lay-submit="" lay-filter="formDemo">确 认</button>