commit

app/api/controller/many/ManyController.php

@@ -81,6 +81,7 @@ class ManyController
         $user = User::where('uid', $request->uid())->find();
         if (!$many) return app('json')->fail('场次不存在');
         if ($many['number'] >= $many['money']) return app('json')->fail('已完成无法种树');
+        if ($many['price'] < 1) return app('json')->fail('最少投注1');
         if ($many['status'] == 0) return app('json')->fail('未开启');
         if ($many['end_time'] < time()) return app('json')->fail('已结束');
         if (($many['number']+$data['price']) > $many['money']) return app('json')->fail('还能最大种树'.($many['money']-$many['number']));

app/api/controller/user/UserController.php

@@ -69,6 +69,7 @@ class UserController
         }elseif (UserEnter::where('uid', $info['uid'])->where('status', 1)->find()){
             $info['is_enter'] = 2;
         }
+        $info['purple_integral'] = $info['integral'];
         return app('json')->success($info);
     }
 

app/models/many/Many.php

@@ -117,18 +117,18 @@ class Many extends BaseModel
      */
     public static function second()
     {
-        $many = self::where('second', '>', 0)->where('increase', '>', 0)->where('status', 1)->select();
+        $many = self::where('second', '>', 0)->where('increase', '>', 0)->where('status', 1)->lock(true)->select();
         if ($many){
             foreach ($many as &$item) {
                 if ($item['add_time'] < time()){
                     if ($item['increase_time']+$item['second'] < time()){
                         $number = $item['number'];
                         $item['number'] += $item['increase'];
-                        if ($item['number'] > $item['money']){
-                            $item['number'] = $number;
-                            $item['number'] += $item['money'] - $item['number'];
+                        if ($item['number'] >= $item['money']){
+                            $item['number'] = $item['money'];
                             self::where('id', $item['id'])->update(['number' => $item['number'], 'increase_time' => time(), 'suc' => 1, 'status' => 0]);
                             ManyOrder::order_return($item);
+                            ManyDiscipline::create(['many_id' => $item['id'], 'stage' => $item['stage'], 'status' => 1]);// 成功记录
                             if ($item['stage'] >= 4){
                                 // 期数如果大于等于4
                                 $stage = $item['stage'] - 3;

app/models/many/ManyOrder.php

@@ -255,7 +255,7 @@ class ManyOrder extends BaseModel
      */
     public static function order_return($many)
     {
-        $order = self::where([['many_id', '=', $many['id']], ['stage', '=', $many['stage']]])->select();
+        $order = self::where([['many_id', '=', $many['id']], ['stage', '=', $many['stage']], ['frozen', '<=', 0]])->select();
         if ($order)
         {
             foreach ($order as &$item)

app/models/store/StoreOrder.php

@@ -850,6 +850,7 @@ class StoreOrder extends BaseModel
         UserBill::expend('购买商品', $order['uid'], 'now_money', 'pay_money', $order['pay_price'], $order['id'], $now_money, '支付' . floatval($order['pay_price']) . '元购买商品');
         //支付成功后
         event('OrderPaySuccess', [$order, $formId]);
+        StoreOrder::gainUserIntegral($order);
         $res3 = StoreOrder::gainWhiteIntegral($order);
         $res4 = StoreOrder::gainBusinessIntegral($order);
         User::where('uid', $order['uid'])->update(['effective' => 1]);

crmeb/repositories/OrderRepository.php

@@ -106,7 +106,7 @@ class OrderRepository
      */
     public static function storeProductOrderUserTakeDelivery($order, $uid)
     {
-        $res1 = StoreOrder::gainUserIntegral($order);
+//        $res1 = StoreOrder::gainUserIntegral($order);
 //        $res3 = StoreOrder::gainWhiteIntegral($order);
 //        $res4 = StoreOrder::gainBusinessIntegral($order);
 //        $res2 = User::backOrderBrokerage($order);
@@ -114,7 +114,7 @@ class OrderRepository
         StoreOrder::orderTakeAfter($order);
         //满赠优惠券
         WechatUser::userTakeOrderGiveCoupon($uid, $order['total_price']);
-        if (!($res1 && $res2)) exception('收货失败!');
+        if (!($res2)) exception('收货失败!');
     }
 
     /**