会员升级

app/services/user/UserBillServices.php

@@ -247,7 +247,7 @@ class UserBillServices extends BaseServices
             'title' => '消费分转出',
             'category' => 'integral',
             'type' => 'trade_out',
-            'mark' => '{%mark%}{%number%}，转账手续费{%fee%}',
+            'mark' => '{%mark%}{%origin%}，转账手续费{%fee%}，合计{%number%}',
             'status' => 1,
             'pm' => 0
         ],
@@ -718,7 +718,7 @@ class UserBillServices extends BaseServices
             if (!$userService->update($user['uid'], ['integral' => $balance], 'uid')) {
                 throw new ValidateException('修改用户信息失败');
             }
-            $this->income('trade_out_shop_integral', $user['uid'], ['mark' => '转账给' . $to_user['nickname'] . '(' . $to_user['uid'] . ')', 'number' => $num, 'fee' => $fee], $balance, $to_user['uid']);
+            $this->income('trade_out_shop_integral', $user['uid'], ['mark' => '转账给' . $to_user['nickname'] . '(' . $to_user['uid'] . ')', 'origin' => $num, 'fee' => $fee, 'number' => $num + $fee], $balance, $to_user['uid']);
             if (!$user['is_shop']) {
                 if (!$userService->update($to_user['uid'], ['integral' => $balance2], 'uid')) {
                     throw new ValidateException('修改用户信息失败');