|
@@ -95,7 +95,7 @@ class RechargeService extends BaseService
|
|
|
/**
|
|
/**
|
|
|
* @description: 分页查询
|
|
* @description: 分页查询
|
|
|
* @param array $search
|
|
* @param array $search
|
|
|
- * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
|
|
|
|
|
|
|
+ * @return array
|
|
|
*/
|
|
*/
|
|
|
public static function paginate(array $search = [])
|
|
public static function paginate(array $search = [])
|
|
|
{
|
|
{
|
|
@@ -103,7 +103,24 @@ class RechargeService extends BaseService
|
|
|
$paginator = self::model()::where(self::getWhere($search))
|
|
$paginator = self::model()::where(self::getWhere($search))
|
|
|
->orderBy("created_at", 'desc')
|
|
->orderBy("created_at", 'desc')
|
|
|
->paginate($limit);
|
|
->paginate($limit);
|
|
|
- return ['total' => $paginator->total(), 'data' => $paginator->items()];
|
|
|
|
|
|
|
+ $list = $paginator->items();
|
|
|
|
|
+ $totalAmount = 0;
|
|
|
|
|
+ $totalSuccess = 0;
|
|
|
|
|
+ $totalFail = 0;
|
|
|
|
|
+ foreach ($list as $item) {
|
|
|
|
|
+ $item['amount'] = floatval($item['amount']);
|
|
|
|
|
+ $totalAmount += $item['amount'];
|
|
|
|
|
+ if ($item['status'] == 1) $totalSuccess += $item['amount'];
|
|
|
|
|
+ if ($item['status'] == 2) $totalFail += $item['amount'];
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ return [
|
|
|
|
|
+ 'total' => $paginator->total(),
|
|
|
|
|
+ 'total_amount' => $totalAmount,
|
|
|
|
|
+ 'total_success' => $totalSuccess,
|
|
|
|
|
+ 'total_fail' => $totalFail,
|
|
|
|
|
+ 'data' => $list];
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@@ -116,7 +133,7 @@ class RechargeService extends BaseService
|
|
|
{
|
|
{
|
|
|
$walletInfo = WalletService::findOne(['member_id' => $memberId]);
|
|
$walletInfo = WalletService::findOne(['member_id' => $memberId]);
|
|
|
$data = TronHelper::getTrc20UsdtRecharges($walletInfo->address);
|
|
$data = TronHelper::getTrc20UsdtRecharges($walletInfo->address);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
foreach ($data as $k => $v) {
|
|
foreach ($data as $k => $v) {
|
|
|
$v['member_id'] = $memberId;
|
|
$v['member_id'] = $memberId;
|
|
|
$v['net'] = $walletInfo->net;
|
|
$v['net'] = $walletInfo->net;
|
|
@@ -178,7 +195,7 @@ class RechargeService extends BaseService
|
|
|
*/
|
|
*/
|
|
|
public static function syncRechargeStay()
|
|
public static function syncRechargeStay()
|
|
|
{
|
|
{
|
|
|
- $list = self::findAll(['status' => self::model()::STATUS_STAY ,'type' => self::model()::TYPE_AUTO]);
|
|
|
|
|
|
|
+ $list = self::findAll(['status' => self::model()::STATUS_STAY, 'type' => self::model()::TYPE_AUTO]);
|
|
|
foreach ($list as $k => $v) {
|
|
foreach ($list as $k => $v) {
|
|
|
self::handleRechargeConfirmation($v->txid);
|
|
self::handleRechargeConfirmation($v->txid);
|
|
|
}
|
|
}
|