1.提交缺失的东西
This commit is contained in:
@ -69,5 +69,16 @@ class RechargeController extends BaseApiController
|
|||||||
return $this->data(RechargeLogic::config($this->userId));
|
return $this->data(RechargeLogic::config($this->userId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 充值记录
|
||||||
|
*/
|
||||||
|
public function rechargeRecord()
|
||||||
|
{
|
||||||
|
$get = $this->request->get();
|
||||||
|
$get['page_no'] = $get['page_no'] ?? $this->page_no;
|
||||||
|
$get['page_size'] = $get['page_size'] ?? $this->page_size;
|
||||||
|
$get['user_id'] = $this->userId;
|
||||||
|
$result = RechargeLogic::rechargeRecord($get);
|
||||||
|
return $this->success('',$result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -19,6 +19,7 @@ use app\common\logic\BaseLogic;
|
|||||||
use app\common\model\recharge\RechargeOrder;
|
use app\common\model\recharge\RechargeOrder;
|
||||||
use app\common\model\user\User;
|
use app\common\model\user\User;
|
||||||
use app\common\service\ConfigService;
|
use app\common\service\ConfigService;
|
||||||
|
use think\facade\Db;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -79,7 +80,49 @@ class RechargeLogic extends BaseLogic
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 充值记录
|
||||||
|
*/
|
||||||
|
public static function rechargeRecord($get)
|
||||||
|
{
|
||||||
|
$list = Db::name('recharge_order')
|
||||||
|
->field('order_sn, order_amount, give_money, create_time')
|
||||||
|
->where([
|
||||||
|
'user_id' => $get['user_id'],
|
||||||
|
'pay_status' => 1
|
||||||
|
])
|
||||||
|
->order('create_time', 'desc')
|
||||||
|
->page($get['page_no'], $get['page_size'])
|
||||||
|
->select();
|
||||||
|
|
||||||
|
$count = Db::name('recharge_order')
|
||||||
|
->where([
|
||||||
|
'user_id' => $get['user_id'],
|
||||||
|
'pay_status' => 1
|
||||||
|
])
|
||||||
|
->count();
|
||||||
|
|
||||||
|
foreach($list as &$item) {
|
||||||
|
$item['create_time'] = date('Y-m-d h:i:s', $item['create_time']);
|
||||||
|
if($item['give_money'] > 0) {
|
||||||
|
$item['desc'] = '充值'. $item['order_amount'] . '赠送' . $item['give_money'];
|
||||||
|
}else{
|
||||||
|
$item['desc'] = '充值'. $item['order_amount'];
|
||||||
|
}
|
||||||
|
$item['total'] = $item['order_amount'] + $item['give_money']; // 充值金额 + 赠送金额
|
||||||
|
}
|
||||||
|
|
||||||
|
$result = [
|
||||||
|
'count' => $count,
|
||||||
|
'list' => $list,
|
||||||
|
'more' => is_more($count, $get['page_no'], $get['page_size']),
|
||||||
|
'count' => $count,
|
||||||
|
'page_no' => $get['page_no'],
|
||||||
|
'page_size' => $get['page_size']
|
||||||
|
];
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user