Merge branch 'master' of http://git.qiniu1314.com/Kirin/shenying

app/services/user/UserExchangeServices.php

@@ -327,6 +327,9 @@ class UserExchangeServices extends BaseServices
         /** @var UserServices $userService */
         $userService = app()->make(UserServices::class);
         $user = $userService->getUserInfo($uid);
+        if (date('w') != 1) {
+            throw new ValidateException('兑换只能在周一申请');
+        }
         if (!$user) {
             throw new ValidateException('数据不存在');
         }
@@ -434,15 +437,16 @@ class UserExchangeServices extends BaseServices
             $edit_data['energy'] = bcadd((string)$user['energy'], (string)$price, 2);
             $edit_data['brokerage_price'] = $user['brokerage_price'] > $price ? bcsub((string)$user['brokerage_price'], (string)$price, 2) : 0;
             //修改用户佣金、余额信息
-            $userServices->update($uid, $edit_data, 'uid');
+            $res1 = $userServices->update($uid, $edit_data, 'uid');
             /** @var UserBillServices $userMoneyServices */
             $userMoneyServices = app()->make(UserBillServices::class);
             //余额记录
-            $userMoneyServices->income('brokerage_to_energy', $uid, $price, $edit_data['energy'], 0);
+            $res2 = $userMoneyServices->income('brokerage_to_energy', $uid, $price, $edit_data['energy'], 0);
             //佣金提现记录
             /** @var UserBrokerageServices $userBrokerageServices */
             $userBrokerageServices = app()->make(UserBrokerageServices::class);
-            $userBrokerageServices->income('brokerage_to_energy', $uid, $price, $edit_data['brokerage_price'], 0);
+            $res3 = $userBrokerageServices->income('brokerage_to_energy', $uid, $price, $edit_data['brokerage_price'], 0);
+            return $res1 && $res2 && $res3;
         });
     }
 }