hrjy 2 anos atrás
pai
commit
a742a71312

+ 9 - 9
app/admin/controller/order/StoreOrder.php

@@ -782,10 +782,10 @@ class StoreOrder extends AuthController
         if (!$product) return Json::fail('数据不存在!');
         if ($product['paid'] == 1) {
             $f[] = Form::input('order_id', '退款单号', $product->getData('order_id'))->disabled(1);
-            $f[] = Form::number('use_integral', '使用的积分', $product->getData('use_integral'))->min(0)->disabled(1);
-            $f[] = Form::number('use_integrals', '已退积分', $product->getData('back_integral'))->min(0)->disabled(1);
-            $f[] = Form::number('back_integral', '可退积分', bcsub($product->getData('use_integral'), $product->getData('use_integral')))->min(0);
-            $form = Form::make_post_form('退积分', $f, Url::buildUrl('updateIntegralBack', array('id' => $id)), 7);
+            $f[] = Form::number('use_integral', '使用的阳光', $product->getData('use_integral'))->min(0)->disabled(1);
+            $f[] = Form::number('use_integrals', '已退阳光', $product->getData('back_integral'))->min(0)->disabled(1);
+            $f[] = Form::number('back_integral', '可退阳光', bcsub($product->getData('use_integral'), $product->getData('use_integral')))->min(0);
+            $form = Form::make_post_form('退阳光', $f, Url::buildUrl('updateIntegralBack', array('id' => $id)), 7);
             $this->assign(compact('form'));
             return $this->fetch('public/form-builder');
         } else {
@@ -807,15 +807,15 @@ class StoreOrder extends AuthController
         $product = StoreOrderModel::get($id);
         if (!$product) return Json::fail('数据不存在!');
         if ($data['back_integral'] <= 0) return Json::fail('请输入积分');
-        if ($product['use_integral'] == $product['back_integral']) return Json::fail('已退完积分!不能再积分了');
+        if ($product['use_integral'] == $product['back_integral']) return Json::fail('已退完阳光!不能再退了');
         $back_integral = $data['back_integral'];
         $data['back_integral'] = bcadd($data['back_integral'], $product['back_integral'], 2);
         $bj = bccomp((float)$product['use_integral'], (float)$data['back_integral'], 2);
-        if ($bj < 0) return Json::fail('退积分大于支付积分,请修改退积分');
+        if ($bj < 0) return Json::fail('退阳光大于支付阳光,请修改退阳光');
         BaseModel::beginTrans();
         $integral = User::where('uid', $product['uid'])->value('integral');
         $res1 = User::bcInc($product['uid'], 'integral', $back_integral, 'uid');
-        $res2 = UserBill::income('商品退积分', $product['uid'], 'integral', 'pay_product_integral_back', $back_integral, $product['id'], bcadd($integral, $back_integral, 2), '订单退积分' . floatval($back_integral) . '积分到用户积分');
+        $res2 = UserBill::income('商品退阳光', $product['uid'], 'integral', 'pay_product_integral_back', $back_integral, $product['id'], bcadd($integral, $back_integral, 2), '订单退阳光' . floatval($back_integral) . '阳光到用户阳光');
         event('StoreOrderIntegralBack', [$product, $back_integral]);
         try {
             OrderRepository::storeOrderIntegralBack($product, $back_integral);
@@ -830,8 +830,8 @@ class StoreOrder extends AuthController
             $data['refund_status'] = 2;
         }
         StoreOrderModel::edit($data, $id);
-        StoreOrderStatus::setStatus($id, 'integral_back', '商品退积分:' . $data['back_integral']);
-        return Json::successful('退积分成功!');
+        StoreOrderStatus::setStatus($id, 'integral_back', '商品退阳光:' . $data['back_integral']);
+        return Json::successful('退阳光成功!');
     }
 
     public function remark()

+ 2 - 20
app/admin/model/user/UserPoint.php

@@ -101,29 +101,11 @@ class UserPoint extends BaseModel
     {
         return [
             [
-                'name' => '总积分',
+                'name' => '总阳光',
                 'field' => '个',
                 'count' => self::setWhere($where)->sum('a.number'),
                 'background_color' => 'layui-bg-blue',
-            ],
-            [
-                'name' => '客户签到次数',
-                'field' => '个',
-                'count' => self::setWhere($where)->where('a.type', 'sign')->group('a.uid')->count(),
-                'background_color' => 'layui-bg-cyan',
-            ],
-            [
-                'name' => '签到送出积分',
-                'field' => '个',
-                'count' => self::setWhere($where)->where('a.type', 'sign')->sum('a.number'),
-                'background_color' => 'layui-bg-cyan',
-            ],
-            [
-                'name' => '使用积分',
-                'field' => '个',
-                'count' => self::setWhere($where)->where('a.type', 'deduction')->sum('a.number'),
-                'background_color' => 'layui-bg-cyan',
-            ],
+            ]
         ];
     }
 }

+ 1 - 0
app/admin/view/many/many_order/index.php

@@ -172,6 +172,7 @@
             {field: 'name', title: '名称', align: 'center'},
             {field: 'stage', title: '期数',  align: 'center'},
             {field: 'price', title: '金额',  align: 'center'},
+            {field: 'frozen', title: '冻结额度',  align: 'center'},
             {field: 'status', title: '状态', templet: '#status', align: 'center'},
             {field: 'create_time', title: '创建时间', align: 'center',width: '8%'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act',width: '15%'},

+ 4 - 4
app/admin/view/order/store_order/index.php

@@ -317,8 +317,8 @@
                             {{# }else if(d.use_integral > 0 && d.use_integral >= d.back_integral){ }}
                             <li>
                                 <a href="javascript:void(0);"
-                                   onclick="$eb.createModalFrame('退积分','{:Url('integral_back')}?id={{d.id}}')">
-                                    <i class="fa fa-history"></i> 退积分
+                                   onclick="$eb.createModalFrame('退阳光','{:Url('integral_back')}?id={{d.id}}')">
+                                    <i class="fa fa-history"></i> 退阳光
                                 </a>
                             </li>
                             {{# } ;}}
@@ -358,8 +358,8 @@
                             </li>
                             <li>
                                 <a href="javascript:void(0);"
-                                   onclick="$eb.createModalFrame('退积分','{:Url('integral_back')}?id={{d.id}}',{w:400,h:300})">
-                                    <i class="fa fa-history"></i> 退积分
+                                   onclick="$eb.createModalFrame('退阳光','{:Url('integral_back')}?id={{d.id}}',{w:400,h:300})">
+                                    <i class="fa fa-history"></i> 退阳光
                                 </a>
                             </li>
                             {{# };}}

+ 2 - 2
app/admin/view/order/store_order/order_info.php

@@ -54,10 +54,10 @@
                         <div class="col-xs-6" style="color: #f1a417">退款金额: ¥{$orderInfo.refund_price}</div>
                         {/if}
                         {if condition="$orderInfo['use_integral'] > 0"}
-                        <div class="col-xs-6" style="color: #f1a417">使用积分: {$orderInfo.use_integral}积分(抵扣了¥{$orderInfo.deduction_price})</div>
+                        <div class="col-xs-6" style="color: #f1a417">使用阳光: {$orderInfo.use_integral}阳光抵扣</div>
                         {/if}
                         {if condition="$orderInfo['back_integral'] > 0"}
-                        <div class="col-xs-6" style="color: #f1a417">退回积分: ¥{$orderInfo.back_integral}</div>
+                        <div class="col-xs-6" style="color: #f1a417">退回阳光: ¥{$orderInfo.back_integral}</div>
                         {/if}
                         <div class="col-xs-6">创建时间: {$orderInfo.add_time|date="Y/m/d H:i"}</div>
                         <div class="col-xs-6">支付方式:

+ 5 - 5
app/admin/view/store/store_product/create.php

@@ -343,7 +343,7 @@
                                                         <tr>
                                                             <th>图片<i class="red">*</i></th>
                                                             <th>售价<i class="red">*</i></th>
-                                                            <th>积分<i class="red">*</i></th>
+                                                            <th>阳光<i class="red">*</i></th>
                                                             <th>成本价</th>
                                                             <th>原价<i class="red">*</i></th>
                                                             <th>库存<i class="red">*</i></th>
@@ -489,7 +489,7 @@
                                                             <tr>
                                                                 <th>图片<i class="red">*</i></th>
                                                                 <th>售价<i class="red">*</i></th>
-                                                                <th>积分<i class="red">*</i></th>
+                                                                <th>阳光<i class="red">*</i></th>
                                                                 <th>成本价</th>
                                                                 <th>原价<i class="red">*</i></th>
                                                                 <th>库存<i class="red">*</i></th>
@@ -675,7 +675,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="give_integral" lay-verify="title"
                                                            autocomplete="off" placeholder="请输入赠送积分" class="layui-input"
@@ -690,7 +690,7 @@
                                                 <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"
+                                                           autocomplete="off" placeholder="请输入赠送肥料" class="layui-input"
                                                            v-model="formData.white_integral">
                                                 </div>
                                             </div>
@@ -770,7 +770,7 @@
                                                         <tr>
                                                             <th>图片</th>
                                                             <th>售价</th>
-                                                            <th>积分</th>
+                                                            <th>阳光</th>
                                                             <th>成本价</th>
                                                             <th>原价</th>
                                                             <th>库存</th>

+ 2 - 2
app/admin/view/ump/user_point/index.php

@@ -54,7 +54,7 @@
         </div>
         <div class="layui-col-md12">
             <div class="layui-card">
-                <div class="layui-card-header">积分日志</div>
+                <div class="layui-card-header">阳光日志</div>
                 <div class="layui-card-body">
                     <table class="layui-hide" id="userList" lay-filter="userList"></table>
                 </div>
@@ -90,7 +90,7 @@
                     return [
                         {field: 'id', title: 'ID', sort: true,event:'uid',width:'8%'},
                         {field: 'title', title: '标题' },
-                        {field: 'balance', title: '积分余量',sort:true,event:'now_money'},
+                        {field: 'balance', title: '阳光余量',sort:true,event:'now_money'},
                         {field: 'number', title: '明细数字',sort:true},
                         {field: 'mark', title: '备注'},
                         {field: 'nickname', title: '用户微信昵称'},

+ 16 - 16
app/api/controller/many/ManyController.php

@@ -85,37 +85,37 @@ class ManyController
         if ($surplus < $data['price']) return app('json')->fail('超过最大可种树额度');
         Db::startTrans();
         if ($many['add_time'] > time()){
-            $green = ManyGreen::where('uid', $user['uid'])->where('status', 0)->find();
-            if (!$green) return app('json')->fail('你无法提前投注');
-            $green['status'] = 1;
+            $advance = SystemConfigService::get('advance');
+            $integral = $data['price']* ($advance/100);
+            if ($user['integral'] < $integral) return app('json')->fail('阳光不足无法提前投注');
+            $user['integral'] -= $integral;
+            UserBill::expend('扣除阳光积分', $user['uid'], 'integral', 'ad_integral', $integral, 0, $user['integral'], '提前投注扣除'.$integral.'阳光');
         }
-        $integral = $user['white_integral'];// 白积分加紫积分的总积分
-        if ($integral < $data['price']) return app('json')->fail('肥料不够');
+        if ($user['white_integral'] < $data['price']) return app('json')->fail('肥料不够');
         try {
+            $many['number'] += round($data['price'], 2);
             $user['white_integral'] -= $data['price'];
             UserBill::expend('扣除肥料', $user['uid'], 'white_integral', 'bet_white_integral', $data['price'], 0,$user['white_integral'],'使用肥料,参与种树-》'.$many['name'].'期数-》'.$many['stage'].'-成功');
-            $many['number'] += round($data['price'] * 3.33, 2);
+            $user->save();
+            ManyOrder::create([
+                'order_id' => StoreOrder::getNewOrderId(),
+                'many_id' => $many['id'],
+                'uid' => $user['uid'],
+                'stage' => $many['stage'],
+                'price' => $data['price'],
+            ]);
             if ($many['number'] >= $many['money']){
-                $many['number'] = $many['money'];
                 $many['suc'] = 1;// 众筹成功
                 $many['status'] = 0;// 众筹成功
                 ManyDiscipline::create(['many_id' => $many['id'], 'stage' => $many['stage'], 'status' => 1]);// 成功记录
+                ManyOrder::order_return($many);
                 if ($many['stage'] >= 4){
                     // 期数如果大于等于4
                     $stage = $many['stage'] - 3;
                     ManyOrder::where('many_id', $many['id'])->where('stage', $stage)->update(['is_return' => 1]);// 成功后添加返还状态
                 }
             }
-            $user->save();
-            ManyOrder::create([
-                'order_id' => StoreOrder::getNewOrderId(),
-                'many_id' => $many['id'],
-                'uid' => $user['uid'],
-                'stage' => $many['stage'],
-                'price' => $data['price'],
-            ]);
             $many->save();
-            if ($many['add_time'] > time()) $green->save();
             Db::commit();
             return app('json')->success('种树成功');
         } catch (\Exception $e) {

+ 0 - 8
app/http/middleware/AllowOriginMiddleware.php

@@ -72,14 +72,6 @@ class AllowOriginMiddleware implements MiddlewareInterface
         } catch (\Exception $e) {
             Db::rollback();
         }
-
-        try {
-            Db::startTrans();
-            ManyOrder::push(); //团队奖励
-            Db::commit();
-        } catch (\Exception $e) {
-            Db::rollback();
-        }
         try {
             Db::startTrans();
             ManyOrder::flowing_water(); //流水分红

+ 4 - 10
app/models/many/Many.php

@@ -71,8 +71,8 @@ class Many extends BaseModel
         $many = self::where('end_time', '<', time())->where('status', '=', 1)->select();//找到结束为完成的场次
         if ($many) {
             foreach ($many as $item) {
-                $stage = [$item['stage'] - 3, $item['stage']];//指定期数
-                $stages = [$item['stage'] - 2, $item['stage'] - 1];//指定期数
+                $stage = [$item['stage']];//指定期数
+                $stages = [$item['stage'] - 2, $item['stage'] - 1, $item['stage'] - 3];//指定期数
                 $many_order = ManyOrder::where('many_id', $item['id'])->where('status', '=', 0)->where('stage', 'in', $stage)->select();// 找到这期和三期前订单
                 $order = ManyOrder::where('many_id', '=', $item['id'])->where('status', '=', 0)->where('stage', 'in', $stages)->select()->toArray();// 找到这期和三期前中间两期订单
                 if ($many_order) {
@@ -85,15 +85,9 @@ class Many extends BaseModel
                     if ($order) {
                         foreach ($order as $value) {
                             $user = User::where('uid', $value['uid'])->find();
-                            $user['white_integral'] += $value['price'] * 0.7;// 返还紫积分
-                            $user['green_integral'] += $value['price'] * 0.3;// 返还绿积分
-                            $user['paper_ticket'] += $value['price'] * 0.3;// 返还百分之三十的文票
-                            $user['integral'] += $value['price'] * 0.3;// 返还百分之三十的商城积分
+                            $user['integral'] += $value['frozen'];// 返还百分之三十的阳光
                             $user->save();
-                            UserBill::income('种树失败返还肥料', $value['uid'], 'white_integral', 'sbfh_white_integral', $value['price'] * 0.7, 0, $user['white_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'] . '期商城积分');
+                            UserBill::income('种树失败返还阳光', $value['uid'], 'integral', 'sbfh_integral', $value['price'] * 0.3, 0, $user['integral'], '种树失败返还' . $item['name'] . '-第' . $value['stage'] . '期阳光');
                         }
                     }
                     ManyOrder::where('many_id', '=', $item['id'])->where('stage', 'in', [$item['stage'] - 3, $item['stage'], $item['stage'] - 2, $item['stage'] - 1])->update(['status' => 2]);

+ 38 - 9
app/models/many/ManyOrder.php

@@ -80,35 +80,37 @@ class ManyOrder extends BaseModel
                     $user1 = User::where('uid', $user['spread_uid'])->find();//用户
                     if ($user1['spread_uid'] > 0) $user2 = User::where('uid', $user1['spread_uid'])->find();//用户
                 }
-                $purple_integral = round($item['price'] * 1.07, 2);// 奖励紫积分积分
+                $purple_integral = round($item['price'] * 0.07, 2);// 奖励紫积分积分
+                $frozen = $item['frozen'];
                 $business_integral = round($item['price'] * 0.03, 2);// 奖励商家积分
-                $user['white_integral'] += $purple_integral;
+                $user['white_integral'] += ($purple_integral + $frozen);
                 $user['integral'] += $business_integral;
                 if ($user1) {
                     // 直推收益的百分之十
-                    $sy1 = $item['price'] * 0.01;
+                    $sy1 = $item['price'] * 0.015;
                     $user1['white_integral'] += round($sy1 * 0.7, 2);
                     $user1['integral'] += round($sy1 * 0.3, 2);
                 }
                 if ($user2) {
                     // 间推收益的百分之五
-                    $sy2 = $item['price'] * 0.005;
+                    $sy2 = $item['price'] * 0.01;
                     $user2['white_integral'] += round($sy2 * 0.7, 2);
                     $user2['integral'] += round($sy2 * 0.3, 2);
                 }
                 self::where('id', $item['id'])->update(['status' => 1, 'return_time' => time()]);
                 $user->save();
                 UserBill::income('种树成功补贴肥料', $user['uid'], 'white_integral', 'zccg_white_integral', $purple_integral, $user['spread_uid'], $user['white_integral'], '种树成功补贴' . $many['name'] . '-第' . $item['stage'] . '期肥料');
-                UserBill::income('种树成功补贴阳光', $user['uid'], 'purple_integral', 'zccg_purple_integral', $business_integral, $user['spread_uid'], $user['purple_integral'], '种树成功补贴' . $many['name'] . '-第' . $item['stage'] . '期阳光');
+                UserBill::income('种树成功解冻', $user['uid'], 'white_integral', 'fr_white_integral', $frozen, $user['spread_uid'], $user['white_integral'], '种树成功解冻' . $many['name'] . '-第' . $item['stage'] . '期'.$frozen.'肥料');
+                UserBill::income('种树成功补贴阳光', $user['uid'], 'integral', 'zccg_integral', $business_integral, $user['spread_uid'], $user['integral'], '种树成功补贴' . $many['name'] . '-第' . $item['stage'] . '期阳光');
                 ManyOrder::push($item['uid'], $item);
                 if ($user1) {
                     UserBill::income('直推奖励肥料', $user1['uid'], 'white_integral', 'zt_white_integral', $sy1 * 0.7, $user1['spread_uid'], $user1['white_integral'], '直推奖励肥料');
-                    UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zt_integral', $sy1 * 0.3, $user1['spread_uid'], $user1['integral'], '直推奖励商家积分');
+                    UserBill::income('直推奖励阳光', $user1['uid'], 'integral', 'zt_integral', $sy1 * 0.3, $user1['spread_uid'], $user1['integral'], '直推奖励阳光');
                     $user1->save();
                 }
                 if ($user2) {
                     UserBill::income('间推奖励肥料', $user1['uid'], 'white_integral', 'jt_white_integral', $sy2 * 0.7, $user2['spread_uid'], $user2['white_integral'], '间推奖励肥料');
-                    UserBill::income('间推奖励商城积分', $user1['uid'], 'integral', 'jt_integral', $sy2 * 0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
+                    UserBill::income('间推奖励阳光', $user1['uid'], 'integral', 'jt_integral', $sy2 * 0.3, $user2['spread_uid'], $user2['integral'], '间推奖励阳光');
                     $user2->save();
                 }
 
@@ -229,7 +231,7 @@ 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'], 'integral', 'td_integral', $jl * 0.3, 0,$details['integral'], '打怪胜利补贴'.$many['name'].'-第'.$order['stage'].'期期团队v'.$details['level'].'奖励阳光');
                 }
                 $jl = 0;
             }
@@ -257,7 +259,7 @@ class ManyOrder extends BaseModel
                         $details['integral'] += ($price * ($details['flowing_water'] / 100)) * 0.3; // 百分之30的商家积分
                         $details->save();
                         UserBill::income('分红流水奖励肥料', $details['uid'], 'white_integral', 'team_white_integral', ($price * ($details['flowing_water'] / 100)) * 0.7, 0, $details['purple_integral'], '分红流水奖励肥料');
-                        UserBill::income('分红流水奖励商城积分', $details['uid'], 'integral', 'team_integral', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['integral'], '分红流水奖励商城积分');
+                        UserBill::income('分红流水奖励阳光', $details['uid'], 'integral', 'team_integral', ($price * ($details['flowing_water'] / 100)) * 0.3, 0, $details['integral'], '分红流水奖励阳光');
                     }
                 }
             }
@@ -278,5 +280,32 @@ class ManyOrder extends BaseModel
         }
     }
 
+    /**
+     * 种树成功返还70%肥料
+     * @param $many
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public static function order_return($many)
+    {
+        $order = self::where([['many_id', '=', $many['id']], ['stage', '=', $many['stage']]])->select();
+        if ($order)
+        {
+            foreach ($order as &$item)
+            {
+                $price = round($item['price'] * 0.7, 2);// 返还金额
+                $item['frozen'] = round($item['price'] * 0.3, 2);// 冻结金额
+                $user = User::where('uid', $item['uid'])->find();
+                $user['white_integral'] += $price;
+                $user->save();
+                UserBill::income('返还肥料', $user['uid'], 'white_integral', 'fh_white_integral', $price, 0, $user['white_integral'], '种树成功返回' . $many['name'] . '-第' . $item['stage'] .'期70%肥料');
+                self::where('id', $item['id'])->update(['frozen' => $item['frozen']]);
+            }
+        }
+
+    }
+
 
 }

+ 6 - 6
app/models/store/StoreOrder.php

@@ -389,12 +389,12 @@ class StoreOrder extends BaseModel
             $SurplusIntegral = $userInfo['integral'];
             if ($payIntegral > 0) {
                 if ($userInfo['integral'] < $payIntegral) {
-                    return self::setErrorInfo('积分不足', true);
+                    return self::setErrorInfo('阳光不足', true);
                 } else {
                     $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $payIntegral, 'uid');
                 }
                 $SurplusIntegral = bcsub($userInfo['integral'], $payIntegral, 2);
-                $res2 = $res2 && false != UserBill::expend('积分商品', $uid, 'integral', 'integral_product', $payIntegral, $key, $SurplusIntegral, '购买积分商品使用' . $payIntegral . '积分');
+                $res2 = $res2 && false != UserBill::expend('兑换阳光商品', $uid, 'integral', 'integral_product', $payIntegral, $key, $SurplusIntegral, '购买阳光商品使用' . $payIntegral . '阳光');
             }
 
             //积分抵扣
@@ -412,7 +412,7 @@ class StoreOrder extends BaseModel
                     $res2 = false !== User::bcDec($userInfo['uid'], 'integral', $usedIntegral, 'uid');
                     $payPrice = 0;
                 }
-                $res2 = $res2 && false != UserBill::expend('积分抵扣', $uid, 'integral', 'deduction', $usedIntegral, $key, $SurplusIntegral, '购买商品使用' . floatval($usedIntegral) . '积分抵扣' . floatval($deductionPrice) . '元');
+                $res2 = $res2 && false != UserBill::expend('阳光抵扣', $uid, 'integral', 'deduction', $usedIntegral, $key, $SurplusIntegral, '购买商品使用' . floatval($usedIntegral) . '阳光抵扣' . floatval($deductionPrice) . '元');
             } else {
                 $deductionPrice = 0;
                 $usedIntegral = 0;
@@ -512,8 +512,8 @@ class StoreOrder extends BaseModel
         if ($order['use_integral'] <= 0) return true;
         if ((int)$order['status'] != -2 && (int)$order['refund_status'] != 2 && $order['back_integral'] >= $order['use_integral']) return true;
         $res = User::bcInc($order['uid'], 'integral', $order['use_integral']);
-        if (!$res) return self::setErrorInfo('回退积分增加失败');
-        UserBill::income('积分回退', $order['uid'], 'integral', 'deduction', $order['use_integral'], $order['unique'], User::where('uid', $order['uid'])->value('integral'), '购买商品失败,回退积分' . floatval($order['use_integral']));
+        if (!$res) return self::setErrorInfo('回退阳光增加失败');
+        UserBill::income('阳光回退', $order['uid'], 'integral', 'deduction', $order['use_integral'], $order['unique'], User::where('uid', $order['uid'])->value('integral'), '购买商品失败,回退阳光' . floatval($order['use_integral']));
         return false !== self::where('order_id', $order['order_id'])->update(['back_integral' => $order['use_integral']]);
     }
 
@@ -1285,7 +1285,7 @@ class StoreOrder extends BaseModel
             $userInfo = User::getUserInfo($order['uid']);
             BaseModel::beginTrans();
             $res1 = false != User::where('uid', $userInfo['uid'])->update(['integral' => bcadd($userInfo['integral'], $order['gain_integral'], 2)]);
-            $res2 = false != UserBill::income('购买商品赠送积分', $order['uid'], 'integral', 'gain', $order['gain_integral'], $order['id'], $userInfo['integral'], '购买商品赠送' . floatval($order['gain_integral']) . '积分');
+            $res2 = false != UserBill::income('购买商品赠送阳光', $order['uid'], 'integral', 'gain', $order['gain_integral'], $order['id'], $userInfo['integral'], '购买商品赠送' . floatval($order['gain_integral']) . '阳光');
             $res = $res1 && $res2;
             BaseModel::checkTrans($res);
             return $res;

+ 4 - 4
app/models/user/UserExtract.php

@@ -83,10 +83,10 @@ class UserExtract extends BaseModel
 
         $balance = bcsub($extractPrice,$data['money'],2);
         if($balance < 0) $balance=0;
-        if ($userInfo['purple_integral'] > 0){
+        if ($userInfo['integral'] > 0){
             $tx = SystemConfigService::get('deduction_tx');
             $sxf = ($data['money'] - (($data['money']*0.95) - 5));
-            $dk = $userInfo['purple_integral']/$tx;
+            $dk = $userInfo['integral']/$tx;
             if($dk > $sxf){
                 $ydk = ($dk - $sxf) * $tx;
                 $money = $data['money'];
@@ -133,11 +133,11 @@ class UserExtract extends BaseModel
             if ($userInfo['purple_integral'] > 0){
                 if($dk > $sxf){
                     $res2 = User::edit([$bl => $balance, 'purple_integral' => $ydk],$userInfo['uid'],'uid');
-                    UserBill::expend('提现抵扣',$userInfo['uid'],'purple_integral','extract',($sxf*$tx),$res1['id'],$ydk,'提现使用'.($sxf*$tx).'阳光抵扣'.$sxf.'手续费');
+                    UserBill::expend('提现抵扣',$userInfo['uid'],'integral','extract',($sxf*$tx),$res1['id'],$ydk,'提现使用'.($sxf*$tx).'阳光抵扣'.$sxf.'手续费');
 
                 }else{
                     $res2 = User::edit([$bl => $balance, 'purple_integral' => $ydk],$userInfo['uid'],'uid');
-                    UserBill::expend('提现抵扣',$userInfo['uid'],'purple_integral','extract',(($sxf - $dk)*$tx),$res1['id'],$ydk,'提现使用'.(($sxf - $dk)*$tx).'阳光抵扣'.($sxf - $dk).'手续费');
+                    UserBill::expend('提现抵扣',$userInfo['uid'],'integral','extract',(($sxf - $dk)*$tx),$res1['id'],$ydk,'提现使用'.(($sxf - $dk)*$tx).'阳光抵扣'.($sxf - $dk).'手续费');
                 }
 
             }else{

+ 2 - 2
crmeb/repositories/OrderRepository.php

@@ -107,8 +107,8 @@ class OrderRepository
     public static function storeProductOrderUserTakeDelivery($order, $uid)
     {
         $res1 = StoreOrder::gainUserIntegral($order);
-        $res3 = StoreOrder::gainWhiteIntegral($order);
-        $res4 = StoreOrder::gainBusinessIntegral($order);
+//        $res3 = StoreOrder::gainWhiteIntegral($order);
+//        $res4 = StoreOrder::gainBusinessIntegral($order);
 //        $res2 = User::backOrderBrokerage($order);
         $res2 = User::sendBackOrderBrokerage($order);
         StoreOrder::orderTakeAfter($order);