Merge branch 'hotfix/test_order' into release

Application/Admin/Controller/TestOrderController.class.php

@@ -47,7 +47,7 @@ class TestOrderController extends ThinkController
             $timeend = strtotime($_REQUEST['timeend'])+86399;
             $map['pay_time'] = array("ELT",$timeend);
         }
-        $order_list = M('test_order', 'tab_')->where($map)->page($page,$row)->select();
+        $order_list = M('test_order', 'tab_')->where($map)->page($page,$row)->order('add_time desc')->select();
         $sum_order_amount = M('test_order', 'tab_')->where($map)->field('sum(order_amount) as sum_order_amount,count(1) as count')->find();
         $sum_pay_amount = M('test_order', 'tab_')->where($map)->field('sum(pay_amount) as sum_order_amount')->find();
 
@@ -76,12 +76,18 @@ class TestOrderController extends ThinkController
         $data['pay_time'] = strtotime($data['pay_time']);
         $data['game_name'] = get_gamename($data['game_id']);
 
+        $is_exist = M('test_order','tab_')->where(['order_no'=>$data['order_no'],'cp_order_no'=>$data['cp_order_no']])->find();
+
+        if ($is_exist) {
+            $this->ajaxReturn(['status'=>0,'msg'=>'订单重复录入']);
+        }
+
         $isSuccess = M('test_order','tab_')->add($data);
 
         if ($isSuccess) {
-            $this->ajaxReturn(['status'=>1]);
+            $this->ajaxReturn(['status'=>1,'msg'=>'订单录入成功']);
         } else {
-            $this->ajaxReturn(['status'=>0]);
+            $this->ajaxReturn(['status'=>0,'msg'=>'订单录入失败']);
         }
 
     }

Application/Admin/View/TestOrder/addOrder.html

@@ -277,7 +277,7 @@
                 if (data.status == 1) {
                     window.parent.reload();
                 } else {
-                    layer.msg("测试订单录入失败");
+                    layer.msg(data.msg);
                 }
 
             }

Application/Admin/View/TestOrder/lists.html

@@ -148,7 +148,7 @@
         <notemtpy name = "datas">
           <volist name="datas" id="data">
             <tr>
-              <td ><if condition="data['order_type'] eq '1'">测试内网<else/>测试外网</if></td>
+              <td ><if condition="$data.server_type eq 1">测试内网<else/>测试外网</if></td>
               <td >{$data.order_type|get_order_type}</td>
               <td >{$data.order_no}</td>
               <td >{$data.cp_order_no}</td>
@@ -194,6 +194,9 @@
   <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
   <script type="text/javascript">
     $(".select_gallery").select2();
+    function reload() {
+      window.location.reload();
+    }
     $(function(){
 
       $('.page a').click(function () {