diff --git a/admin/views/app/liche/member/lists.php b/admin/views/app/liche/member/lists.php index 1762a75e..ccaaf895 100755 --- a/admin/views/app/liche/member/lists.php +++ b/admin/views/app/liche/member/lists.php @@ -24,14 +24,15 @@ - - - + + + - + + @@ -48,10 +49,11 @@ + -
ID用户名称手机号码ID用户名称手机号码 剩余积分 冻结积分 是否分销 分销管理创建时间积分过期时间创建时间
onchange="set_publish(this,,'manage')"/>
+ 兑换商品 diff --git a/admin/views/receiver/orderv2/get/loaninfo.php b/admin/views/receiver/orderv2/get/loaninfo.php index b41e8e86..9d20cd55 100644 --- a/admin/views/receiver/orderv2/get/loaninfo.php +++ b/admin/views/receiver/orderv2/get/loaninfo.php @@ -59,13 +59,18 @@ @@ -93,13 +98,18 @@ diff --git a/api/controllers/wxapp/liche/User.php b/api/controllers/wxapp/liche/User.php index f27631ae..2f3cd9fc 100644 --- a/api/controllers/wxapp/liche/User.php +++ b/api/controllers/wxapp/liche/User.php @@ -101,7 +101,8 @@ class User extends Wxapp{ 'isdealer' => $this->session['dealer'], 'istop' => $istop, 'credits' => $user['credits']+$user['freeze_credits'], - 'freeze_credits' => $user['freeze_credits'] + 'freeze_credits' => $user['freeze_credits'], + 'expire_time' => $user['expire_time'] ? date('Y-m-d H:i',$user['expire_time']) : '' ); return $data; diff --git a/common/libraries/entity/Credits_entity.php b/common/libraries/entity/Credits_entity.php index 068928b8..3c805310 100644 --- a/common/libraries/entity/Credits_entity.php +++ b/common/libraries/entity/Credits_entity.php @@ -38,12 +38,13 @@ class Credits_entity{ 'id' => $uid ]; $credit_left = $row['credits']+$row['freeze_credits']; - if($credit>0){ + if($credit>0){ //增加积分 $up_credit = [ "credits = credits+{$credit}" => null ]; $credit_left += $credit; - }else{ + $up_credit['expire_time'] = time()+365*24*60*60; + }else{ //扣除积分 $credit_out = abs($credit); $up_credit = [ "credits = credits-{$credit_out}" => null diff --git a/sql/app/liche.sql b/sql/app/liche.sql index c10624d3..602da56f 100644 --- a/sql/app/liche.sql +++ b/sql/app/liche.sql @@ -23,7 +23,8 @@ alter table lc_app_liche_users add up_uid int(10) not null default '0' alter table lc_app_liche_users add manage tinyint(1) not null default 0 comment '是否分销管理' after dealer; alter table lc_app_liche_users add deal_uid int(10) not null default 0 comment '审核分销uid' after dealer; alter table lc_app_liche_users add credits int(10) unsigned not null default '0' COMMENT '当前可用积分' after nickname; -alter table lc_app_liche_users add freeze_credits int(10) unsigned not null default '0' COMMENT '冻结积分' after credits; +alter table lc_app_liche_users add freeze_credits int(10) unsigned not null default '0' COMMENT '冻结积分' after credits; +alter table lc_app_liche_users add expire_time int(10) unsigned not null default '0' COMMENT '积分过期时间' after freeze_credits -- ---------------------------- -- Title:狸车小程序cms