挂售

app/admin/controller/user/User.php

@@ -119,8 +119,8 @@ class User extends AuthController
         $f[] = Form::number('money', '余额')->min(0);
         $f[] = Form::radio('integration_status', '修改趣豆', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
         $f[] = Form::number('integration', '趣豆')->min(0);
-        $f[] = Form::radio('anticipate_status', '修改艺金券', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
-        $f[] = Form::number('anticipate', '艺金券')->min(0);
+        $f[] = Form::radio('anticipate_status', '修改易趣卷', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
+        $f[] = Form::number('anticipate', '易趣卷')->min(0);
         $form = Form::make_post_form('修改其他', $f, Url::buildUrl('update_other', array('uid' => $uid)));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -192,7 +192,7 @@ class User extends AuthController
         if ($data['anticipate_status'] && $data['anticipate']) {//趣豆增加或者减少
             if ($data['anticipate_status'] == 1) {//增加
                 $edit['anticipate'] = bcadd($user['anticipate'], $data['anticipate'], 2);
-                $res3 = UserBillAdmin::income('系统增加艺金券', $user['uid'], 'anticipate', 'add_anticipate', $data['anticipate'], $this->adminId, $edit['anticipate'], '系统增加了' . floatval($data['anticipate']) . '艺金券');
+                $res3 = UserBillAdmin::income('系统增加易趣卷', $user['uid'], 'anticipate', 'add_anticipate', $data['anticipate'], $this->adminId, $edit['anticipate'], '系统增加了' . floatval($data['anticipate']) . '易趣卷');
                 try {
                     UserRepository::adminAddIntegral($user, $data['integration']);
                 } catch (\Exception $e) {
@@ -201,7 +201,7 @@ class User extends AuthController
                 }
             } else if ($data['anticipate_status'] == 2) {//减少
                 $edit['anticipate'] = bcsub($user['anticipate'], $data['anticipate'], 2);
-                $res3 = UserBillAdmin::expend('系统减少艺金券', $user['uid'], 'anticipate', 'reduce_anticipate', $data['anticipate'], $this->adminId, $edit['anticipate'], '系统扣除了' . floatval($data['anticipate']) . '艺金券');
+                $res3 = UserBillAdmin::expend('系统减少易趣卷', $user['uid'], 'anticipate', 'reduce_anticipate', $data['anticipate'], $this->adminId, $edit['anticipate'], '系统扣除了' . floatval($data['anticipate']) . '易趣卷');
                 try {
                     UserRepository::adminSubIntegral($user, $data['anticipate']);
                 } catch (\Exception $e) {

app/admin/model/user/User.php

@@ -301,7 +301,7 @@ class User extends BaseModel
                 $is_auth,
             ];
         }
-        PHPExcelService::setExcelHeader(['ID', '账号', '昵称', '手机号','等级', '真实姓名', '身份证号', '余额','艺金券', '推广人',
+        PHPExcelService::setExcelHeader(['ID', '账号', '昵称', '手机号','等级', '真实姓名', '身份证号', '余额','易趣卷', '推广人',
             '商品持仓数量','收益','银行卡', '微信', '支付宝','实名认证'])
             ->setExcelTile('用户导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)

app/admin/model/user/UserRecharge.php

@@ -95,7 +95,7 @@ class UserRecharge extends BaseModel
             $item['_pay_time'] = $item['pay_time'] ? date('Y-m-d H:i:s', $item['pay_time']) : '暂无';
             $item['_add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '暂无';
             $item['paid_type'] = $item['paid'] ? '已支付' : '未支付';
-            $item['type'] = $item['type'] == 1? '余额充值' : '艺金券充值';
+            $item['type'] = $item['type'] == 1? '余额充值' : '易趣卷充值';
         }
         $count = self::setWhere($where, null, 'a', 'u.nickname')->join('user u', 'u.uid=a.uid')->count();
         return compact('data', 'count');

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

@@ -320,7 +320,7 @@
             {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
             {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
             {field: 'integral', title: '趣豆',width:'6%',sort:true,event:'integral',align:'center'},
-            {field: 'anticipate', title: '艺金券',width:'6%',sort:true,event:'integral',align:'center'},
+            {field: 'anticipate', title: '易趣卷',width:'6%',sort:true,event:'integral',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',width:'6%',align:'center'},
             {field: 'sex', title: '性别',width:'4%',align:'center'},
             {field: 'data_time', title: '访问日期',align:'center',width:'12%',templet:'#data_time'},

app/api/controller/auction/AuctionController.php

@@ -77,7 +77,7 @@ class AuctionController
         $userModel = new User();
         $user = $userModel->find($request->uid());
         if ($user['is_auth'] != 2) return app('json')->fail('未实名认证');
-        if ($user['anticipate'] < $auction['anticipate']) return app('json')->fail('艺金券不足');
+        if ($user['anticipate'] < $auction['anticipate']) return app('json')->fail('易趣卷不足');
         $user['anticipate'] = $user['anticipate'] - $auction['anticipate'];// 扣除预约卷
 
         User::rollbackTrans();
@@ -85,7 +85,7 @@ class AuctionController
 
         if ($res){
             AuctionBooking::booking($user['uid'], $auction);
-            UserBill::expend('预约场馆', $user['uid'], 'anticipate','reduce_anticipate', $auction['anticipate'], 0, $user['anticipate'], '预约扣除艺金券'); // 写入记录
+            UserBill::expend('预约场馆', $user['uid'], 'anticipate','reduce_anticipate', $auction['anticipate'], 0, $user['anticipate'], '预约扣除易趣卷'); // 写入记录
 
             User::commitTrans();
             return app('json')->successful('预约成功');
@@ -187,14 +187,14 @@ class AuctionController
         if ($user['payment'] != md5($data['payment'])) return app('json')->fail('支付密码错误');
         if (!in_array($data['uid'],$uid)) return app('json')->fail('该用户不是你下级');
         if ($data['anticipate'] < 10) return app('json')->fail('最少转账10');
-        if ($user['anticipate'] < $data['anticipate']) return app('json')->fail('艺金券不够');
+        if ($user['anticipate'] < $data['anticipate']) return app('json')->fail('易趣卷不够');
         $me = User::find($data['uid']);
         $user['anticipate'] = $user['anticipate'] - $data['anticipate'];// 扣除预约卷
         $me['anticipate'] = $me['anticipate'] + $data['anticipate'];// 增加预约卷
         try {
             Db::startTrans();
-            UserBill::expend('艺金券减少',$user['uid'], 'anticipate', 'reduce_anticipate', $data['anticipate'], 0, $user['anticipate'], '转账给('.$me['nickname'].'-'.$me['uid'].')'.$data['anticipate'].'预约卷');
-            UserBill::income('艺金券增加',$me['uid'], 'anticipate', 'add_anticipate', $data['anticipate'], 0, $me['anticipate'], '接收('.$user['nickname'].'-'.$user['uid'].')的'.$data['anticipate'].'预约卷');
+            UserBill::expend('易趣卷减少',$user['uid'], 'anticipate', 'reduce_anticipate', $data['anticipate'], 0, $user['anticipate'], '转账给('.$me['nickname'].'-'.$me['uid'].')'.$data['anticipate'].'预约卷');
+            UserBill::income('易趣卷增加',$me['uid'], 'anticipate', 'add_anticipate', $data['anticipate'], 0, $me['anticipate'], '接收('.$user['nickname'].'-'.$user['uid'].')的'.$data['anticipate'].'预约卷');
             $user->save();
             $me->save();
 

app/api/controller/auction/AuctionProductController.php

@@ -117,10 +117,10 @@ class AuctionProductController
             }
             $order_id = getNewOrderId();
             if ($count >= 1){
-                if ($user['anticipate'] < 200) return app('json')->fail('艺金券不足');
+                if ($user['anticipate'] < 200) return app('json')->fail('易趣卷不足');
                 $user['anticipate'] -= 200;
                 User::where('uid', $user['uid'])->update(['anticipate' => $user['anticipate']]);
-                UserBill::expend('冻结艺金券',$user['uid'], 'anticipate', 'fz_anticipate', 200, $user['spread_uid'], $user['anticipate'], '购买订单'.$order_id.'冻结艺金券');
+                UserBill::expend('冻结易趣卷',$user['uid'], 'anticipate', 'fz_anticipate', 200, $user['spread_uid'], $user['anticipate'], '购买订单'.$order_id.'冻结易趣卷');
 
                 AuctionFrozen::create([
                     'order_id' => $order_id,
@@ -395,7 +395,7 @@ class AuctionProductController
             $product->save();
             $user->save();
             AuctionOrder::where([['uid', '=', $request->uid()], ['product_id', '=', $product['id']], ['is_gs', '=', 0]])->update(['is_gs' => 1]);// 修改订单挂售
-            UserBill::expend('挂售扣除预约券', $user['uid'], 'anticipate', 'gs_anticipate', $datas['anticipate'], $user['spread_uid'], $user['anticipate'], '挂售商品'.$product['id'].'扣除艺金券');
+            UserBill::expend('挂售扣除易趣卷', $user['uid'], 'anticipate', 'gs_anticipate', $datas['anticipate'], $user['spread_uid'], $user['anticipate'], '挂售商品'.$product['id'].'扣除易趣卷');
             UserBill::income('赠送趣豆', $user['uid'], 'integral', 'gs_integral', $datas['give'], $user['spread_uid'], $user['integral'], '挂售赠送趣豆');
 
             Db::commit();
@@ -469,7 +469,7 @@ class AuctionProductController
             $details->save();
             $user->save();
             AuctionOrder::where('order_id', $details['order'])->save(['is_gs' => 0]);
-            UserBill::income('取消挂售退回预约券', $request->uid(), 'anticipate', 'gsth_anticipate', $anticipate*$bs, 0, $user['anticipate'], '取消挂售退回预约券');
+            UserBill::income('取消挂售退回预约券', $request->uid(), 'anticipate', 'gsth_anticipate', $anticipate*$bs, 0, $user['anticipate'], '取消挂售退回易趣卷');
             UserBill::expend('取消挂售扣除趣豆', $request->uid(), 'integral', 'gsth_integral',  round(($details['price'] * $details['give']/100)*$bs, 2), 0, $user['integral'], '取消挂售扣除赠送趣豆');
             AuctionTime::where([['uid', '=', $request->uid()], ['product_id', '=', $data['id']]])->delete(); // 删除上架时间
             Db::commit();

app/models/auction/AuctionOrder.php

@@ -252,7 +252,7 @@ class AuctionOrder extends BaseModel
 
             $user->save();
             $fz->save();
-            UserBill::income('艺金券退还',$user['uid'], 'anticipate', 'th_anticipate', $anticipate, $user['spread_uid'], $user['anticipate'], '退还订单'.$data['order_id'].'艺金券,扣除' . $fz['deduction']);
+            UserBill::income('易趣卷退还',$user['uid'], 'anticipate', 'th_anticipate', $anticipate, $user['spread_uid'], $user['anticipate'], '退还订单'.$data['order_id'].'易趣卷,扣除' . $fz['deduction']);
 
         }else{
             if ($booking['status'] > 0) {
@@ -262,7 +262,7 @@ class AuctionOrder extends BaseModel
 
                 $user->save();
                 $booking->save();
-                UserBill::income('艺金券退还',$user['uid'], 'anticipate', 'th_anticipate', $anticipate, $user['spread_uid'], $user['anticipate'], '退还预约艺金券扣除' . $booking['deduction']);
+                UserBill::income('易趣卷退还',$user['uid'], 'anticipate', 'th_anticipate', $anticipate, $user['spread_uid'], $user['anticipate'], '退还预约易趣卷扣除' . $booking['deduction']);
             }
         }
     }
@@ -295,8 +295,8 @@ class AuctionOrder extends BaseModel
                             $user = \app\models\user\User::where('uid', $v['collection_id'])->find();
                             $user['anticipate'] = $user['anticipate'] + $fz['anticipate'] / 2; // 卖家增加预约卷
                             $fz['deduction'] = $fz['anticipate'] / 2;
-                            UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $fz['anticipate'] / 2, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加艺金券');
-                            UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $fz['anticipate'] / 2, $v['uid'], $fz['anticipate'] / 2, '超时付款,扣除订单'.$v['order_id'].'冻结'. ($fz['anticipate'] / 2) . '艺金券');
+                            UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $fz['anticipate'] / 2, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加易趣卷');
+                            UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $fz['anticipate'] / 2, $v['uid'], $fz['anticipate'] / 2, '超时付款,扣除订单'.$v['order_id'].'冻结'. ($fz['anticipate'] / 2) . '易趣卷');
                             $fz->save();
                             $user->save();
                         }
@@ -310,8 +310,8 @@ class AuctionOrder extends BaseModel
 
                         $user->save();
                         \app\models\user\User::where('uid', $v['uid'])->update(['status' => 0, 'freeze_time' => strtotime('+1 day')]); // 冻结用户
-                        UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $dedu, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加艺金券');
-                        UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $dedu, $v['uid'], 0, '超时付款,扣除订单'.$v['order_id'].'冻结' . $dedu . '艺金券');
+                        UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $dedu, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加易趣卷');
+                        UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $dedu, $v['uid'], 0, '超时付款,扣除订单'.$v['order_id'].'冻结' . $dedu . '易趣卷');
                         $fz->save();
 
                         AuctionOrder::where('create_time', '<', $hour)->where('status', '=', 1)->update(['status' => 0]); // 修改为已过期订单
@@ -325,8 +325,8 @@ class AuctionOrder extends BaseModel
                                 $user = \app\models\user\User::where('uid', $v['collection_id'])->find();
                                 $user['anticipate'] = $user['anticipate'] + $booking['anticipate'] / 2; // 卖家增加预约卷
                                 $booking['deduction'] = $booking['anticipate'] / 2;
-                                UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $booking['anticipate'] / 2, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加艺金券');
-                                UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $booking['anticipate'] / 2, $v['uid'], $booking['anticipate'] / 2, '超时付款,扣除预约冻结' . ($booking['anticipate'] / 2) . '艺金券');
+                                UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $booking['anticipate'] / 2, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加易趣卷');
+                                UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $booking['anticipate'] / 2, $v['uid'], $booking['anticipate'] / 2, '超时付款,扣除预约冻结' . ($booking['anticipate'] / 2) . '易趣卷');
                                 $booking->save();
                                 $user->save();
                             }
@@ -341,8 +341,8 @@ class AuctionOrder extends BaseModel
 
                             $user->save();
                             \app\models\user\User::where('uid', $v['uid'])->update(['status' => 0, 'freeze_time' => strtotime('+1 day')]); // 冻结用户
-                            UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $dedu, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加艺金券');
-                            UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $dedu, $v['uid'], 0, '超时付款,扣除预约冻结' . $dedu . '艺金券');
+                            UserBill::income('超时增加', $v['collection_id'], 'anticipate', 'ad_anticipate', $dedu, $v['uid'], $user['anticipate'], '(' . $userl['nickname'] . '-' . $userl['uid'] . ')超时付款,增加易趣卷');
+                            UserBill::expend('超时扣除', $v['uid'], 'anticipate', 'dec_anticipate', $dedu, $v['uid'], 0, '超时付款,扣除预约冻结' . $dedu . '易趣卷');
                             $booking->save();
 
                             AuctionOrder::where('create_time', '<', $hour)->where('status', '=', 1)->update(['status' => 0]); // 修改为已过期订单
@@ -381,7 +381,7 @@ class AuctionOrder extends BaseModel
 
                             $user->save();
                             $find->save();
-                            UserBill::income('退回艺金券', $user['uid'], 'anticipate', 'add_anticipate', $value['anticipate'], 0, $user['anticipate'], '艺金券' . $value['anticipate'] . '退回');
+                            UserBill::income('退回易趣卷', $user['uid'], 'anticipate', 'add_anticipate', $value['anticipate'], 0, $user['anticipate'], '易趣卷' . $value['anticipate'] . '退回');
                         }
                     }
                 }

app/models/user/UserRecharge.php

@@ -142,8 +142,8 @@ class UserRecharge extends BaseModel
             self::beginTrans();
             $price = bcadd($order['price'], $order['give_price'], 2);
             $res1 = self::where('order_id', $order['order_id'])->update(['paid' => 1, 'pay_time' => time()]);
-            $mark = '成功充值艺金券' . floatval($order['price']) . '元' . ($order['give_price'] ? ',赠送' . $order['give_price'] . '元' : '');
-            $res2 = UserBill::income('用户艺金券充值', $order['uid'], 'anticipate', 'recharge_anticipate', $order['price'], $order['id'], $user['anticipate'], $mark);
+            $mark = '成功充值易趣卷' . floatval($order['price']) . '元' . ($order['give_price'] ? ',赠送' . $order['give_price'] . '元' : '');
+            $res2 = UserBill::income('用户易趣卷充值', $order['uid'], 'anticipate', 'recharge_anticipate', $order['price'], $order['id'], $user['anticipate'], $mark);
             $res3 = User::edit(['anticipate' => bcadd($user['anticipate'], $price, 2)], $order['uid'], 'uid');
             $res = $res1 && $res2 && $res3;
             self::checkTrans($res);