82188713 1 year ago
parent d22ea6071f
commit 0a04a930e8
  1. 37
      application/admin/controller/income/Expend.php
  2. 37
      application/admin/controller/user/Recharge.php
  3. 11
      application/admin/lang/zh-cn/income/expend.php
  4. 9
      application/admin/lang/zh-cn/user/recharge.php
  5. 40
      application/admin/model/income/Expend.php
  6. 40
      application/admin/model/user/Recharge.php
  7. 27
      application/admin/validate/income/Expend.php
  8. 27
      application/admin/validate/user/Recharge.php
  9. 45
      application/admin/view/income/expend/add.html
  10. 45
      application/admin/view/income/expend/edit.html
  11. 29
      application/admin/view/income/expend/index.html
  12. 33
      application/admin/view/user/recharge/add.html
  13. 33
      application/admin/view/user/recharge/edit.html
  14. 29
      application/admin/view/user/recharge/index.html
  15. 99
      application/api/controller/User.php
  16. 2
      application/common/library/Auth.php
  17. 1
      public/.well-known/acme-challenge/6-UdYhBlI2XGul_Oj-2SMgLX-4b4E1MLgIQewU2jm18
  18. 58
      public/assets/js/backend/income/expend.js
  19. 56
      public/assets/js/backend/user/recharge.js

@ -0,0 +1,37 @@
<?php
namespace app\admin\controller\income;
use app\common\controller\Backend;
/**
* 收支记录
*
* @icon fa fa-circle-o
*/
class Expend extends Backend
{
/**
* Expend模型对象
* @var \app\admin\model\income\Expend
*/
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\income\Expend;
}
/**
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
}

@ -0,0 +1,37 @@
<?php
namespace app\admin\controller\user;
use app\common\controller\Backend;
/**
*
*
* @icon fa fa-circle-o
*/
class Recharge extends Backend
{
/**
* Recharge模型对象
* @var \app\admin\model\user\Recharge
*/
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\user\Recharge;
}
/**
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
}

@ -0,0 +1,11 @@
<?php
return [
'Payee_id' => '收款人',
'Payer_id' => '付款id',
'Status' => '状态',
'Amount' => '金额',
'Createtime' => '创建时间',
'Updatetime' => '更新时间',
'Pay_voucher' => '支付凭证'
];

@ -0,0 +1,9 @@
<?php
return [
'Method' => 'wechat微信alipay支付宝bank银联',
'Amount' => '充值金额',
'Status' => '状态0待审核1审过通过2驳回',
'Createtime' => '创建时间',
'Updatetime' => '更新时间'
];

@ -0,0 +1,40 @@
<?php
namespace app\admin\model\income;
use think\Model;
class Expend extends Model
{
// 表名
protected $name = 'income_expend';
// 自动写入时间戳字段
protected $autoWriteTimestamp = 'integer';
// 定义时间戳字段名
protected $createTime = 'createtime';
protected $updateTime = 'updatetime';
protected $deleteTime = false;
// 追加属性
protected $append = [
];
}

@ -0,0 +1,40 @@
<?php
namespace app\admin\model\user;
use think\Model;
class Recharge extends Model
{
// 表名
protected $name = 'user_recharge';
// 自动写入时间戳字段
protected $autoWriteTimestamp = 'integer';
// 定义时间戳字段名
protected $createTime = 'createtime';
protected $updateTime = 'updatetime';
protected $deleteTime = false;
// 追加属性
protected $append = [
];
}

@ -0,0 +1,27 @@
<?php
namespace app\admin\validate\income;
use think\Validate;
class Expend extends Validate
{
/**
* 验证规则
*/
protected $rule = [
];
/**
* 提示消息
*/
protected $message = [
];
/**
* 验证场景
*/
protected $scene = [
'add' => [],
'edit' => [],
];
}

@ -0,0 +1,27 @@
<?php
namespace app\admin\validate\user;
use think\Validate;
class Recharge extends Validate
{
/**
* 验证规则
*/
protected $rule = [
];
/**
* 提示消息
*/
protected $message = [
];
/**
* 验证场景
*/
protected $scene = [
'add' => [],
'edit' => [],
];
}

@ -0,0 +1,45 @@
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Payee_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-payee_id" data-rule="required" min="0" data-source="payee/index" class="form-control selectpage" name="row[payee_id]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Payer_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-payer_id" data-rule="required" min="0" data-source="payer/index" class="form-control selectpage" name="row[payer_id]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-status" data-rule="required" min="0" class="form-control" name="row[status]" type="number" value="0">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Amount')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[amount]" type="number" value="0.00">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pay_voucher')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-pay_voucher" data-rule="required" class="form-control" name="row[pay_voucher]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Date')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-date" data-rule="required" class="form-control" name="row[date]" type="text" value="">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
</div>
</div>
</form>

@ -0,0 +1,45 @@
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Payee_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-payee_id" data-rule="required" min="0" data-source="payee/index" class="form-control selectpage" name="row[payee_id]" type="text" value="{$row.payee_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Payer_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-payer_id" data-rule="required" min="0" data-source="payer/index" class="form-control selectpage" name="row[payer_id]" type="text" value="{$row.payer_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-status" data-rule="required" min="0" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Amount')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[amount]" type="number" value="{$row.amount|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pay_voucher')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-pay_voucher" data-rule="required" class="form-control" name="row[pay_voucher]" type="text" value="{$row.pay_voucher|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Date')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-date" data-rule="required" class="form-control" name="row[date]" type="text" value="{$row.date|htmlentities}">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
</div>
</div>
</form>

@ -0,0 +1,29 @@
<div class="panel panel-default panel-intro">
{:build_heading()}
<div class="panel-body">
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade active in" id="one">
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('income/expend/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('income/expend/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('income/expend/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
</div>
<table id="table" class="table table-striped table-bordered table-hover table-nowrap"
data-operate-edit="{:$auth->check('income/expend/edit')}"
data-operate-del="{:$auth->check('income/expend/del')}"
width="100%">
</table>
</div>
</div>
</div>
</div>
</div>

@ -0,0 +1,33 @@
<form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-user_id" data-rule="required" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Method')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-method" data-rule="required" class="form-control" name="row[method]" type="text" value="0">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Amount')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[amount]" type="number" value="0.00">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="0">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
</div>
</div>
</form>

@ -0,0 +1,33 @@
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-user_id" data-rule="required" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Method')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-method" data-rule="required" class="form-control" name="row[method]" type="text" value="{$row.method|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Amount')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[amount]" type="number" value="{$row.amount|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-status" data-rule="required" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
</div>
</div>
</form>

@ -0,0 +1,29 @@
<div class="panel panel-default panel-intro">
{:build_heading()}
<div class="panel-body">
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade active in" id="one">
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/recharge/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/recharge/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/recharge/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
</div>
<table id="table" class="table table-striped table-bordered table-hover table-nowrap"
data-operate-edit="{:$auth->check('user/recharge/edit')}"
data-operate-del="{:$auth->check('user/recharge/del')}"
width="100%">
</table>
</div>
</div>
</div>
</div>
</div>

@ -14,7 +14,7 @@ use app\admin\model\Order;
use app\admin\model\order\Detail;
use app\admin\model\Warehouse;
use EasyWeChat\Factory;
use think\Db;
/**
@ -63,18 +63,19 @@ class User extends Api
if (!$account || !$password) {
$this->error(__('Invalid parameters'));
}
$site = Config::get("site");
$config = [
'app_id' => $site['wx_appid'],
'secret' => $site['wx_secrect'],
// 指定 API 调用返回结果的类型:array(default)/collection/object/raw/自定义类名
'response_type' => 'array',
];
$ret = $this->auth->login($account, $password);
//更新用户新
if ($ret) {
$openid = "";
if ($code) {
$site = Config::get("site");
$config = [
'app_id' => $site['wx_appid'],
'secret' => $site['wx_secrect'],
// 指定 API 调用返回结果的类型:array(default)/collection/object/raw/自定义类名
'response_type' => 'array',
];
$app = Factory::officialAccount($config);
$user = $app->oauth->userFromCode($code);
$user = $user->toArray();
@ -237,9 +238,16 @@ class User extends Api
$params = $this->request->post();
$user_id = $this->auth->id;
$upData = [];
//姓名
if (isset($params['bank_username']) && $params['bank_username']) {
$upData['bank_username'] = $params['bank_username'];
}
if (isset($params['bank_realname']) && $params['bank_realname']) {
$upData['bank_realname'] = $params['bank_realname'];
}
if (isset($params['bank_sub_address']) && $params['bank_sub_address']) {
$upData['bank_sub_address'] = $params['bank_sub_address'];
}
if (isset($params['bank_mobile']) && $params['bank_mobile']) {
$upData['bank_mobile'] = $params['bank_mobile'];
}
@ -613,6 +621,81 @@ class User extends Api
});
$this->success("succ", $list);
}
/**
*
* [getUserIncomeAndExpandList description]
* @return [type] [description]
*/
public function getUserIncomeAndExpandList(){
$user = $this->auth->getUserinfo();
$list = Db::name('income_expend')->where(function ($query) use($user) {
$query->where('payee_id', $user['id'])->whereor('payer_id', $user['id']);
})->where(function ($query) {
$query->whereIn('status', [0,1,2]);
})->select();
foreach ($list as $key => &$value) {
if ($value['payer_id'] == $user['id']) {
$value['type'] = 1;
} else {
$value['type'] = 2;
}
$value['buyer'] = UserModel::where('id', $value['payer_id'])->find();
$value['seller'] = UserModel::where('id', $value['payee_id'])->find();
}
$this->success("succ", $list);
}
/**
* 收支确认支付
* [submitPay description]
* @return [type] [description]
*/
public function submitPay(){
$id = $this->request->post("id", 1);
$pay_voucher = $this->request->post("pay_voucher", 10);
$info = Db::name('income_expend')->where("id", $id)->find();
if (!$info) {
$this->error("记录不存在");
}
Db::name('income_expend')->where("id", $id)->update(['status' => 1, "pay_voucher" => $pay_voucher, "updatetime" => time()]);
$this->success("succ");
}
/**
* 收支确认支付
* [submitPay description]
* @return [type] [description]
*/
public function confirmPay(){
$id = $this->request->post("id", 1);
$info = Db::name('income_expend')->where("id", $id)->find();
if (!$info) {
$this->error("记录不存在");
}
if ($info['status'] != 1) {
$this->error("付款人还没支付,不能确认收款");
}
Db::name('income_expend')->where("id", $id)->update(['status' => 2, "updatetime" => time()]);
$this->success("succ");
}

@ -26,7 +26,7 @@ class Auth
//默认配置
protected $config = [];
protected $options = [];
protected $allowFields = ['id', 'username', 'nickname', 'mobile', 'avatar', 'score','sign_image','sign_status','alipay_image','wechat_image','buy_goods_num_per_day','advance_access_num','bank_realname','bank_mobile','bank_no','bank_address','reason','warehouse_id','advance_access_minute','deadline','pid','total_commission_amount','available_commission_amount',"openid","profit_amount"];
protected $allowFields = ['id', 'username', 'nickname', 'mobile', 'avatar', 'score','sign_image','sign_status','alipay_image','wechat_image','buy_goods_num_per_day','advance_access_num','bank_realname','bank_mobile','bank_no','bank_address','reason','warehouse_id','advance_access_minute','deadline','pid','total_commission_amount','available_commission_amount',"openid","profit_amount","bank_sub_address"];
public function __construct($options = [])
{

@ -0,0 +1 @@
6-UdYhBlI2XGul_Oj-2SMgLX-4b4E1MLgIQewU2jm18.W123KQYG8LHdtkI2WQs9DyLGHER36F6ip3V1dtBGchk

@ -0,0 +1,58 @@
define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
// 初始化表格参数配置
Table.api.init({
extend: {
index_url: 'income/expend/index' + location.search,
add_url: 'income/expend/add',
edit_url: 'income/expend/edit',
del_url: 'income/expend/del',
multi_url: 'income/expend/multi',
import_url: 'income/expend/import',
table: 'income_expend',
}
});
var table = $("#table");
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'payee_id', title: __('Payee_id')},
{field: 'payer_id', title: __('Payer_id')},
{field: 'status', title: __('Status')},
{field: 'amount', title: __('Amount'), operate:'BETWEEN'},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'pay_voucher', title: __('Pay_voucher'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
{field: 'date', title: __('Date'), operate: 'LIKE'},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
});
// 为表格绑定事件
Table.api.bindevent(table);
},
add: function () {
Controller.api.bindevent();
},
edit: function () {
Controller.api.bindevent();
},
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
}
}
};
return Controller;
});

@ -0,0 +1,56 @@
define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
// 初始化表格参数配置
Table.api.init({
extend: {
index_url: 'user/recharge/index' + location.search,
add_url: 'user/recharge/add',
edit_url: 'user/recharge/edit',
del_url: 'user/recharge/del',
multi_url: 'user/recharge/multi',
import_url: 'user/recharge/import',
table: 'user_recharge',
}
});
var table = $("#table");
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'user_id', title: __('User_id')},
{field: 'method', title: __('Method'), operate: 'LIKE'},
{field: 'amount', title: __('Amount'), operate:'BETWEEN'},
{field: 'status', title: __('Status')},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
]
});
// 为表格绑定事件
Table.api.bindevent(table);
},
add: function () {
Controller.api.bindevent();
},
edit: function () {
Controller.api.bindevent();
},
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
}
}
};
return Controller;
});
Loading…
Cancel
Save