|
@@ -239,7 +239,7 @@ class UserBillServices extends BaseServices
|
|
|
'title' => '消费分转入',
|
|
'title' => '消费分转入',
|
|
|
'category' => 'integral',
|
|
'category' => 'integral',
|
|
|
'type' => 'trade_in',
|
|
'type' => 'trade_in',
|
|
|
- 'mark' => '{%mark%}{%number%},扣除手续费后实际到账{%real_get%}',
|
|
|
|
|
|
|
+ 'mark' => '{%mark%}{%origin%},扣除手续费后实际到账{%number%}',
|
|
|
'status' => 1,
|
|
'status' => 1,
|
|
|
'pm' => 1
|
|
'pm' => 1
|
|
|
],
|
|
],
|
|
@@ -723,13 +723,13 @@ class UserBillServices extends BaseServices
|
|
|
if (!$userService->update($to_user['uid'], ['integral' => $balance2], 'uid')) {
|
|
if (!$userService->update($to_user['uid'], ['integral' => $balance2], 'uid')) {
|
|
|
throw new ValidateException('修改用户信息失败');
|
|
throw new ValidateException('修改用户信息失败');
|
|
|
}
|
|
}
|
|
|
- $this->income('trade_in_shop_integral', $to_user['uid'], ['mark' => '转账自' . $user['nickname'] . '(' . $user['uid'] . ')', 'number' => $num, 'real_get' => $real_get], $balance2, $user['uid']);
|
|
|
|
|
|
|
+ $this->income('trade_in_shop_integral', $to_user['uid'], ['mark' => '转账自' . $user['nickname'] . '(' . $user['uid'] . ')', 'origin' => $num, 'number' => $real_get], $balance2, $user['uid']);
|
|
|
} else {
|
|
} else {
|
|
|
$server = app()->make(UserMoneyServices::class);
|
|
$server = app()->make(UserMoneyServices::class);
|
|
|
if (!$userService->update($to_user['uid'], ['now_money' => $balance2], 'uid')) {
|
|
if (!$userService->update($to_user['uid'], ['now_money' => $balance2], 'uid')) {
|
|
|
throw new ValidateException('修改用户信息失败');
|
|
throw new ValidateException('修改用户信息失败');
|
|
|
}
|
|
}
|
|
|
- $server->income('trade_in_shop_integral', $to_user['uid'], ['mark' => '转账自' . $user['nickname'] . '(' . $user['uid'] . ')', 'number' => $num, 'real_get' => $real_get], $balance2, $user['uid']);
|
|
|
|
|
|
|
+ $server->income('trade_in_shop_integral', $to_user['uid'], ['mark' => '转账自' . $user['nickname'] . '(' . $user['uid'] . ')', 'origin' => $num, 'number' => $real_get], $balance2, $user['uid']);
|
|
|
}
|
|
}
|
|
|
//保存佣金记录
|
|
//保存佣金记录
|
|
|
return true;
|
|
return true;
|