Merge branch 'master' of http://git.scdxtc.com/wangxinglong/coupon-admin
commit
8a3deee5f0
|
@ -17,7 +17,7 @@ use think\facade\Log;
|
||||||
class Coupon extends Base
|
class Coupon extends Base
|
||||||
{
|
{
|
||||||
protected $noNeedLogin = [
|
protected $noNeedLogin = [
|
||||||
'getMyCouponList'
|
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -40,7 +40,6 @@ class Coupon extends Base
|
||||||
$whereMap = [];
|
$whereMap = [];
|
||||||
$sortOrder = ['received_time' => 'desc'];
|
$sortOrder = ['received_time' => 'desc'];
|
||||||
$fields = ['*', '(end_time > NOW()) as sort_weight'];
|
$fields = ['*', '(end_time > NOW()) as sort_weight'];
|
||||||
// TODO `status`字段需要核实是否用于筛选条件
|
|
||||||
|
|
||||||
$whereMap[] = ['consumer_code', '=', $accountCode];
|
$whereMap[] = ['consumer_code', '=', $accountCode];
|
||||||
switch ($type) {
|
switch ($type) {
|
||||||
|
|
Loading…
Reference in New Issue