|
@@ -146,22 +146,30 @@ class UserBillServices extends BaseServices
|
|
|
'status' => 1,
|
|
|
'pm' => 1
|
|
|
],
|
|
|
- 'system_add_integral' => [
|
|
|
- 'title' => '系统增加积分',
|
|
|
- 'category' => 'integral',
|
|
|
- 'type' => 'system_add',
|
|
|
- 'mark' => '系统增加了{%num%}积分',
|
|
|
- 'status' => 1,
|
|
|
- 'pm' => 1
|
|
|
- ],
|
|
|
- 'system_sub_integral' => [
|
|
|
- 'title' => '系统减少积分',
|
|
|
- 'category' => 'integral',
|
|
|
- 'type' => 'system_sub',
|
|
|
- 'mark' => '系统扣除了{%num%}积分',
|
|
|
- 'status' => 1,
|
|
|
- 'pm' => 0
|
|
|
- ],
|
|
|
+ 'system_add_integral' => [
|
|
|
+ 'title' => '系统增加积分',
|
|
|
+ 'category' => 'integral',
|
|
|
+ 'type' => 'system_add',
|
|
|
+ 'mark' => '系统增加了{%num%}积分',
|
|
|
+ 'status' => 1,
|
|
|
+ 'pm' => 1
|
|
|
+ ],
|
|
|
+ 'system_sub_integral' => [
|
|
|
+ 'title' => '系统减少积分',
|
|
|
+ 'category' => 'integral',
|
|
|
+ 'type' => 'system_sub',
|
|
|
+ 'mark' => '系统扣除了{%num%}积分',
|
|
|
+ 'status' => 1,
|
|
|
+ 'pm' => 0
|
|
|
+ ],
|
|
|
+ 'extract_integral' => [
|
|
|
+ 'title' => '积分出局',
|
|
|
+ 'category' => 'energy',
|
|
|
+ 'type' => 'extract_integral',
|
|
|
+ 'mark' => '用户{%type%}出局,出局时积分价格{%price%},共出局{%integral_num%}积分,获得{%number%}能量',
|
|
|
+ 'status' => 1,
|
|
|
+ 'pm' => 1
|
|
|
+ ],
|
|
|
];
|
|
|
|
|
|
/**
|
|
@@ -195,7 +203,7 @@ class UserBillServices extends BaseServices
|
|
|
$where['time'] = $time;
|
|
|
}
|
|
|
|
|
|
- $where['pm'] = $pm ? 1 : 0;
|
|
|
+ $where['pm'] = $pm ? 1 : 0;
|
|
|
|
|
|
return $this->dao->getBillSumColumn($where);
|
|
|
}
|
|
@@ -216,7 +224,7 @@ class UserBillServices extends BaseServices
|
|
|
$list = $this->dao->getList($where, $field, $page, $limit);
|
|
|
foreach ($list as &$item) {
|
|
|
$item['number'] = intval($item['number']);
|
|
|
- $item['balance'] = intval($item['balance']);
|
|
|
+ $item['balance'] = intval($item['balance']);
|
|
|
}
|
|
|
$count = $this->dao->count($where);
|
|
|
return compact('list', 'count');
|
|
@@ -273,15 +281,15 @@ class UserBillServices extends BaseServices
|
|
|
return compact('list', 'count');
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 记录积分变化
|
|
|
- * @param int $uid
|
|
|
- * @param string $type
|
|
|
- * @param array $data
|
|
|
- * @param int $pm
|
|
|
- * @return bool
|
|
|
- * @throws Exception
|
|
|
- */
|
|
|
+ /**
|
|
|
+ * 记录积分变化
|
|
|
+ * @param int $uid
|
|
|
+ * @param string $type
|
|
|
+ * @param array $data
|
|
|
+ * @param int $pm
|
|
|
+ * @return bool
|
|
|
+ * @throws Exception
|
|
|
+ */
|
|
|
public function incomeIntegral(int $uid, string $type, array $data, int $pm = 1)
|
|
|
{
|
|
|
$data['uid'] = $uid;
|
|
@@ -327,9 +335,9 @@ class UserBillServices extends BaseServices
|
|
|
$data['mark'] = str_replace(['{%num%}'], $number, $data['mark']);
|
|
|
}
|
|
|
$data['add_time'] = time();
|
|
|
- if ((float)$data['number']) {
|
|
|
- return $this->dao->save($data);
|
|
|
- }
|
|
|
+ if ((float)$data['number']) {
|
|
|
+ return $this->dao->save($data);
|
|
|
+ }
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -487,12 +495,12 @@ class UserBillServices extends BaseServices
|
|
|
if (isset($where['nickname']) && $where['nickname'] != '') {
|
|
|
$where_data['like'] = $where['nickname'];
|
|
|
}
|
|
|
- $data['SumIntegral'] = intval($this->dao->getBillSumColumn($where_data + ['pm' => 1]));
|
|
|
- $where_data['type'] = 'sign';
|
|
|
- $data['CountSign'] = $this->dao->getUserSignPoint($where_data);
|
|
|
- $data['SumSign'] = intval($this->dao->getBillSumColumn($where_data));
|
|
|
- unset($where_data['type']);
|
|
|
- $data['SumDeductionIntegral'] = intval($this->dao->getBillSumColumn($where_data + ['pm' => 0]));
|
|
|
+ $data['SumIntegral'] = intval($this->dao->getBillSumColumn($where_data + ['pm' => 1]));
|
|
|
+ $where_data['type'] = 'sign';
|
|
|
+ $data['CountSign'] = $this->dao->getUserSignPoint($where_data);
|
|
|
+ $data['SumSign'] = intval($this->dao->getBillSumColumn($where_data));
|
|
|
+ unset($where_data['type']);
|
|
|
+ $data['SumDeductionIntegral'] = intval($this->dao->getBillSumColumn($where_data + ['pm' => 0]));
|
|
|
return [
|
|
|
[
|
|
|
'col' => 6,
|