挂售

app/admin/controller/user/User.php

@@ -120,7 +120,7 @@ class User extends AuthController
         $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::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/models/auction/AuctionOrder.php

@@ -235,10 +235,10 @@ class AuctionOrder extends BaseModel
             \app\models\user\UserBill::create([
                 'uid' => $user['uid'],
                 'pm' => 1,
-                'title' => '预约卷退还',
+                'title' => '艺金券退还',
                 'category' => 'anticipate',
                 'type' => 'add_anticipate',
-                'mark' => '退还'.$anticipate.'预约卷扣除'.$booking['deduction'],
+                'mark' => '退还'.$anticipate.'艺金券扣除'.$booking['deduction'],
                 'add_time' => time(),
                 'number' => $anticipate,
                 'balance' => $user['anticipate']
@@ -270,7 +270,7 @@ class AuctionOrder extends BaseModel
                             $user = \app\models\user\User::where('uid', $v['collection_id'])->find();
                             $user['anticipate'] = $user['anticipate'] + $auction['anticipate']/2; // 卖家增加预约卷
                             $booking['deduction'] = $auction['anticipate']/2;
-                            UserBill::income('增加艺金券', $v['collection_id'], 'anticipate', 'add_anticipate',  $auction['anticipate']/2, $v['uid'], $user['anticipate'], '卖出订单未上传支付凭证,增加'.($auction['anticipate']/2).'预约卷');
+                            UserBill::income('增加艺金券', $v['collection_id'], 'anticipate', 'add_anticipate',  $auction['anticipate']/2, $v['uid'], $user['anticipate'], '卖出订单未上传支付凭证,增加'.($auction['anticipate']/2).'艺金券');
                             $booking->save();
                             $user->save();
                         }
@@ -280,7 +280,7 @@ class AuctionOrder extends BaseModel
                         $user = \app\models\user\User::where('uid', $v['collection_id'])->find();
                         $user['anticipate'] = $user['anticipate'] + ($auction['anticipate'] - $auction['deduction']); // 卖家增加预约卷
                         $booking['deduction'] = $auction['anticipate'];
-                        UserBill::income('增加艺金券', $v['collection_id'], 'anticipate', 'add_anticipate', $auction['anticipate'] - $auction['deduction'], $v['uid'], $user['anticipate'], '卖出订单未上传支付凭证,增加' . ($auction['anticipate'] - $auction['deduction']) . '预约卷');
+                        UserBill::income('增加艺金券', $v['collection_id'], 'anticipate', 'add_anticipate', $auction['anticipate'] - $auction['deduction'], $v['uid'], $user['anticipate'], '卖出订单未上传支付凭证,增加' . ($auction['anticipate'] - $auction['deduction']) . '艺金券');
                         $booking->save();
                         $user->save();
                         AuctionBooking::where('id', $booking['id'])->update(['status' => 2]); // 修改预约订单状态 为扣除
@@ -319,7 +319,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'].'退回');
                         }
                     }
                 }