diff --git a/app/Console/Tasks/CleanLogTask.php b/app/Console/Tasks/CleanLogTask.php
index 453b41e2..7cc0287a 100644
--- a/app/Console/Tasks/CleanLogTask.php
+++ b/app/Console/Tasks/CleanLogTask.php
@@ -21,6 +21,7 @@ class CleanLogTask extends Task
         $this->cleanStorageLog();
         $this->cleanAlipayLog();
         $this->cleanWxpayLog();
+        $this->cleanOrderLog();
         $this->cleanRefundLog();
     }
 
@@ -120,6 +121,14 @@ class CleanLogTask extends Task
         $this->cleanLog('wxpay', 30);
     }
 
+    /**
+     * 清理订单日志
+     */
+    protected function cleanOrderLog()
+    {
+        $this->cleanLog('order', 30);
+    }
+
     /**
      * 清理退款日志
      */
diff --git a/app/Console/Tasks/OrderTask.php b/app/Console/Tasks/OrderTask.php
index 9f938b5b..29afa0ff 100644
--- a/app/Console/Tasks/OrderTask.php
+++ b/app/Console/Tasks/OrderTask.php
@@ -13,7 +13,6 @@ use App\Repos\CourseUser as CourseUserRepo;
 use App\Repos\Order as OrderRepo;
 use App\Repos\User as UserRepo;
 use App\Services\Smser\Order as OrderSmser;
-use Phalcon\Cli\Task;
 use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
@@ -25,6 +24,8 @@ class OrderTask extends Task
 
     public function mainAction()
     {
+        $logger = $this->getLogger('order');
+
         $tasks = $this->findTasks();
 
         if ($tasks->count() == 0) {
@@ -77,6 +78,13 @@ class OrderTask extends Task
                 }
 
                 $task->update();
+
+                $logger->info('Order Task Exception ' . kg_json_encode([
+                        'line' => $e->getLine(),
+                        'code' => $e->getCode(),
+                        'message' => $e->getMessage(),
+                        'task' => $task->toArray(),
+                    ]));
             }
 
             /**
@@ -98,7 +106,7 @@ class OrderTask extends Task
         $data = [
             'user_id' => $order->user_id,
             'course_id' => $order->item_id,
-            'expiry_time' => $itemInfo['course']['expiry_time'],
+            'expiry_time' => $itemInfo['course']['study_expiry_time'],
             'role_type' => CourseUserModel::ROLE_STUDENT,
             'source_type' => CourseUserModel::SOURCE_CHARGE,
         ];
@@ -124,7 +132,7 @@ class OrderTask extends Task
             $data = [
                 'user_id' => $order->user_id,
                 'course_id' => $course['id'],
-                'expiry_time' => $course['expiry_time'],
+                'expiry_time' => $course['study_expiry_time'],
                 'role_type' => CourseUserModel::ROLE_STUDENT,
                 'source_type' => CourseUserModel::SOURCE_CHARGE,
             ];
@@ -179,7 +187,7 @@ class OrderTask extends Task
 
         $refund->subject = $order->subject;
         $refund->amount = $order->amount;
-        $refund->apply_note = '开通失败，自动退款';
+        $refund->apply_note = '开通服务失败，自动退款';
         $refund->review_note = '自动操作';
         $refund->user_id = $order->user_id;
         $refund->order_id = $order->id;
@@ -214,7 +222,7 @@ class OrderTask extends Task
     /**
      * @param int $courseId
      * @param int $userId
-     * @return ResultsetInterface|Resultset|TaskModel[]
+     * @return ResultsetInterface|Resultset|CourseUserModel[]
      */
     protected function findPlanChapterUsers($courseId, $userId)
     {
@@ -228,7 +236,7 @@ class OrderTask extends Task
     /**
      * @param int $courseId
      * @param int $userId
-     * @return ResultsetInterface|Resultset|TaskModel[]
+     * @return ResultsetInterface|Resultset|CourseUserModel[]
      */
     protected function findPlanLearnings($courseId, $userId)
     {
@@ -267,7 +275,7 @@ class OrderTask extends Task
         return TaskModel::query()
             ->where('item_type = :item_type:', ['item_type' => $itemType])
             ->andWhere('status = :status:', ['status' => $status])
-            ->andWhere('try_count < :try_count:', ['try_count' => $tryCount])
+            ->andWhere('try_count < :try_count:', ['try_count' => $tryCount + 1])
             ->orderBy('priority ASC')
             ->limit($limit)
             ->execute();
diff --git a/app/Console/Tasks/RefundTask.php b/app/Console/Tasks/RefundTask.php
index 04cd5cfb..138f118b 100644
--- a/app/Console/Tasks/RefundTask.php
+++ b/app/Console/Tasks/RefundTask.php
@@ -97,13 +97,15 @@ 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;
                 }
 
                 $task->update();
 
                 $logger->info('Refund Task Exception ' . kg_json_encode([
+                        'line' => $e->getLine(),
+                        'code' => $e->getCode(),
                         'message' => $e->getMessage(),
                         'task' => $task->toArray(),
                     ]));
@@ -186,7 +188,7 @@ class RefundTask extends Task
             $courseUser->deleted = 1;
 
             if ($courseUser->update() === false) {
-                throw new \RuntimeException('Delete CourseQuery User Failed');
+                throw new \RuntimeException('Delete Course User Failed');
             }
         }
     }
@@ -214,7 +216,7 @@ class RefundTask extends Task
                 $courseUser->deleted = 1;
 
                 if ($courseUser->update() === false) {
-                    throw new \RuntimeException('Delete CourseQuery User Failed');
+                    throw new \RuntimeException('Delete Course User Failed');
                 }
             }
         }
@@ -293,7 +295,7 @@ class RefundTask extends Task
         return TaskModel::query()
             ->where('item_type = :item_type:', ['item_type' => $itemType])
             ->andWhere('status = :status:', ['status' => $status])
-            ->andWhere('try_count < :try_count:', ['try_count' => $tryCount])
+            ->andWhere('try_count < :try_count:', ['try_count' => $tryCount + 1])
             ->orderBy('priority ASC')
             ->limit($limit)
             ->execute();
diff --git a/app/Http/Admin/Controllers/TestController.php b/app/Http/Admin/Controllers/TestController.php
index 19bc59e2..ce0118fa 100644
--- a/app/Http/Admin/Controllers/TestController.php
+++ b/app/Http/Admin/Controllers/TestController.php
@@ -77,11 +77,11 @@ class TestController extends Controller
             ['text' => urlencode($pushUrl)]
         );
 
-        $obs = new \stdClass();
+        $obs = [];
 
-        $position = strrpos($pushUrl, '/');
-        $obs->fms_url = substr($pushUrl, 0, $position + 1);
-        $obs->stream_code = substr($pushUrl, $position + 1);
+        $pos = strrpos($pushUrl, '/');
+        $obs['fms_url'] = substr($pushUrl, 0, $pos + 1);
+        $obs['stream_code'] = substr($pushUrl, $pos + 1);
 
         $this->view->pick('setting/live_push_test');
         $this->view->setVar('code_url', $codeUrl);
@@ -176,29 +176,29 @@ class TestController extends Controller
 
         $order = $alipayTestService->createOrder();
         $trade = $alipayTestService->createTrade($order);
-        $codeUrl = $alipayTestService->scan($trade);
+        $qrcodeUrl = $alipayTestService->scan($trade);
 
-        if ($order && $trade && $codeUrl) {
+        if ($order && $trade && $qrcodeUrl) {
             $this->db->commit();
         } else {
             $this->db->rollback();
         }
 
         $this->view->pick('setting/pay_alipay_test');
-        $this->view->setVar('trade_sn', $trade->sn);
-        $this->view->setVar('code_url', $codeUrl);
+        $this->view->setVar('sn', $trade->sn);
+        $this->view->setVar('qrcode_url', $qrcodeUrl);
     }
 
     /**
-     * @Post("/alipay/status", name="admin.test.alipay_status")
+     * @Get("/alipay/status", name="admin.test.alipay_status")
      */
     public function alipayStatusAction()
     {
-        $tradeSn = $this->request->getPost('trade_sn');
+        $sn = $this->request->getQuery('sn');
 
         $alipayTestService = new AlipayTestService();
 
-        $status = $alipayTestService->status($tradeSn);
+        $status = $alipayTestService->status($sn);
 
         return $this->jsonSuccess(['status' => $status]);
     }
@@ -208,11 +208,11 @@ class TestController extends Controller
      */
     public function alipayCancelAction()
     {
-        $tradeSn = $this->request->getPost('trade_sn');
+        $sn = $this->request->getPost('sn');
 
         $alipayTestService = new AlipayTestService();
 
-        $alipayTestService->cancel($tradeSn);
+        $alipayTestService->cancel($sn);
 
         return $this->jsonSuccess(['msg' => '取消订单成功']);
     }
@@ -228,29 +228,29 @@ class TestController extends Controller
 
         $order = $wxpayTestService->createOrder();
         $trade = $wxpayTestService->createTrade($order);
-        $codeUrl = $wxpayTestService->scan($trade);
+        $qrcodeUrl = $wxpayTestService->scan($trade);
 
-        if ($order && $trade && $codeUrl) {
+        if ($order && $trade && $qrcodeUrl) {
             $this->db->commit();
         } else {
             $this->db->rollback();
         }
 
         $this->view->pick('setting/pay_wxpay_test');
-        $this->view->setVar('trade_sn', $trade->sn);
-        $this->view->setVar('code_url', $codeUrl);
+        $this->view->setVar('sn', $trade->sn);
+        $this->view->setVar('qrcode_url', $qrcodeUrl);
     }
 
     /**
-     * @Post("/wxpay/status", name="admin.test.wxpay_status")
+     * @Get("/wxpay/status", name="admin.test.wxpay_status")
      */
     public function wxpayStatusAction()
     {
-        $tradeSn = $this->request->getPost('trade_sn');
+        $sn = $this->request->getQuery('sn');
 
         $wxpayTestService = new WxpayTestService();
 
-        $status = $wxpayTestService->status($tradeSn);
+        $status = $wxpayTestService->status($sn);
 
         return $this->jsonSuccess(['status' => $status]);
     }
@@ -260,11 +260,11 @@ class TestController extends Controller
      */
     public function wxpayCancelAction()
     {
-        $tradeSn = $this->request->getPost('trade_sn');
+        $sn = $this->request->getPost('sn');
 
         $wxpayTestService = new WxpayTestService();
 
-        $wxpayTestService->cancel($tradeSn);
+        $wxpayTestService->cancel($sn);
 
         return $this->jsonSuccess(['msg' => '取消订单成功']);
     }
diff --git a/app/Http/Admin/Controllers/UserController.php b/app/Http/Admin/Controllers/UserController.php
index 84a6ccdc..520f539b 100644
--- a/app/Http/Admin/Controllers/UserController.php
+++ b/app/Http/Admin/Controllers/UserController.php
@@ -104,12 +104,7 @@ class UserController extends Controller
             $userService->updateAccount($id);
         }
 
-        $location = $this->url->get(['for' => 'admin.user.list']);
-
-        $content = [
-            'location' => $location,
-            'msg' => '更新用户成功',
-        ];
+        $content = ['msg' => '更新用户成功'];
 
         return $this->jsonSuccess($content);
     }
diff --git a/app/Http/Admin/Views/setting/pay_alipay.volt b/app/Http/Admin/Views/setting/pay_alipay.volt
index 701bb604..644d240d 100644
--- a/app/Http/Admin/Views/setting/pay_alipay.volt
+++ b/app/Http/Admin/Views/setting/pay_alipay.volt
@@ -90,7 +90,7 @@
                 type: 2,
                 title: '支付宝 - 支付测试',
                 resize: false,
-                area: ['480px', '300px'],
+                area: ['640px', '300px'],
                 content: [url, 'no']
             });
         });
diff --git a/app/Http/Admin/Views/setting/pay_alipay_test.volt b/app/Http/Admin/Views/setting/pay_alipay_test.volt
index a7ba81e3..4e5f5c64 100644
--- a/app/Http/Admin/Views/setting/pay_alipay_test.volt
+++ b/app/Http/Admin/Views/setting/pay_alipay_test.volt
@@ -1,12 +1,12 @@
 <div class="kg-qrcode-block">
 
-    {% if code_url %}
+    {% if qrcode_url %}
 
         <div id="qrcode">
-            <img class="kg-qrcode" src="{{ code_url }}" alt="二维码图片">
+            <img class="kg-qrcode" src="{{ qrcode_url }}" alt="二维码图片">
         </div>
 
-        <input type="hidden" name="trade_sn" value="{{ trade_sn }}">
+        <input type="hidden" name="sn" value="{{ sn }}">
 
         <div id="success-tips" class="kg-success-tips layui-hide">
             <span>支付成功</span>
@@ -26,19 +26,19 @@
 
 </div>
 
-{% if code_url %}
+{% if qrcode_url %}
 
     <script>
 
         layui.use(['jquery'], function () {
 
             var $ = layui.jquery;
-            var tradeSn = $('input[name=trade_sn]').val();
+            var sn = $('input[name=sn]').val();
             var interval = setInterval(function () {
                 $.ajax({
-                    type: 'POST',
+                    type: 'GET',
                     url: '/admin/test/alipay/status',
-                    data: {trade_sn: tradeSn},
+                    data: {sn: sn},
                     success: function (res) {
                         if (res.status === 'finished') {
                             $('#success-tips').removeClass('layui-hide');
diff --git a/app/Http/Admin/Views/setting/pay_wxpay.volt b/app/Http/Admin/Views/setting/pay_wxpay.volt
index d1eb6e50..bef07de9 100644
--- a/app/Http/Admin/Views/setting/pay_wxpay.volt
+++ b/app/Http/Admin/Views/setting/pay_wxpay.volt
@@ -90,7 +90,7 @@
                 type: 2,
                 title: '微信 - 支付测试',
                 resize: false,
-                area: ['480px', '270px'],
+                area: ['640px', '300px'],
                 content: [url, 'no']
             });
         });
diff --git a/app/Http/Admin/Views/setting/pay_wxpay_test.volt b/app/Http/Admin/Views/setting/pay_wxpay_test.volt
index 5ae7e533..8ba62ff0 100644
--- a/app/Http/Admin/Views/setting/pay_wxpay_test.volt
+++ b/app/Http/Admin/Views/setting/pay_wxpay_test.volt
@@ -1,12 +1,12 @@
 <div class="kg-qrcode-block">
 
-    {% if code_url %}
+    {% if qrcode_url %}
 
         <div id="qrcode">
-            <img class="kg-qrcode" src="{{ code_url }}" alt="二维码图片">
+            <img class="kg-qrcode" src="{{ qrcode_url }}" alt="二维码图片">
         </div>
 
-        <input type="hidden" name="trade_sn" value="{{ trade_sn }}">
+        <input type="hidden" name="sn" value="{{ sn }}">
 
         <div id="success-tips" class="kg-success-tips layui-hide">
             <span>支付成功</span>
@@ -26,19 +26,19 @@
 
 </div>
 
-{% if code_url %}
+{% if qrcode_url %}
 
     <script>
 
         layui.use(['jquery'], function () {
 
             var $ = layui.jquery;
-            var tradeSn = $('input[name=trade_sn]').val();
+            var sn = $('input[name=sn]').val();
             var interval = setInterval(function () {
                 $.ajax({
-                    type: 'POST',
+                    type: 'GET',
                     url: '/admin/test/wxpay/status',
-                    data: {trade_sn: tradeSn},
+                    data: {sn: sn},
                     success: function (res) {
                         if (res.status === 'finished') {
                             $('#success-tips').removeClass('layui-hide');
diff --git a/app/Http/Admin/Views/student/search.volt b/app/Http/Admin/Views/student/search.volt
index 58f6b40c..22ff28a3 100644
--- a/app/Http/Admin/Views/student/search.volt
+++ b/app/Http/Admin/Views/student/search.volt
@@ -23,9 +23,9 @@
     <div class="layui-form-item">
         <label class="layui-form-label">加入方式</label>
         <div class="layui-input-block">
-            <input type="radio" name="source" value="1" title="免费课程">
-            <input type="radio" name="source" value="2" title="付费课程">
-            <input type="radio" name="source" value="3" title="后台导入">
+            <input type="radio" name="source_type" value="1" title="免费课程">
+            <input type="radio" name="source_type" value="2" title="付费课程">
+            <input type="radio" name="source_type" value="3" title="后台导入">
         </div>
     </div>
 
diff --git a/app/Http/Admin/Views/user/edit.volt b/app/Http/Admin/Views/user/edit.volt
index 3995d45d..532e6214 100644
--- a/app/Http/Admin/Views/user/edit.volt
+++ b/app/Http/Admin/Views/user/edit.volt
@@ -28,8 +28,8 @@
     <div class="layui-form-item">
         <label class="layui-form-label">教学角色</label>
         <div class="layui-input-block">
-            <input type="radio" name="edu_role" value="student" title="学员" {% if user.edu_role == 'student' %}checked{% endif %}>
-            <input type="radio" name="edu_role" value="teacher" title="讲师" {% if user.edu_role == 'teacher' %}checked{% endif %}>
+            <input type="radio" name="edu_role" value="1" title="学员" {% if user.edu_role == '1' %}checked{% endif %}>
+            <input type="radio" name="edu_role" value="2" title="讲师" {% if user.edu_role == '2' %}checked{% endif %}>
         </div>
     </div>
 
diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php
index bc35e100..5e020969 100644
--- a/app/Http/Web/Controllers/CourseController.php
+++ b/app/Http/Web/Controllers/CourseController.php
@@ -74,12 +74,12 @@ class CourseController extends Controller
 
         $service = new RewardOptionList();
 
-        $rewardOptions = $service->handle();
+        $rewards = $service->handle();
 
         $this->view->setVar('course', $course);
         $this->view->setVar('chapters', $chapters);
         $this->view->setVar('teachers', $teachers);
-        $this->view->setVar('reward_options', $rewardOptions);
+        $this->view->setVar('rewards', $rewards);
     }
 
     /**
diff --git a/app/Http/Web/Controllers/OrderController.php b/app/Http/Web/Controllers/OrderController.php
index 5faf3858..6d43910e 100644
--- a/app/Http/Web/Controllers/OrderController.php
+++ b/app/Http/Web/Controllers/OrderController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Web\Controllers;
 
+use App\Models\Order as OrderModel;
 use App\Services\Frontend\Order\OrderCancel as OrderCancelService;
 use App\Services\Frontend\Order\OrderConfirm as OrderConfirmService;
 use App\Services\Frontend\Order\OrderCreate as OrderCreateService;
@@ -37,28 +38,36 @@ class OrderController extends Controller
 
         $order = $service->handle();
 
-        $location = $this->url->get(['for' => 'web.order.pay', 'sn' => $order->sn]);
+        $location = $this->url->get(['for' => 'web.order.pay'], ['sn' => $order->sn]);
 
         return $this->jsonSuccess(['location' => $location]);
     }
 
     /**
-     * @Get("/{sn:[0-9]+}/pay", name="web.order.pay")
+     * @Get("/pay", name="web.order.pay")
      */
-    public function payAction($sn)
+    public function payAction()
     {
+        $sn = $this->request->getQuery('sn');
+
         $service = new OrderInfoService();
 
         $order = $service->handle($sn);
 
+        if ($order['status'] != OrderModel::STATUS_PENDING) {
+            $this->response->redirect(['for' => 'web.my.orders']);
+        }
+
         $this->view->setVar('order', $order);
     }
 
     /**
-     * @Get("/{sn:[0-9]+}/info", name="web.order.info")
+     * @Get("/info", name="web.order.info")
      */
-    public function infoAction($sn)
+    public function infoAction()
     {
+        $sn = $this->request->getQuery('sn');
+
         $service = new OrderInfoService();
 
         $order = $service->handle($sn);
@@ -67,10 +76,12 @@ class OrderController extends Controller
     }
 
     /**
-     * @Post("/{sn:[0-9]+}/cancel", name="web.order.cancel")
+     * @Post("/cancel", name="web.order.cancel")
      */
-    public function cancelAction($sn)
+    public function cancelAction()
     {
+        $sn = $this->request->getPost('sn');
+
         $service = new OrderCancelService();
 
         $order = $service->handle($sn);
diff --git a/app/Http/Web/Controllers/TradeController.php b/app/Http/Web/Controllers/TradeController.php
index 86217b7d..1577a5ba 100644
--- a/app/Http/Web/Controllers/TradeController.php
+++ b/app/Http/Web/Controllers/TradeController.php
@@ -24,15 +24,17 @@ class TradeController extends Controller
     }
 
     /**
-     * @Get("/{sn:[0-9]+}/status", name="web.trade.status")
+     * @Get("/status", name="web.trade.status")
      */
-    public function statusAction($sn)
+    public function statusAction()
     {
+        $sn = $this->request->getQuery('sn');
+
         $service = new TradeInfoService();
 
         $trade = $service->handle($sn);
 
-        return $this->jsonSuccess(['status' => $trade->status]);
+        return $this->jsonSuccess(['status' => $trade['status']]);
     }
 
 }
diff --git a/app/Http/Web/Services/Trade.php b/app/Http/Web/Services/Trade.php
index c0d47370..2bf8898e 100644
--- a/app/Http/Web/Services/Trade.php
+++ b/app/Http/Web/Services/Trade.php
@@ -6,6 +6,7 @@ use App\Exceptions\BadRequest as BadRequestException;
 use App\Models\Trade as TradeModel;
 use App\Services\Frontend\Trade\TradeCreate as TradeCreateService;
 use App\Services\Pay\Alipay as AlipayService;
+use App\Services\Pay\Wxpay as WxpayService;
 
 class Trade extends Service
 {
@@ -39,12 +40,25 @@ class Trade extends Service
     }
 
     protected function getQrCodeUrl(TradeModel $trade)
+    {
+        $qrcodeUrl = null;
+
+        if ($trade->channel == TradeModel::CHANNEL_ALIPAY) {
+            $qrcodeUrl = $this->getAlipayQrCodeUrl($trade);
+        } elseif ($trade->channel == TradeModel::CHANNEL_WXPAY) {
+            $qrcodeUrl = $this->getWxpayQrCodeUrl($trade);
+        }
+
+        return $qrcodeUrl;
+    }
+
+    protected function getAlipayQrCodeUrl(TradeModel $trade)
     {
         $qrCodeUrl = null;
 
-        $alipayService = new AlipayService();
+        $service = new AlipayService();
 
-        $text = $alipayService->scan($trade);
+        $text = $service->scan($trade);
 
         if ($text) {
             $qrCodeUrl = $this->url->get(
@@ -56,4 +70,11 @@ class Trade extends Service
         return $qrCodeUrl;
     }
 
+    protected function getWxpayQrCodeUrl(TradeModel $trade)
+    {
+        $service = new WxpayService();
+
+        return $service->scan($trade);
+    }
+
 }
diff --git a/app/Http/Web/Views/course/order.volt b/app/Http/Web/Views/course/order.volt
index 62e9f62b..76e8d3c5 100644
--- a/app/Http/Web/Views/course/order.volt
+++ b/app/Http/Web/Views/course/order.volt
@@ -15,10 +15,10 @@
         <div class="layui-card-header">赞赏支持</div>
         <div class="layui-card-body">
             <div class="sidebar-order">
-                {% for option in reward_options %}
-                    {% set item_id = [course.id,option.id]|join('-') %}
+                {% for reward in rewards %}
+                    {% set item_id = [course.id,reward.id]|join('-') %}
                     {% set order_url = url({'for':'web.order.confirm'},{'item_id':item_id,'item_type':'reward'}) %}
-                    <a class="layui-btn layui-btn-xs reward-btn" href="{{ order_url }}">{{ option.title }}</a>
+                    <a class="layui-btn layui-btn-xs reward-btn" href="{{ order_url }}">{{ reward.title }}</a>
                 {% endfor %}
             </div>
         </div>
diff --git a/app/Http/Web/Views/order/pay.volt b/app/Http/Web/Views/order/pay.volt
index b953cd0e..0d0f01b9 100644
--- a/app/Http/Web/Views/order/pay.volt
+++ b/app/Http/Web/Views/order/pay.volt
@@ -2,14 +2,6 @@
 
 {% block content %}
 
-    {%- macro reward_course_card(reward) %}
-        <div>I am reward</div>
-    {%- endmacro %}
-
-    {%- macro vip_course_card(vip) %}
-        <div>I am vip</div>
-    {%- endmacro %}
-
     <div class="layui-breadcrumb breadcrumb">
         <a href="/">首页</a>
         <a><cite>支付订单</cite></a>
@@ -22,12 +14,79 @@
             支付金额：<span class="amount">￥{{ order.amount }}</span>
         </div>
         <div class="channel">
-            <a class="alipay" href="javascript:"></a>
-            <a class="wxpay" href="javascript:"></a>
+            {% set create_url = url({'for':'web.trade.create'}) %}
+            {% set status_url = url({'for':'web.trade.status'}) %}
+            <a class="alipay pay-btn" href="javascript:" data-channel="alipay"></a>
+            <a class="wxpay pay-btn" href="javascript:" data-channel="wxpay"></a>
         </div>
         <div class="footer">
             <span class="tips">友情提示：请在12小时内完成支付，有问题请联系客服</span>
         </div>
     </div>
 
+    <div id="alipay-qr-box" class="layui-hide"></div>
+    <div id="wxpay-qr-box" class="layui-hide"></div>
+
+    <div class="layui-hide">
+        <input type="hidden" name="trade_create_url" value="{{ url({'for':'web.trade.create'}) }}">
+        <input type="hidden" name="trade_status_url" value="{{ url({'for':'web.trade.status'}) }}">
+        <input type="hidden" name="forward_url" value="{{ url({'for':'web.course.list'}) }}">
+        <input type="hidden" name="order_sn" value="{{ order.sn }}">
+        <input type="hidden" name="alipay_trade_sn" value="">
+        <input type="hidden" name="wxpay_trade_sn" value="">
+    </div>
+
+{% endblock %}
+
+{% block inline_js %}
+
+    <script>
+        var $ = layui.jquery;
+        var layer = layui.layer;
+        var showQrLayer = function (title, content) {
+            layer.open({
+                type: 1,
+                id: 'pay-layer',
+                title: title,
+                content: content,
+                area: ['640px', '320px']
+            });
+        };
+        $('.pay-btn').on('click', function () {
+            var channel = $(this).attr('data-channel');
+            var createUrl = $('input[name=trade_create_url]').val();
+            var statusUrl = $('input[name=trade_status_url]').val();
+            var forwardUrl = $('input[name=forward_url]').val();
+            var orderSn = $('input[name=order_sn]').val();
+            var $qrBox = $('#' + channel + '-qr-box');
+            var $snInput = $('input[name=' + channel + '_trade_sn]');
+            var qrTitle = channel === 'alipay' ? '支付宝扫码支付' : '微信扫码支付';
+            var qrHtml = $qrBox.html();
+            if (qrHtml.length === 0) {
+                var postData = {order_sn: orderSn, channel: channel};
+                $.post(createUrl, postData, function (res) {
+                    qrHtml = '<div class="qrcode"><img src="' + res.qrcode_url + '" alt="支付二维码"></div>';
+                    showQrLayer(qrTitle, qrHtml);
+                    $qrBox.html(qrHtml);
+                    $snInput.html(res.sn);
+                    var interval = setInterval(function () {
+                        var queryData = {sn: res.sn};
+                        $.get(statusUrl, queryData, function (res) {
+                            if (res.status === 'finished') {
+                                clearInterval(interval);
+                                var html = '<div class="success-tips">支付成功</div>';
+                                $('#pay-layer').html(html);
+                                setTimeout(function () {
+                                    window.location.href = forwardUrl;
+                                }, 5000);
+                            }
+                        });
+                    }, 3000)
+                });
+            } else {
+                showQrLayer(qrTitle, qrHtml);
+            }
+        });
+    </script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/app/Models/ChapterUser.php b/app/Models/ChapterUser.php
index 5f832558..d3d027d1 100644
--- a/app/Models/ChapterUser.php
+++ b/app/Models/ChapterUser.php
@@ -14,6 +14,13 @@ class ChapterUser extends Model
      */
     public $id;
 
+    /**
+     * 计划编号(course_user主键)
+     *
+     * @var int
+     */
+    public $plan_id;
+
     /**
      * 课程编号
      *
diff --git a/app/Models/Learning.php b/app/Models/Learning.php
index 01b955e0..98029f41 100644
--- a/app/Models/Learning.php
+++ b/app/Models/Learning.php
@@ -27,6 +27,13 @@ class Learning extends Model
      */
     public $request_id;
 
+    /**
+     * 计划编号(course_user主键)
+     *
+     * @var int
+     */
+    public $plan_id;
+
     /**
      * 课程编号
      *
diff --git a/app/Services/Frontend/My/OrderList.php b/app/Services/Frontend/My/OrderList.php
index 090ab922..b0bc30d3 100644
--- a/app/Services/Frontend/My/OrderList.php
+++ b/app/Services/Frontend/My/OrderList.php
@@ -59,7 +59,6 @@ class OrderList extends FrontendService
                 'item_id' => $order['item_id'],
                 'item_type' => $order['item_type'],
                 'item_info' => $order['item_info'],
-                'source_type' => $order['source_type'],
                 'create_time' => $order['create_time'],
             ];
         }
diff --git a/app/Services/Frontend/Order/OrderCreate.php b/app/Services/Frontend/Order/OrderCreate.php
index f7a5ddd7..e4f20f2c 100644
--- a/app/Services/Frontend/Order/OrderCreate.php
+++ b/app/Services/Frontend/Order/OrderCreate.php
@@ -38,13 +38,7 @@ class OrderCreate extends FrontendService
         /**
          * 存在新鲜的未支付订单直接返回（减少订单记录）
          */
-        if ($order) {
-            $caseA = $order->status == OrderModel::STATUS_PENDING;
-            $caseB = time() - $order->create_time < 12 * 3600;
-            if ($caseA && $caseB) {
-                return $order;
-            }
-        }
+        if ($order) return $order;
 
         if ($post['item_type'] == OrderModel::ITEM_COURSE) {
 
@@ -83,7 +77,7 @@ class OrderCreate extends FrontendService
         return $order;
     }
 
-    public function createCourseOrder(CourseModel $course, UserModel $user)
+    protected function createCourseOrder(CourseModel $course, UserModel $user)
     {
         $itemInfo = [];
 
@@ -105,7 +99,7 @@ class OrderCreate extends FrontendService
         return $order;
     }
 
-    public function createPackageOrder(PackageModel $package, UserModel $user)
+    protected function createPackageOrder(PackageModel $package, UserModel $user)
     {
         $packageRepo = new PackageRepo();
 
@@ -140,7 +134,7 @@ class OrderCreate extends FrontendService
         return $order;
     }
 
-    public function createVipOrder(VipModel $vip, UserModel $user)
+    protected function createVipOrder(VipModel $vip, UserModel $user)
     {
         $baseTime = $user->vip_expiry_time > time() ? $user->vip_expiry_time : time();
         $expiryTime = strtotime("+{$vip->expiry} months", $baseTime);
@@ -169,7 +163,7 @@ class OrderCreate extends FrontendService
         return $order;
     }
 
-    public function createRewardOrder(CourseModel $course, RewardModel $reward, UserModel $user)
+    protected function createRewardOrder(CourseModel $course, RewardModel $reward, UserModel $user)
     {
         $itemInfo = [
             'course' => $this->handleCourseInfo($course),
diff --git a/app/Validators/Order.php b/app/Validators/Order.php
index 5057f023..bf7498dd 100644
--- a/app/Validators/Order.php
+++ b/app/Validators/Order.php
@@ -145,7 +145,7 @@ class Order extends Validator
     {
         $orderRepo = new OrderRepo();
 
-        $itemType = OrderModel::ITEM_PACKAGE;
+        $itemType = OrderModel::ITEM_COURSE;
 
         $order = $orderRepo->findUserLastFinishedOrder($userId, $courseId, $itemType);
 
@@ -156,7 +156,7 @@ class Order extends Validator
              */
             $itemInfo = $order->item_info;
 
-            if ($itemInfo['course']['expiry_time'] > time()) {
+            if ($itemInfo['course']['study_expiry_time'] > time()) {
                 throw new BadRequestException('order.has_bought_course');
             }
         }
diff --git a/app/Validators/Trade.php b/app/Validators/Trade.php
index 1203a030..57707d5e 100644
--- a/app/Validators/Trade.php
+++ b/app/Validators/Trade.php
@@ -48,6 +48,8 @@ class Trade extends Validator
         if (!isset($list[$channel])) {
             throw  new BadRequestException('trade.invalid_channel');
         }
+
+        return $channel;
     }
 
     public function checkIfAllowClose(TradeModel $trade)
diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css
index 634d5759..83227403 100644
--- a/public/static/admin/css/common.css
+++ b/public/static/admin/css/common.css
@@ -158,6 +158,7 @@ img.kg-cover {
 img.kg-qrcode {
     width: 140px;
     height: 140px;
+    border: 3px dashed #ccc;
 }
 
 .kg-order-date {
diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css
index 3c63738c..8a8b1235 100644
--- a/public/static/web/css/common.css
+++ b/public/static/web/css/common.css
@@ -692,7 +692,6 @@ body {
 }
 
 .cart-stats .pay-amount {
-    color: red;
     font-size: 18px;
     font-weight: 700;
 }
@@ -726,7 +725,7 @@ body {
 
 .payment .channel {
     margin-top: 50px;
-    margin-bottom: 40px;
+    margin-bottom: 80px;
     text-align: center;
 }
 
@@ -750,7 +749,6 @@ body {
     background-position: center center;
 }
 
-
 .payment .footer {
     text-align: center;
 }
@@ -760,6 +758,25 @@ body {
     font-size: 12px;
 }
 
+#pay-layer {
+    padding-top: 50px;
+}
+
+#pay-layer .qrcode {
+    text-align: center;
+}
+
+#pay-layer .qrcode img {
+    width: 160px;
+    height: 160px;
+    border: 3px dashed #ccc;
+}
+
+#pay-layer .success-tips {
+    color: green;
+    text-align: center;
+}
+
 .verify-tips-btn {
     color: green;
 }