Kirin 3 주 전
부모
커밋
5d30a30b35
3개의 변경된 파일12개의 추가작업 그리고 12개의 파일을 삭제
  1. 4 4
      app/services/user/UserBillServices.php
  2. 4 4
      app/services/user/UserBrokerageServices.php
  3. 4 4
      app/services/user/UserMoneyServices.php

+ 4 - 4
app/services/user/UserBillServices.php

@@ -207,10 +207,10 @@ class UserBillServices extends BaseServices
                 return '{%' . $item . '%}';
             }, $key);
             $value = array_values($number);
-            $data['number'] = $number['number'] ?? 0;
+            $data['number'] = (string)($number['number'] ?? 0);
             $data['mark'] = str_replace($key, $value, $data['mark']);
         } else {
-            $data['number'] = $number;
+            $data['number'] = (string)$number;
             $data['mark'] = str_replace(['{%number%}'], $number, $data['mark']);
         }
         $data['add_time'] = time();
@@ -220,13 +220,13 @@ class UserBillServices extends BaseServices
             if ($data['status'] == 1) {
                 $user = $userService->getUserInfo($uid);
                 if ($data['pm'] == 1) {
-                    $data['balance'] = bcadd((string)$user[$data['category']], (string)$data['number'], 2);
+                    $data['balance'] = bcadd((string)$user[$data['category']], $data['number'], 2);
                     $userService->bcInc($uid, $data['category'], $data['number'], 'uid');
                 } else {
                     if ($data['number'] > $user[$data['category']]) {
                         throw new ValidateException($this->categorys[$data['category']] . '余额不足');
                     }
-                    $data['balance'] = bcsub((string)$user[$data['category']], (string)$data['number'], 2);
+                    $data['balance'] = bcsub((string)$user[$data['category']], $data['number'], 2);
                     $userService->bcDec($uid, $data['category'], $data['number'], 'uid');
                 }
             }

+ 4 - 4
app/services/user/UserBrokerageServices.php

@@ -169,11 +169,11 @@ class UserBrokerageServices extends BaseServices
                 return '{%' . $item . '%}';
             }, $key);
             $value = array_values($number);
-            $data['number'] = $number['number'] ?? 0;
+            $data['number'] =  (string)($number['number'] ?? 0);
             $data['frozen_time'] = $number['frozen_time'] ?? 0;
             $data['mark'] = $mark ?: str_replace($key, $value, $data['mark']);
         } else {
-            $data['number'] = $number;
+            $data['number'] =  (string)$number;
             $data['mark'] = $mark ?: str_replace(['{%number%}'], $number, $data['mark']);
         }
         /** @var UserServices $userService */
@@ -182,13 +182,13 @@ class UserBrokerageServices extends BaseServices
             if ($data['status'] == 1) {
                 $user = $userService->getUserInfo($uid);
                 if ($data['pm'] == 1) {
-                    $data['balance'] = bcadd((string)$user['brokerage_price'], (string)$data['number'], 2);
+                    $data['balance'] = bcadd((string)$user['brokerage_price'], $data['number'], 2);
                     $userService->bcInc($uid, 'brokerage_price', $data['number'], 'uid');
                 } else {
                     if ($data['number'] > $user['brokerage_price']) {
                         throw new ValidateException('用户佣金不足');
                     }
-                    $data['balance'] = bcsub((string)$user['brokerage_price'], (string)$data['number'], 2);
+                    $data['balance'] = bcsub((string)$user['brokerage_price'], $data['number'], 2);
                     $userService->bcDec($uid, 'brokerage_price', $data['number'], 'uid');
                 }
             }

+ 4 - 4
app/services/user/UserMoneyServices.php

@@ -189,14 +189,14 @@ class UserMoneyServices extends BaseServices
             if ($data['status'] == 1) {
                 $user = $userService->getUserInfo($uid);
                 if ($data['pm'] == 1) {
-                    $data['balance'] = bcadd((string)$user['now_money'], (string)$data['number'], 2);
-                    $userService->bcInc($uid, 'now_money', (string)$data['number'], 'uid');
+                    $data['balance'] = bcadd((string)$user['now_money'], $data['number'], 2);
+                    $userService->bcInc($uid, 'now_money', $data['number'], 'uid');
                 } else {
                     if ($data['number'] > $user['now_money']) {
                         throw new ValidateException('用户余额不足');
                     }
-                    $data['balance'] = bcsub((string)$user['now_money'], (string)$data['number'], 2);
-                    $userService->bcDec($uid, 'now_money', (string)$data['number'], 'uid');
+                    $data['balance'] = bcsub((string)$user['now_money'], $data['number'], 2);
+                    $userService->bcDec($uid, 'now_money', $data['number'], 'uid');
                 }
             }
             return $this->create($data);