WIN-2308041133\Administrator пре 4 дана
родитељ
комит
0fd8f4bc4b

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

@@ -1280,7 +1280,7 @@ class StoreOrderRepository extends BaseRepository
 //            @file_put_contents('quanju2.txt', "-路径检查4\r\n", 8);
         }
 //        购买商品给自己15%的奖金
-        $award_brokerage = systemConfig('award_brokerage', 0);
+        $award_brokerage = systemConfig('award_brokerage', 15);
         $award_brokerage = bcdiv($award_brokerage,100,2);
         if ($award_brokerage>0){
             $brokerage_price = User::where('uid', $user['uid'])->value('brokerage_price');
@@ -1290,11 +1290,11 @@ class StoreOrderRepository extends BaseRepository
                 $after = bcadd($brokerage_price, $order_award_brokerage, 2);
                 $make->incBill($user['uid'], 'brokerage', 'order_brokerage', [
                     'number' => $order_award_brokerage,
-                    'title' => '下单普通商品获得奖金',
+                    'title' => '下单商品获得奖金',
                     'balance' => $after,
                     'status' => 1,
                     'link_id' => $order['order_id'],
-                    'mark' => $user['nickname'] . '成功消费普通商品' . floatval($order['pay_price']) . '元,奖励分红奖金' . $order_award_brokerage,
+                    'mark' => $user['nickname'] . '成功消费商品' . floatval($order['pay_price']) . '元,奖励分红奖金' . $order_award_brokerage,
                 ]);
                 User::where('uid', $user['uid'])->update(['brokerage_price' => $after]);
             }

+ 3 - 0
app/controller/admin/system/config/ConfigOthers.php

@@ -74,6 +74,7 @@ class ConfigOthers extends BaseController
             'award_integral_gift_pack',
             'energy_saving_oil_ratio',
             'gift_pack_ratio',
+            'award_brokerage',
 
 
         ]);
@@ -104,6 +105,8 @@ class ConfigOthers extends BaseController
             return app('json')->fail('节能油商品业绩分红比例不能小于0');
         if ($data['gift_pack_ratio'] < 0)
             return app('json')->fail('礼包商品业绩分红比例不能小于0');
+        if ($data['award_brokerage'] < 0)
+            return app('json')->fail('购买商品赠送奖金百分比不能小于0');
 
 
         $old = systemConfig(['extension_limit', 'extension_limit_day']);