Merge branch 'pre' into 'master'

Pre

See merge request !115

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/tools/ToolsBaseController.java

@@ -79,7 +79,7 @@ public class ToolsBaseController extends BaseController {
             return error("查无订单");
         }
         ExcelUtil<OrderExportVo> util = new ExcelUtil(OrderExportVo.class);
-        return util.exportExcel(list, list.get(0).getPerformanceTitle() + "-" + mobileType);
+        return util.exportExcel(list,  mobileType+"");
     }
 
     /**

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -9,7 +9,7 @@
         height: 400px;
     }
     .img-Approval{
-        width-max:300px;
+        max-width:300px;
         height: 400px;
     }
 </style>

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

@@ -30,7 +30,7 @@
                             <label>申请退款类型：</label>
                             <select name="type">
                                     <option value="">全部</option>
-                                    <option value="0">客服申请</option>
+                                    <option value="4">客服申请</option>
                                     <option value="1">超时退款</option>
                                     <option value="2">用户申请普通退款</option>
                                     <option value="3">用户申请快递退款</option>

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 
 # end-dev-这里是配置信息基本值
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderRefundsMapper.xml

@@ -88,9 +88,12 @@
                 <if test="orderTicketsId!=''">
                     AND a.order_tickets_id = #{orderTicketsId}
                 </if>
-                <if test="type!=''">
+                <if test="type!='' and type != 4">
                     AND a.type = #{type}
                 </if>
+                <if test="type!='' and type == 4">
+                    AND a.type = 0
+                </if>
                 <choose>
                     <when test="roleType!=''">
                         <if test="roleType == 1">

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-adam/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 
 # end-dev-这里是配置信息基本值
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 
 # end-dev-这里是配置信息基本值
 

liquidnet-bus-service/liquidnet-service-notify/liquidnet-service-notify-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 
 # end-dev-这里是配置信息基本值
 

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 
 # end-dev-这里是配置信息基本值
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 
 # end-test-这里是配置信息基本值
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/bootstrap-test.yml

@@ -6,11 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    #host: 172.17.207.177:7001
-    instance:
-      prefer-ip-address: true
+    host: 172.17.207.177:7001
+    #instance:
+    #  prefer-ip-address: true
     #host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
-    host: 192.168.193.41:7001
+    #host: 192.168.193.41:7001
 
 # end-dev-这里是配置信息基本值