Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/logback.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
+    <!-- 设置路径-->
+    <springProperty scope="context" name="logPath" source="liquidnet.logfile.path"/>
+
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/data/logs/client-admin-web" />
+	<property name="log.path" value="${logPath}/client-admin-web" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -376,7 +376,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             currentTime = System.currentTimeMillis();
             AdamAddressesVo addressesVo = orderUtils.getAddress(uid, payOrderParam.getAddressId());//feignAdamBaseClient.queryAddresses(payOrderParam.getAddressId(), uid).getData();
             orderTickets.setExpressContacts(addressesVo.getName());
-            orderTickets.setExpressAddress(addressesVo.getProvince()+addressesVo.getCity()+addressesVo.getCounty()+addressesVo.getAddress());
+            orderTickets.setExpressAddress(addressesVo.getProvince() + addressesVo.getCity() + addressesVo.getCounty() + addressesVo.getAddress());
             orderTickets.setExpressPhone(addressesVo.getPhone());
             orderTickets.setGetTicketType("express");
             currentTime = System.currentTimeMillis() - currentTime;
@@ -728,7 +728,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 LinkedList<Object[]> sqlsDataD = new LinkedList<>();
                 sqlsDataD.add(new Object[]{orderTickets.getUpdatedAt(), orderTickets.getOrderTicketsId(), strTime, strTime});
 
-                String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC,sqlsDataD);
+                String sqlData = SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD);
                 rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN, MQConst.ROUTING_KEY_SQL_ORDER_AGAIN, sqlData);
                 log.info(UserPathDto.setData("再次支付", payAgainParam, payResultVo));
                 return ResponseDto.success(payResultVo);
@@ -918,15 +918,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                                 DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
                                 DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
                         ));
-                    }catch (Exception e){
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
-                    log.debug("item.getOverdueAt() = "+ item.getOverdueAt());
-                    log.debug("DateUtil.getNowTime() = "+ DateUtil.getNowTime());
+                    log.debug("item.getOverdueAt() = " + item.getOverdueAt());
+                    log.debug("DateUtil.getNowTime() = " + DateUtil.getNowTime());
                 } else {
                     item.setRestTime(0L);
                 }
-                if (voList.size() >= 40) {
+                if (i >= 40) {
                     break;
                 }
             }
@@ -981,7 +981,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketVo.setFieldName(performanceVo.getFieldName());
                 if (ticketVo.getIsShowCode() == 1) {
                     Date date = DateUtil.parse(ticketVo.getQrCodeShowTime(), DateUtil.Formatter.yyyyMMddHHmm.toString());
-                    if (DateUtil.compareDay(DateUtil.now(),date ) >= 0) {
+                    if (DateUtil.compareDay(DateUtil.now(), date) >= 0) {
                         orderTicketVo.setQrCode(orderTicketVo.getQrCode());
                     } else {
                         orderTicketVo.setQrCode("");