commit

app/admin/view/store/store_product/create.php

@@ -687,7 +687,7 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">赠送种树积分</label>
+                                                <label class="layui-form-label">赠送肥料</label>
                                                 <div class="layui-input-block">
                                                     <input type="number" name="white_integral" lay-verify="title"
                                                            autocomplete="off" placeholder="请输入赠送积分" class="layui-input"

app/admin/view/user/user/index.php

@@ -330,9 +330,9 @@
             {field: 'pay_count', title: '购买次数',align:'center'},
             {field: 'extract_count_price', title: '累计提现',align:'center'},
             {field: 'integral', title: '商城积分',sort:true,event:'integral',align:'center'},
-            {field: 'white_integral', title: '白积分',sort:true,event:'white_integral',align:'center'},
-            {field: 'purple_integral', title: '紫积分',sort:true,event:'purple_integral',align:'center'},
-            {field: 'green_integral', title: '绿积分',sort:true,event:'green_integral',align:'center'},
+            {field: 'white_integral', title: '肥料',sort:true,event:'white_integral',align:'center'},
+            {field: 'purple_integral', title: '阳光积分',sort:true,event:'purple_integral',align:'center'},
+            {field: 'green_integral', title: '水滴',sort:true,event:'green_integral',align:'center'},
             {field: 'business_integral', title: '商家积分',sort:true,event:'business_integral',align:'center'},
             {field: 'paper_ticket', title: '文票',sort:true,event:'paper_ticket',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},

app/api/controller/many/ManyController.php

@@ -96,12 +96,12 @@ class ManyController
                 $user['white_integral'] = 0;
                 $user['purple_integral'] -= ($data['price'] - $white);
                 if ($white > 0){
-                    UserBill::expend('扣除种树积分', $user['uid'], 'white_integral', 'bet_white_integral', $white, 0,0,'使用种树积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
+                    UserBill::expend('扣除肥料', $user['uid'], 'white_integral', 'bet_white_integral', $white, 0,0,'使用肥料,参与种树-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
                 }
-                UserBill::expend('扣除分红积分', $user['uid'], 'purple_integral', 'bet_purple_integral', $data['price']-$white, 0,$user['purple_integral'],'使用分红积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
+                UserBill::expend('扣除阳光积分', $user['uid'], 'purple_integral', 'bet_purple_integral', $data['price']-$white, 0,$user['purple_integral'],'使用阳光积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
             }else{
                 $user['white_integral'] -= $data['price'];
-                UserBill::expend('扣除种树积分', $user['uid'], 'white_integral', 'bet_white_integral', $data['price'], 0,$user['white_integral'],'使用种树积分,参与打怪-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
+                UserBill::expend('扣除肥料', $user['uid'], 'white_integral', 'bet_white_integral', $data['price'], 0,$user['white_integral'],'使用肥料,参与种树-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
             }
             $many['number'] += $data['price'];
             if ($many['number'] >= $many['money']){

app/models/many/Many.php

@@ -78,7 +78,7 @@ class Many extends BaseModel
                         $user = User::where('uid', $value['uid'])->find();
                         $user['purple_integral'] += $value['price'] * 1.01;// 返还
                         $user->save();
-                        UserBill::income('众筹失败返还分红积分', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 1.01, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期紫积分');
+                        UserBill::income('众筹失败返还阳光积分', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 1.01, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期阳光积分');
                     }
                     if ($order) {
                         foreach ($order as $value) {
@@ -88,8 +88,8 @@ class Many extends BaseModel
                             $user['paper_ticket'] += $value['price'] * 0.3;// 返还百分之三十的文票
                             $user['integral'] += $value['price'] * 0.3;// 返还百分之三十的商城积分
                             $user->save();
-                            UserBill::income('打怪失败返还分红积分', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 0.7, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期分红积分');
-                            UserBill::income('打怪失败返还绿积分', $value['uid'], 'green', 'sbfh_green', $value['price'] * 0.3, 0, $user['green_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期绿积分');
+                            UserBill::income('打怪失败返还阳光积分', $value['uid'], 'purple_integral', 'sbfh_purple_integral', $value['price'] * 0.7, 0, $user['purple_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期阳光积分');
+                            UserBill::income('打怪失败返还水滴', $value['uid'], 'green', 'sbfh_green', $value['price'] * 0.3, 0, $user['green_integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期水滴');
                             UserBill::income('打怪失败返还文票', $value['uid'], 'paper_ticket', 'sbfh_paper_ticket', $value['price'] * 0.3, 0, $user['paper_ticket'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期文票');
                             UserBill::income('打怪失败返还商城积分', $value['uid'], 'integral', 'sbfh_integral', $value['price'] * 0.3, 0, $user['integral'], '打怪失败返还' . $item['name'] . '-第' . $value['stage'] . '期商城积分');
                         }

app/models/many/ManyOrder.php

@@ -100,15 +100,15 @@ class ManyOrder extends BaseModel
                     }
                     self::where('id', $item['id'])->update(['status' => 1, 'return_time' => time()]);
                     $user->save();
-                    UserBill::income('种树成功补贴分红积分', $user['uid'], 'purple_integral', 'zccg_purple_integral', $purple_integral, $user['spread_uid'], $user['purple_integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期紫积分');
+                    UserBill::income('种树成功补贴阳光积分', $user['uid'], 'purple_integral', 'zccg_purple_integral', $purple_integral, $user['spread_uid'], $user['purple_integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期阳光积分');
                     UserBill::income('种树成功补贴商城积分', $user['uid'], 'integral', 'zccg_integral', $business_integral, $user['spread_uid'], $user['integral'], '种树成功补贴'.$many['name'].'-第'.$item['stage'].'期商家积分');
                     if ($user1){
-                        UserBill::income('直推奖励分红积分', $user1['uid'], 'purple_integral', 'zccg_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励紫积分');
+                        UserBill::income('直推奖励阳光积分', $user1['uid'], 'purple_integral', 'zccg_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励阳光积分');
                         UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zccg_integral', $sy1*0.3, $user1['spread_uid'], $user1['integral'], '直推奖励商家积分');
                         $user1->save();
                     }
                     if ($user2){
-                        UserBill::income('间推奖励分红积分', $user1['uid'], 'purple_integral', 'purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励紫积分');
+                        UserBill::income('间推奖励阳光积分', $user1['uid'], 'purple_integral', 'purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
                         UserBill::income('间推奖励商城积分', $user1['uid'], 'integral', 'zccg_integral', $sy2*0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
                         $user2->save();
                     }
@@ -228,7 +228,7 @@ class ManyOrder extends BaseModel
                         }
                         if ($jl > 0){
                             $details->save();
-                            UserBill::income('团队奖励分红积分', $details['uid'], 'purple_integral', 'team', $jl * 0.7, 0,$details['purple_integral'], 'v'.$details['level'].'团队奖励分红积分');
+                            UserBill::income('团队奖励阳光积分', $details['uid'], 'purple_integral', 'team', $jl * 0.7, 0,$details['purple_integral'], 'v'.$details['level'].'团队奖励阳光积分');
                             UserBill::income('团队奖励商城积分', $details['uid'], 'business_integral', 'team', $jl * 0.3, 0,$details['integral'], 'v'.$details['level'].'团队奖励商城积分');
                         }
                         $jl = 0;
@@ -258,7 +258,7 @@ class ManyOrder extends BaseModel
                         $details['purple_integral'] += ($price * ($details['flowing_water'] / 100)) * 0.7; // 百分之70的紫积分
                         $details['integral'] += ($price * ($details['flowing_water'] / 100)) * 0.3; // 百分之30的商家积分
                         $details->save();
-                        UserBill::income('分红流水奖励分红积分', $details['uid'], 'purple_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励紫积分');
+                        UserBill::income('分红流水奖励阳光积分', $details['uid'], 'purple_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励阳光积分');
                         UserBill::income('分红流水奖励商城积分', $details['uid'], 'business_integral', 'team', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['business_integral'], '分红流水奖励商城积分');
                     }
                 }

app/models/store/StoreOrder.php

@@ -1308,7 +1308,7 @@ class StoreOrder extends BaseModel
             $userInfo = User::getUserInfo($order['uid']);
             BaseModel::beginTrans();
             $res1 = false != User::where('uid', $userInfo['uid'])->update(['white_integral' => bcadd($userInfo['white_integral'], $order['white_integral'], 2)]);
-            $res2 = false != UserBill::income('购买商品赠送种树积分', $order['uid'], 'white_integral', 'gain_white_integral', $order['white_integral'], $order['id'], bcadd($userInfo['white_integral'], $order['white_integral'], 2), '购买商品赠送' . floatval($order['white_integral']) . '种树积分');
+            $res2 = false != UserBill::income('购买商品赠送肥料', $order['uid'], 'white_integral', 'gain_white_integral', $order['white_integral'], $order['id'], bcadd($userInfo['white_integral'], $order['white_integral'], 2), '购买商品赠送' . floatval($order['white_integral']) . '肥料');
             $res = $res1 && $res2;
             BaseModel::checkTrans($res);
             return $res;