WIN-2308041133\Administrator 5 ماه پیش
والد
کامیت
19d3b4464e

+ 4 - 4
app/common/repositories/store/order/StoreOrderRepository.php

@@ -961,7 +961,7 @@ class StoreOrderRepository extends BaseRepository
 
         // 如果订单有一级佣金且推广UID存在,则处理一级佣金的增加和记录。
         // 添加冻结佣金
-        $title = $order->activity_type == 4 ? '获得团长分佣' : '获得推广金';
+        $title = $order->activity_type == 4 ? '获得团长分佣' : '获得推广金';
         if ($order->extension_one > 0 && $spreadUid) {
             // 增加用户账单的一级佣金金额,并记录相关详细信息。
             $userBillRepository->incBill($spreadUid, 'brokerage', 'order_one', [
@@ -984,9 +984,9 @@ class StoreOrderRepository extends BaseRepository
             $userBillRepository->incBill($topUid, 'brokerage', 'order_two', [
                 'link_id' => $order['order_id'],
                 'status' => 0,
-                'title' => '获得推广金',
+                'title' => '获得推广金',
                 'number' => $order->extension_two,
-                'mark' => $user['nickname'] . '成功消费' . floatval($order['pay_price']) . '元,奖励推广金' . floatval($order->extension_two),
+                'mark' => $user['nickname'] . '成功消费' . floatval($order['pay_price']) . '元,奖励推广金' . floatval($order->extension_two),
                 'balance' => 0
             ]);
             // 增加用户的二级佣金总额。
@@ -1526,7 +1526,7 @@ class StoreOrderRepository extends BaseRepository
         if ($data['pay_price'] < 0) {
             throw new ValidateException('实际支付金额不能小于0');
         } else if ($data['pay_price'] < $extension_total) {
-            throw new ValidateException('实际支付金额不能小于金' . $extension_total);
+            throw new ValidateException('实际支付金额不能小于金' . $extension_total);
         }
         $make = app()->make(StoreGroupOrderRepository::class);
         $orderGroup = $make->dao->getWhere(['group_order_id' => $order['group_order_id']]);

+ 4 - 4
app/common/repositories/system/merchant/FinancialRecordRepository.php

@@ -162,7 +162,7 @@ class FinancialRecordRepository extends BaseRepository
                 'className' => 'el-icon-s-cooperation',
                 'count' => $brokerage,
                 'field' => '元',
-                'name' => '金支出金额'
+                'name' => '金支出金额'
             ],
             [
                 'className' => 'el-icon-s-cooperation',
@@ -259,7 +259,7 @@ class FinancialRecordRepository extends BaseRepository
                 'className' => 'el-icon-s-finance',
                 'count' => $brokerage,
                 'field' => '元',
-                'name' => '金支出'
+                'name' => '金支出'
             ],
             [
                 'className' => 'el-icon-s-cooperation',
@@ -379,7 +379,7 @@ class FinancialRecordRepository extends BaseRepository
             'data' => [
                 ['应付商户金额', $expend['number_order'] . '元', $expend['count_order'] . '笔'],
                 ['商户线下已收', $expend['number_offline'] . '元',  $expend['count_offline'] . '笔'],
-                ['金', $expend['number_brokerage'] . '元', $expend['count_brokerage'] . '笔'],
+                ['金', $expend['number_brokerage'] . '元', $expend['count_brokerage'] . '笔'],
                 ['返还手续费', $expend['number_charge'] . '元', $expend['count_charge'] . '笔'],
                 ['优惠券补贴', $expend['number_coupon'] . '元', $expend['count_coupon'] . '笔'],
                 ['会员优惠券补贴', $expend['number_svipcoupon'] . '元', $expend['count_svipcoupon'] . '笔'],
@@ -432,7 +432,7 @@ class FinancialRecordRepository extends BaseRepository
                     $expend['count_charge'] + $expend['count_order_charge'] . '笔'
                 ],
                 [
-                    '金',
+                    '金',
                     bcsub($expend['number_brokerage'], $expend['number_refund_brokerage'], 2) . '元',
                     $expend['count_brokerage'] + $expend['count_refund_brokerage'] . '笔'
                 ],

+ 4 - 4
app/common/repositories/user/UserRepository.php

@@ -1959,7 +1959,7 @@ class UserRepository extends BaseRepository
             app()->make(UserBillRepository::class)->incBill($user->uid, 'now_money', 'brokerage', [
                 'link_id' => 0,
                 'status' => 1,
-                'title' => '金转入余额',
+                'title' => '金转入余额',
                 'number' => $brokerage,
                 'mark' => '成功转入余额' . floatval($brokerage) . '元',
                 'balance' => $user->now_money
@@ -1969,7 +1969,7 @@ class UserRepository extends BaseRepository
             app()->make(UserBillRepository::class)->decBill($user->uid, 'brokerage', 'now_money', [
                 'link_id' => 0,
                 'status' => 1,
-                'title' => '金转入余额',
+                'title' => '金转入余额',
                 'number' => $brokerage,
                 'mark' => '成功转入余额' . floatval($brokerage) . '元',
                 'balance' => $user->brokerage_price
@@ -2721,7 +2721,7 @@ class UserRepository extends BaseRepository
                     'status' => 1,
                     'title' => '提取分红积分',
                     'number' => $all_price,
-                    'mark' => $info['nickname'] . '提取' . floatval($num) . '分红积分为' . floatval($all_price) . '金(分红积分价格:' . $price['price'] . ')',
+                    'mark' => $info['nickname'] . '提取' . floatval($num) . '分红积分为' . floatval($all_price) . '金(分红积分价格:' . $price['price'] . ')',
                     'balance' => bcadd($info['brokerage_price'], $all_price, 2)
                 ]);
                 $userRepository = app()->make(UserRepository::class);
@@ -2739,7 +2739,7 @@ class UserRepository extends BaseRepository
                     'status' => 1,
                     'title' => '提取分红积分',
                     'number' => $all_price,
-                    'mark' => $info['nickname'] . '提取分红积分为金,减少分红额度',
+                    'mark' => $info['nickname'] . '提取分红积分为金,减少分红额度',
                     'balance' => bcsub($info['award_range'], $all_price, 2)
                 ]);
                 $userRepository->decField($uid, 'award_range', $all_price);