Merge branch 'dev' into test

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberMapper.xml

@@ -69,13 +69,37 @@
                amo.payment_at,
                amo.created_at,
                au.mobile,
-               amo.source
+               amo.source,
+               amo.mode
         from adam_member_order amo
                  inner join adam_user_member aum
                             on amo.uid = aum.uid
                  inner join adam_user au on aum.uid = au.uid
         <where>
-        <if test="userId != null  and userId != ''">and kot.user_id = #{userId}</if>
+            <if test="orderNo != null  and orderNo != ''">
+               and amo.order_no = #{orderNo}
+            </if>
+            <if test="mobile != null  and mobile != ''">
+                and au.mobile = #{mobile}
+            </if>
+            <if test="payType != null  and payType != ''">
+                and amo.pay_type = #{payType}
+            </if>
+            <if test="state != null  and state != ''">
+                and amo.state = #{state}
+            </if>
+            <if test="mode != null  and mode != ''">
+                and amo.mode = #{mode}
+            </if>
+            <if test="source != null  and source != ''">
+                and amo.source = #{source}
+            </if>
+            <if test="paymentAtStart != null  and paymentAtStart != ''">
+                and amo.payment_at &gt; #{paymentAtStart}
+            </if>
+            <if test="paymentAtEnd != null  and paymentAtEnd != ''">
+                and amo.payment_at &lt; #{paymentAtEnd}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -1016,7 +1016,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
     @Override
     public boolean checkOrderTime(String userId) {
-        String lock = "order_lock:checkOrderTime:" + userId;
+        String lock = "orders_lock:checkOrderTime:" + userId;
         if (redisLockUtil.tryLock(lock, 1, 3600)) {
             try {
                 List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
@@ -1111,8 +1111,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                     redisLockUtil.unlock(lock);
 
-                    Thread thread = new Thread(new Runnable(){
-                        public void run(){
+                    Thread thread = new Thread(() -> {
                         //redis 列表
                         orderIdList.forEach(t -> {
                             String orderTicketId = t.split(",")[0];
@@ -1126,7 +1125,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                                 dataUtils.changeBuyInfo(items.getUserId(), items.getEnterIdCode(), items.getPerformanceId(), items.getTicketId(), -1);
                             }
                         });
-                        }});
+                    });
                     thread.start();
                 }