Browse Source

默认的

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

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

@@ -74,10 +74,12 @@ class VoteOrder extends BaseModel
             $voteInfo = Vote::valid()->find($voteJoinInfo['vid']);
             if (!$voteInfo) return self::setErrorInfo('找不到投票活动信息', true);
             if ($voteInfo['start_time'] > time()) {
-                return app('json')->fail('活动未开始');
+                return self::setErrorInfo('活动未开始', true);
+                //return app('json')->fail('活动未开始');
             }
             if ($voteInfo['end_time'] < time()) {
-                return app('json')->fail('活动已结束');
+                return self::setErrorInfo('活动已结束', true);
+                //return app('json')->fail('活动已结束');
             }
             $payPrice = bcmul($num, $voteInfo['price'], 2);
             $orderInfo = [

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

@@ -93,6 +93,7 @@ class VoteController
     public function vote($id, Request $request)
     {
         if (!$id) return app('json')->fail('参数错误!');
+
         $uid = $request->uid();
         if (!VoteJoin::valid()->find($id)) return app('json')->fail('参数错误!');
         list($num, $payType, $from) = UtilService::postMore([