Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -174,13 +174,14 @@ public class KylinOrderRefundAdminController extends BaseController {
             }
         } catch (Exception e) {
             String message = e.getMessage();
-            String[] msg = e.getMessage().split(" ");
+            return error(message);
+            /*String[] msg = e.getMessage().split(" ");
             if (msg.length>0 && null != msg[3]) {
                 String msgStr = UnicodeUtil.toString(msg[3]);
                 Map msgMap = JsonUtils.fromJson(msgStr.replace("[", "").replace("]", ""), Map.class);
                 message = msgMap.get("message").toString();
             }
-            return error(message);
+            return error(message);*/
         }
     }
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/applyView.html

@@ -175,8 +175,16 @@
         var reason = $('#form-post-add').find("[name='reason']").val();
         var orderTicketsId = $('#form-post-add').find("[name='orderTicketsId']").val();
         var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);
-        if (!orderTicketsId || !reason || rows.length <= 0) {
-            layer.msg("请完善数据");
+        if (!orderTicketsId) {
+            layer.msg("订单id有误");
+            return false;
+        }
+        if (rows.length <= 0) {
+            layer.msg("请选择需要退款的入场人订单");
+            return false;
+        }
+        if (!reason) {
+            layer.msg("请填写备注");
             return false;
         }
         if ($.validate.form()) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refundBatch/applyView.html

@@ -133,8 +133,12 @@
 		function submitHandler() {
 			var reason = $('#form-post-add').find("[name='reason']").val();
 			var targetId = $('#form-post-add').find("[name='targetId']").val();
-			if (!targetId || !reason) {
-				layer.msg("请完善数据");
+			if (!targetId) {
+				layer.msg("演出id有误");
+				return false;
+			}
+			if (!reason) {
+				layer.msg("请填写备注");
 				return false;
 			}
 			if ($.validate.form()) {