commit

app/models/many/Many.php

@@ -113,7 +113,7 @@ class Many extends BaseModel
         if ($many){
             foreach ($many as &$item) {
                 if ($item['add_time'] < time()){
-                    if ($item['increase_time']+$item['second'] < time() and $item['money'] > $item['number'] and $item['money'] <> $item['number']){
+                    if ($item['increase_time']+$item['second'] < time()){
                         $number = $item['number'];
                         $item['number'] += $item['increase'];
                         if ($item['number'] > $item['money']){

app/models/many/ManyOrder.php

@@ -230,8 +230,8 @@ class ManyOrder extends BaseModel
                 }
                 if ($jl > 0){
                     $details->save();
-                    UserBill::income('团队奖励肥料', $details['uid'], 'white_integral', 'td_white_integral', $jl * 0.7, 0,$details['white_integral'], '打怪胜利补贴'.$many['name'].'-第'.$order['stage'].'期团队v'.$details['level'].'奖励肥料');
-                    UserBill::income('团队奖励阳光', $details['uid'], 'integral', 'td_integral', $jl * 0.3, 0,$details['integral'], '打怪胜利补贴'.$many['name'].'-第'.$order['stage'].'期期团队v'.$details['level'].'奖励阳光');
+                    UserBill::income('团队奖励肥料', $details['uid'], 'white_integral', 'td_white_integral', $jl * 0.7, 0,$details['white_integral'], '种树成功补贴'.$many['name'].'-第'.$order['stage'].'期团队v'.$details['level'].'奖励肥料');
+                    UserBill::income('团队奖励阳光', $details['uid'], 'integral', 'td_integral', $jl * 0.3, 0,$details['integral'], '种树成功补贴'.$many['name'].'-第'.$order['stage'].'期期团队v'.$details['level'].'奖励阳光');
                 }
                 $jl = 0;
             }