sileya-ai
/
vr-shopxo-source
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化 用户积分

feat/task1-c-wallet
devil_gong 2018-11-15 11:33:14 +08:00
parent 281f5553e3
commit 1afc92f9f2
13 changed files with 495 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -72,6 +72,7 @@
> 我的地址
> 安全设置
> 我的消息
> 我的积分
> 我的足迹
> 安全退出
```

1
changelog.txt
View File

@ -68,5 +68,6 @@
> 我的地址
> 安全设置
> 我的消息
> 我的积分
> 我的足迹
> 安全退出

4
service/Application/Admin/Controller/UserController.class.php
View File

@ -2,7 +2,7 @@
namespace Admin\Controller;
use Service\UserService;
use Service\IntegralService;
/**
* 用户管理
@ -324,7 +324,7 @@ class UserController extends CommonController
if($user['integral'] != $data['integral'])
{
$integral_type = ($user['integral'] > $data['integral']) ? 0 : 1;
UserService::UserIntegralLogAdd($user_id, $user['integral'], $data['integral'], '管理员操作', $integral_type, $this->admin['id']);
IntegralService::UserIntegralLogAdd($user_id, $user['integral'], $data['integral'], '管理员操作', $integral_type, $this->admin['id']);
}
$this->ajaxReturn(L('common_operation_edit_success'));

83
service/Application/Home/Controller/UserIntegralController.class.php Executable file
View File

@ -0,0 +1,83 @@
<?php
namespace Home\Controller;
use Service\IntegralService;
/**
* 用户积分管理
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
class UserIntegralController extends CommonController
{
/**
* [_initialize 前置操作-继承公共前置方法]
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-03T12:39:08+0800
*/
public function _initialize()
{
// 调用父类前置方法
parent::_initialize();
// 是否登录
$this->Is_Login();
}
/**
* 用户积分列表
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-09-28
* @desc description
*/
public function Index()
{
// 参数
$params = array_merge($_POST, $_GET);
$params['user'] = $this->user;
// 分页
$number = 10;
// 条件
$where = IntegralService::UserIntegralLogListWhere($params);
// 获取总数
$total = IntegralService::UserIntegralLogTotal($where);
// 分页
$page_params = array(
'number' => $number,
'total' => $total,
'where' => $params,
'url' => U('Home/UserIntegral/Index'),
);
$page = new \Library\Page($page_params);
$this->assign('page_html', $page->GetPageHtml());
// 获取列表
$data_params = array(
'limit_start' => $page->GetPageStarNumber(),
'limit_number' => $number,
'where' => $where,
);
$data = IntegralService::UserIntegralLogList($data_params);
$this->assign('data_list', $data['data']);
// 操作类型
$this->assign('common_integral_log_type_list', L('common_integral_log_type_list'));
// 参数
$this->assign('params', $params);
$this->display('Index');
}
}
?>

7
service/Application/Home/Lang/zh-cn.php
View File

@ -71,6 +71,13 @@ return array(
'is_show' => 1,
'icon' => 'am-icon-bell-o',
),
array(
'control' => 'UserIntegral',
'action' => 'Index',
'name' => '我的积分',
'is_show' => 1,
'icon' => 'am-icon-fire',
),
array(
'control' => 'UserGoodsBrowse',
'action' => 'Index',

2
service/Application/Home/View/Default/User/Index.html
View File

@ -70,7 +70,7 @@
</a>
</li>
<li>
<a href="javascript:;">
<a href="{{:U('Home/UserIntegral/Index')}}">
<p>{{$user.integral}}</p>
<p>我的积分</p>
</a>

108
service/Application/Home/View/Default/UserIntegral/Index.html Executable file
View File

@ -0,0 +1,108 @@
<include file="Public/Header" />
<!-- header top nav -->
<include file="Public/HeaderTopNav" />
<!-- search -->
<include file="Public/NavSearch" />
<!-- header nav -->
<include file="Public/HeaderNav" />
<!-- goods category -->
<include file="Public/GoodsCategory" />
<!-- content -->
<div class="am-container user-main">
<!-- user menu start -->
<include file="Public/UserMenu" />
<!-- user menu end -->
<!-- content start -->
<div class="user-content">
<div class="user-content-body">
<form class="am-form form-validation" method="post" action="{{:U('Home/UserIntegral/Index')}}" request-type="form">
<div class="thin">
<div class="am-input-group am-input-group-sm am-fl so">
<input type="text" name="keywords" class="am-radius" placeholder="其实搜索很简单 ^_^！" value="<notempty name="params.keywords">{{$params.keywords}}</notempty>" />
<span class="am-input-group-btn">
<button class="am-btn am-btn-default am-radius" type="submit" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
</span>
</div>
<label class="am-fl thin_sub more-submit">
更多筛选条件
<input type="checkbox" name="is_more" value="1" class="none am-field-valid" <if condition="isset($params['is_more'])">checked</if> />
<i class="am-icon-angle-up"></i>
</label>
</div>
<table class="so-list more-where <if condition="!isset($params['is_more'])">none</if>">
<tbody>
<tr>
<td>
<span>类型：</span>
<select name="type" class="chosen-select" data-placeholder="操作类型...">
<option value="-1">操作类型...</option>
<notempty name="common_integral_log_type_list">
<foreach name="common_integral_log_type_list" item="v">
<option value="{{$v.id}}" <if condition="isset($params['type']) and $params['type'] eq $v['id']">selected</if>>{{$v.name}}</option>
</foreach>
</notempty>
</select>
</td>
<td>
<button type="submit" class="am-btn am-btn-primary am-radius am-btn-xs btn-loading-example" data-am-loading="{spinner:'circle-o-notch', loadingText:'搜索中...'}">搜索</button>
<a href="{{:U('Home/UserIntegral/Index')}}" class="am-btn am-btn-warning am-radius am-btn-sm reset-submit">清除条件</a>
</td>
</tr>
</tbody>
</table>
</form>
<!-- 消息列表 -->
<div class="data-list">
<table class="am-table">
<thead>
<tr>
<th>操作类型</th>
<th class="am-hide-sm-only">描述</th>
<th>原始积分</th>
<th>最新积分</th>
<th class="am-hide-sm-only">时间</th>
</tr>
</thead>
<tbody>
<notempty name="data_list">
<foreach name="data_list" item="v">
<tr>
<td>{{$v.type_name}}</td>
<td class="am-hide-sm-only">{{$v.msg}}</td>
<td>{{$v.original_integral}}</td>
<td>{{$v.new_integral}}</td>
<td class="am-hide-sm-only">{{$v.add_time_time}}</td>
</tr>
</foreach>
</notempty>
<empty name="data_list">
<tr>
<td colspan="5">
<div class="table-no"><i class="am-icon-warning"></i> {{:L('common_not_data_tips')}}</div>
</td>
</tr>
</empty>
</tbody>
</table>
</div>
<!-- 分页 -->
<notempty name="data_list">
{{$page_html}}
</notempty>
</div>
</div>
<!-- content end -->
</div>
<!-- footer start -->
<include file="Public/Footer" />
<!-- footer end -->

245
service/Application/Service/IntegralService.class.php Normal file
View File

@ -0,0 +1,245 @@
<?php
namespace Service;
use Service\MessageService;
/**
* 积分服务层
* @author Devil
* @blog http://gong.gg/
* @version 0.0.1
* @datetime 2016-12-01T21:51:08+0800
*/
class IntegralService
{
/**
* [UserIntegralLogAdd 用户积分日志添加]
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @datetime 2018-05-18T16:51:12+0800
* @param [int] $user_id [用户id]
* @param [int] $original_integral [原始积分]
* @param [int] $new_integral [最新积分]
* @param [string] $msg [操作原因]
* @param [int] $type [操作类型（0减少, 1增加）]
* @param [int] $operation_id [操作人员id]
* @return [boolean] [成功true, 失败false]
*/
public static function UserIntegralLogAdd($user_id, $original_integral, $new_integral, $msg = '', $type = 0, $operation_id = 0)
{
$data = array(
'user_id' => intval($user_id),
'original_integral' => intval($original_integral),
'new_integral' => intval($new_integral),
'msg' => $msg,
'type' => intval($type),
'operation_id' => intval($operation_id),
'add_time' => time(),
);
if(M('UserIntegralLog')->add($data) > 0)
{
$type_msg = L('common_integral_log_type_list')[$type]['name'];
$integral = ($data['type'] == 0) ? $data['original_integral']-$data['new_integral'] : $data['new_integral']-$data['original_integral'];
$detail = $msg.'积分'.$type_msg.$integral;
MessageService::MessageAdd($user_id, '积分变动', $detail);
return true;
}
return false;
}
/**
* 前端积分列表条件
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-09-29
* @desc description
* @param [array] $params [输入参数]
*/
public static function UserIntegralLogListWhere($params = [])
{
$where = [];
// 用户id
if(!empty($params['user']))
{
$where['user_id'] = $params['user']['id'];
}
if(!empty($params['keywords']))
{
$where['msg'] = array('like', '%'.$params['keywords'].'%');
}
// 是否更多条件
if(isset($params['is_more']) && $params['is_more'] == 1)
{
if(isset($params['type']) && $params['type'] > -1)
{
$where['type'] = intval($params['type']);
}
// 时间
if(!empty($params['time_start']))
{
$where['add_time'][] = array('gt', strtotime($params['time_start']));
}
if(!empty($params['time_end']))
{
$where['add_time'][] = array('lt', strtotime($params['time_end']));
}
}
return $where;
}
/**
* 用户积分日志总数
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-09-29
* @desc description
* @param [array] $where [条件]
*/
public static function UserIntegralLogTotal($where = [])
{
return (int) M('UserIntegralLog')->where($where)->count();
}
/**
* 积分日志列表
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-09-29
* @desc description
* @param [array] $params [输入参数]
*/
public static function UserIntegralLogList($params = [])
{
// 请求参数
$p = [
[
'checked_type' => 'empty',
'key_name' => 'where',
'error_msg' => '条件不能为空',
],
[
'checked_type' => 'is_array',
'key_name' => 'where',
'error_msg' => '条件格式有误',
],
[
'checked_type' => 'isset',
'key_name' => 'limit_start',
'error_msg' => '分页起始值有误',
],
[
'checked_type' => 'isset',
'key_name' => 'limit_number',
'error_msg' => '分页数量不能为空',
],
];
$ret = params_checked($params, $p);
if($ret !== true)
{
return DataReturn($ret, -1);
}
$limit_start = max(0, intval($params['limit_start']));
$limit_number = max(1, intval($params['limit_number']));
$order_by = empty($params['order_by']) ? 'id desc' : I('order_by', '', '', $params);
// 获取数据列表
$data = M('UserIntegralLog')->where($params['where'])->limit($limit_start, $limit_number)->order($order_by)->select();
if(!empty($data))
{
$common_integral_log_type_list = L('common_integral_log_type_list');
foreach($data as &$v)
{
// 操作类型
$v['type_name'] = $common_integral_log_type_list[$v['type']]['name'];
// 时间
$v['add_time_time'] = date('Y-m-d H:i:s', $v['add_time']);
$v['add_time_date'] = date('Y-m-d', $v['add_time']);
}
}
return DataReturn('处理成功', 0, $data);
}
/**
* 订单商品积分赠送
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-11-14
* @desc description
* @param [array] $params [输入参数]
*/
public static function OrderGoodsIntegralGiving($params = [])
{
// 请求参数
$p = [
[
'checked_type' => 'empty',
'key_name' => 'order_id',
'error_msg' => '订单id有误',
]
];
$ret = params_checked($params, $p);
if($ret !== true)
{
return DataReturn($ret, -1);
}
// 订单
$order = M('Order')->field('id,user_id,status')->find(intval($params['order_id']));
if(empty($order))
{
return DataReturn('订单不存在或已删除，中止操作', 0);
}
if(!in_array($order['status'], [4]))
{
return DataReturn('当前订单状态不允许操作['.$params['order_id'].'-'.$order['status'].']', 0);
}
// 获取用户信息
$user_m = M('User');
$user = $user_m->field('id')->find(intval($order['user_id']));
if(empty($user))
{
return DataReturn('用户不存在或已删除，中止操作', 0);
}
// 获取订单商品
$goods_all = M('OrderDetail')->where(['order_id'=>$params['order_id']])->getField('goods_id', true);
if(!empty($goods_all))
{
$goods_m = M('Goods');
$log_m = M('OrderGoodsInventoryLog');
foreach($goods_all as $goods_id)
{
$give_integral = $goods_m->where(['id'=>$goods_id])->getField('give_integral');
if(!empty($give_integral))
{
// 用户积分添加
$user_integral = $user_m->where(['id'=>$user['id']])->getField('integral');
if(!$user_m->where(['id'=>$user['id']])->setInc('integral', $give_integral))
{
return DataReturn('用户积分赠送失败['.$params['order_id'].'-'.$goods_id.']', -10);
}
// 积分日志
IntegralService::UserIntegralLogAdd($user['id'], $user_integral, $user_integral+$give_integral, '订单商品完成赠送', 1);
}
}
return DataReturn('操作成功', 0);
}
return DataReturn('没有需要操作的数据', 0);
}
}
?>

2
service/Application/Service/MessageService.class.php
View File

@ -195,7 +195,7 @@ class MessageService
$limit_number = max(1, intval($params['limit_number']));
$order_by = empty($params['order_by']) ? 'id desc' : I('order_by', '', '', $params);
// 获取订单
// 获取数据列表
$data = M('Message')->where($params['where'])->limit($limit_start, $limit_number)->order($order_by)->select();
if(!empty($data))
{

76
service/Application/Service/OrderService.class.php
View File

@ -5,6 +5,7 @@ namespace Service;
use Service\GoodsService;
use Service\ResourcesService;
use Service\BuyService;
use Service\IntegralService;
/**
* 订单服务层
@ -845,7 +846,7 @@ class OrderService
if($m->where($where)->save($upd_data))
{
// 订单商品积分赠送
$ret = self::OrderGoodsIntegralGiving(['order_id'=>$order['id']]);
$ret = IntegralService::OrderGoodsIntegralGiving(['order_id'=>$order['id']]);
if($ret['status'] != 0)
{
// 事务回滚
@ -1153,7 +1154,7 @@ class OrderService
}
/**
* 订单每个状态总数
* 订单每个环节状态总数
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
@ -1239,77 +1240,6 @@ class OrderService
return DataReturn('处理成功', 0, $result);
}
/**
* 订单商品积分赠送
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2018-11-14
* @desc description
* @param [array] $params [输入参数]
*/
public static function OrderGoodsIntegralGiving($params = [])
{
// 请求参数
$p = [
[
'checked_type' => 'empty',
'key_name' => 'order_id',
'error_msg' => '订单id有误',
]
];
$ret = params_checked($params, $p);
if($ret !== true)
{
return DataReturn($ret, -1);
}
// 订单
$order = M('Order')->field('id,user_id,status')->find(intval($params['order_id']));
if(empty($order))
{
return DataReturn('订单不存在或已删除，中止操作', 0);
}
if(!in_array($order['status'], [4]))
{
return DataReturn('当前订单状态不允许操作['.$params['order_id'].'-'.$order['status'].']', 0);
}
// 获取用户信息
$user_m = M('User');
$user = $user_m->field('id')->find(intval($order['user_id']));
if(empty($user))
{
return DataReturn('用户不存在或已删除，中止操作', 0);
}
// 获取订单商品
$goods_all = M('OrderDetail')->where(['order_id'=>$params['order_id']])->getField('goods_id', true);
if(!empty($goods_all))
{
$goods_m = M('Goods');
$log_m = M('OrderGoodsInventoryLog');
foreach($goods_all as $goods_id)
{
$give_integral = $goods_m->where(['id'=>$goods_id])->getField('give_integral');
if(!empty($give_integral))
{
// 用户积分添加
$user_integral = $user_m->where(['id'=>$user['id']])->getField('integral');
if(!$user_m->where(['id'=>$user['id']])->setInc('integral', $give_integral))
{
return DataReturn('用户积分赠送失败['.$params['order_id'].'-'.$goods_id.']', -10);
}
// 积分日志
UserService::UserIntegralLogAdd($user['id'], $user_integral, $user_integral+$give_integral, '订单商品完成赠送', 1);
}
}
return DataReturn('操作成功', 0);
}
return DataReturn('没有需要操作的数据', 0);
}
/**
* 订单商品销量添加
* @author Devil

36
service/Application/Service/UserService.class.php
View File

@ -483,41 +483,5 @@ class UserService
return DataReturn('上传失败', -100);
}
/**
* [UserIntegralLogAdd 用户积分日志添加]
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @datetime 2018-05-18T16:51:12+0800
* @param [int] $user_id [用户id]
* @param [int] $original_integral [原始积分]
* @param [int] $new_integral [最新积分]
* @param [string] $msg [操作原因]
* @param [int] $type [操作类型（0减少, 1增加）]
* @param [int] $operation_id [操作人员id]
* @return [boolean] [成功true, 失败false]
*/
public static function UserIntegralLogAdd($user_id, $original_integral, $new_integral, $msg = '', $type = 0, $operation_id = 0)
{
$data = array(
'user_id' => intval($user_id),
'original_integral' => intval($original_integral),
'new_integral' => intval($new_integral),
'msg' => $msg,
'type' => intval($type),
'operation_id' => intval($operation_id),
'add_time' => time(),
);
if(M('UserIntegralLog')->add($data) > 0)
{
$type_msg = L('common_integral_log_type_list')[$type]['name'];
$integral = ($data['type'] == 0) ? $data['original_integral']-$data['new_integral'] : $data['new_integral']-$data['original_integral'];
$detail = $msg.'积分'.$type_msg.$integral;
MessageService::MessageAdd($user_id, '积分变动', $detail);
return true;
}
return false;
}
}
?>

22
service/Install/shopxo.sql
View File

File diff suppressed because one or more lines are too long

32
service/Public/Home/Default/Css/UserIntegral.css Executable file
View File

@ -0,0 +1,32 @@
/* 筛选 */
.thin, .pay-list { overflow:hidden; }
.thin .so { width:66%; }
.thin_sub { font-weight:100; margin:10px 0px 0px 10px; cursor: pointer; }
.so-list { width:100%; margin-top: 20px; }
.so-list * { font-size:1.2rem !important; }
.so-list input { height:28px; display:inline !important; }
.time input, .so-list .chosen-container { background:#FFF !important; }
.time input { width:100px !important; }
.time i { position:absolute; margin:4px 0px 0px -15px; }
.price input { width:101px !important; }
.time, .time { width:50%; }
.so-list tr+tr>td:first-child { padding-top:10px; }
.so-list .chosen-container { border-radius:2px; }
.text-grey { color: #999; }
.chosen-container-single .chosen-single, .so-list select { height: 28px; line-height: 28px; width: 100%; }
.reset-submit { margin-left: 20px; }
.so-list select { padding: 0 0 0 8px; }
@media only screen and (min-width: 641px){
.so-list .chosen-container, .so-list select { width:217px !important; display: -webkit-inline-box; }
.thin_sub:hover { color:#F60; }
}
@media only screen and (max-width: 641px){
.so-list input { width:40% !important; }
.so-list td { width:100%; display:block; }
.so-list tr td:last-child { margin-top:10px; }
.so-list .chosen-container { width:85%; }
.so-list .chosen-container { width:100%; }
.so-list tr td:last-child { padding-top:0px !important; }
.chosen-container-single .chosen-search input[type="text"] { width: 100% !important; }
.so-list select { width: calc(100% - 44px); display: -webkit-inline-box; }
}