diff --git a/app/Console/Tasks/RefundTask.php b/app/Console/Tasks/RefundTask.php index 8c1d6eca..04cd5cfb 100644 --- a/app/Console/Tasks/RefundTask.php +++ b/app/Console/Tasks/RefundTask.php @@ -97,7 +97,7 @@ class RefundTask extends Task $task->try_count += 1; $task->priority += 1; - if ($task->try_count > self::TRY_COUNT) { + if ($task->try_count >= self::TRY_COUNT) { $task->status = TaskModel::STATUS_FAILED; } @@ -161,6 +161,9 @@ class RefundTask extends Task case OrderModel::ITEM_VIP: $this->handleVipOrderRefund($order); break; + case OrderModel::ITEM_REWARD: + $this->handleRewardOrderRefund($order); + break; case OrderModel::ITEM_TEST: $this->handleTestOrderRefund($order); break; @@ -247,6 +250,16 @@ class RefundTask extends Task } } + /** + * 处理测试订单退款 + * + * @param OrderModel $order + */ + protected function handleRewardOrderRefund(OrderModel $order) + { + + } + /** * 处理测试订单退款 * diff --git a/app/Console/Tasks/SyncCourseIndexTask.php b/app/Console/Tasks/SyncCourseIndexTask.php index dd17c9bf..e27ace7b 100644 --- a/app/Console/Tasks/SyncCourseIndexTask.php +++ b/app/Console/Tasks/SyncCourseIndexTask.php @@ -4,8 +4,8 @@ namespace App\Console\Tasks; use App\Library\Cache\Backend\Redis as RedisCache; use App\Repos\Course as CourseRepo; -use App\Searchers\CourseDocument; -use App\Searchers\CourseSearch; +use App\Services\Search\CourseDocument; +use App\Services\Search\CourseHandler; use App\Services\Syncer\CourseIndex as CourseIndexSyncer; class SyncCourseIndexTask extends Task @@ -48,9 +48,9 @@ class SyncCourseIndexTask extends Task $document = new CourseDocument(); - $searcher = new CourseSearch(); + $handler = new CourseHandler(); - $index = $searcher->getXS()->getIndex(); + $index = $handler->getXS()->getIndex(); $index->openBuffer(); diff --git a/app/Http/Admin/Services/Consult.php b/app/Http/Admin/Services/Consult.php index 509ae61d..e668f61e 100644 --- a/app/Http/Admin/Services/Consult.php +++ b/app/Http/Admin/Services/Consult.php @@ -60,6 +60,10 @@ class Consult extends Service $data['answer'] = $validator->checkAnswer($post['answer']); } + if (isset($post['private'])) { + $data['private'] = $validator->checkPrivateStatus($post['private']); + } + if (isset($post['published'])) { $data['published'] = $validator->checkPublishStatus($post['published']); } diff --git a/app/Http/Admin/Services/Order.php b/app/Http/Admin/Services/Order.php index 1ce06e5f..23ea85b2 100644 --- a/app/Http/Admin/Services/Order.php +++ b/app/Http/Admin/Services/Order.php @@ -4,7 +4,6 @@ namespace App\Http\Admin\Services; use App\Builders\OrderList as OrderListBuilder; use App\Library\Paginator\Query as PaginateQuery; -use App\Models\Order as OrderModel; use App\Repos\Account as AccountRepo; use App\Repos\Order as OrderRepo; use App\Repos\User as UserRepo; @@ -62,18 +61,6 @@ class Order extends Service return $this->findOrFail($id); } - public function closeOrder($id) - { - $order = $this->findOrFail($id); - - if ($order->status == OrderModel::STATUS_PENDING) { - $order->status = OrderModel::STATUS_CLOSED; - $order->update(); - } - - return $order; - } - protected function findOrFail($id) { $validator = new OrderValidator(); diff --git a/app/Http/Admin/Services/Trade.php b/app/Http/Admin/Services/Trade.php index 5fec01b3..c0279fb4 100644 --- a/app/Http/Admin/Services/Trade.php +++ b/app/Http/Admin/Services/Trade.php @@ -5,7 +5,6 @@ namespace App\Http\Admin\Services; use App\Builders\TradeList as TradeListBuilder; use App\Library\Paginator\Query as PaginateQuery; use App\Models\Refund as RefundModel; -use App\Models\Trade as TradeModel; use App\Repos\Account as AccountRepo; use App\Repos\Order as OrderRepo; use App\Repos\Trade as TradeRepo; @@ -76,21 +75,6 @@ class Trade extends Service return $accountRepo->findById($userId); } - public function closeTrade($id) - { - $trade = $this->findOrFail($id); - - $validator = new TradeValidator(); - - $validator->checkIfAllowClose($trade); - - $trade->status = TradeModel::STATUS_CLOSED; - - $trade->update(); - - return $trade; - } - public function refundTrade($id) { $trade = $this->findOrFail($id); diff --git a/app/Http/Admin/Views/comment/list.volt b/app/Http/Admin/Views/comment/list.volt index 93c34971..a470689a 100644 --- a/app/Http/Admin/Views/comment/list.volt +++ b/app/Http/Admin/Views/comment/list.volt @@ -43,13 +43,13 @@ {% if item.chapter %}
{% endif %} -评论:{{ substr(item.content,0,25) }}
+评论:{{ substr(item.content,0,30) }}
昵称:{{ item.user.name }}
编号:{{ item.user.id }}
交易序号 | -交易金额 | -交易平台 | -交易状态 | -创建时间 | -
---|---|---|---|---|
{{ trade.sn }} | -¥{{ trade.amount }} | -{{ channel_type(trade.channel) }} | -{{ trade_status(trade.status) }} | -{{ date('Y-m-d H:i',trade.create_time) }} | -
订单序号 | -商品名称 | -订单金额 | -订单状态 | -创建时间 | -
---|---|---|---|---|
{{ order.sn }} | -{{ order.subject }} | -¥{{ order.amount }} | -{{ order_status(order.status) }} | -{{ date('Y-m-d H:i',order.create_time) }} | -
编号 | -昵称 | -手机 | -邮箱 | -
---|---|---|---|
{{ user.id }} | -{{ user.name }} | -{% if account.phone %} {{ account.phone }} {% else %} 未知 {% endif %} | -{% if account.email %} {{ account.email }} {% else %} 未知 {% endif %} | -
评分:
- +昵称:{{ item.user.name }}
编号:{{ item.user.id }}
开始:{{ date('Y-m-d H:i',item.create_time) }}
-结束:{{ date('Y-m-d H:i',item.expiry_time) }}
+开始:{{ date('Y-m-d H:i:s',item.create_time) }}
+结束:{{ date('Y-m-d H:i:s',item.expiry_time) }}
交易序号 | -交易金额 | -交易平台 | -交易状态 | -创建时间 | -
---|---|---|---|---|
{{ trade.sn }} | -¥{{ trade.amount }} | -{{ channel_type(trade.channel) }} | -{{ trade_status(trade.status) }} | -{{ date('Y-m-d H:i',trade.create_time) }} | -
订单序号 | -商品名称 | -订单金额 | -订单状态 | -创建时间 | -
---|---|---|---|---|
{{ order.sn }} | -{{ order.subject }} | -¥{{ order.amount }} | -{{ order_status(order.status) }} | -{{ date('Y-m-d H:i',order.create_time) }} | -
编号 | -昵称 | -手机 | -邮箱 | -
---|---|---|---|
{{ user.id }} | -{{ user.name }} | -{% if account.phone %} {{ account.phone }} {% else %} 未知 {% endif %} | -{% if account.email %} {{ account.email }} {% else %} 未知 {% endif %} | -