Browse Source

默认的

Kirin 4 years ago
parent
commit
082d0bc438
2 changed files with 3 additions and 3 deletions
  1. 2 2
      app/admin/model/vote/VoteOrder.php
  2. 1 1
      app/api/controller/vote/VoteController.php

+ 2 - 2
app/admin/model/vote/VoteOrder.php

@@ -141,8 +141,8 @@ class VoteOrder extends BaseModel
         $orderInfo = self::where('uid', $uid)->where('order_id', $order_id)->find();
         if (!$orderInfo) return self::setErrorInfo('订单不存在!');
         if ($orderInfo['paid']) return self::setErrorInfo('该订单已支付!');
-        $userInfo = \app\models\user\User::getUserInfo($uid);
-        if (Vote::where('id', $orderInfo['vid'])->value('day_free') < $orderInfo['vote_num'] + self::valid()->where('uid', $orderInfo['uid'])->where('vid', $orderInfo['vid'])->whereTime('pay_time', 'today')->sum('vote_num')) {
+        //$userInfo = \app\models\user\User::getUserInfo($uid);
+        if (Vote::where('id', $orderInfo['vid'])->value('day_free') < $orderInfo['vote_num'] + self::valid()->where('uid', $orderInfo['uid'])->where('vid', $orderInfo['vid'])->whereTime('pay_time', 'today')->where('pay_type', 'free')->sum('vote_num')) {
             return self::setErrorInfo(['status' => 'pay_deficiency', 'msg' => '免费票不足' . floatval($orderInfo['pay_price'])]);
         }
         self::beginTrans();

+ 1 - 1
app/api/controller/vote/VoteController.php

@@ -30,7 +30,7 @@ class VoteController
             $info['vote_num'] = VoteJoin::valid()->where('vid', $id)->sum('vote');
             $info['my_status'] = VoteJoin::where('vid', $id)->where('uid', $request->uid())->find();
             if ($request->uid()) {
-                $info['today_free_vote_num'] + VoteOrder::valid()->where('uid', $request->uid())->where('vid', $id)->whereTime('pay_time', 'today')->sum('vote_num');
+                $info['today_free_vote_num'] + VoteOrder::valid()->where('uid', $request->uid())->where('vid', $id)->where('pay_type', 'free')->whereTime('pay_time', 'today')->sum('vote_num');
             }
         }
         return app('json')->success('ok', $info);