Merge branch 'dev' into test

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -267,7 +267,7 @@ public class AdamRdmService {
     }
 
     public AdamEntersVo getEntersVoByUidEntersId(List<AdamEntersVo> vos, String entersId) {
-        if (CollectionUtils.isEmpty(vos)) {
+        if (!CollectionUtils.isEmpty(vos)) {
             return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
         }
         return null;
@@ -327,7 +327,7 @@ public class AdamRdmService {
     }
 
     public AdamAddressesVo getAddressesVoByUidAddressesId(List<AdamAddressesVo> vos, String addressesId) {
-        if (CollectionUtils.isEmpty(vos)) {
+        if (!CollectionUtils.isEmpty(vos)) {
             return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
         }
         return null;

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

@@ -850,7 +850,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
 
                 // 大麦回调
-                sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
+//                sycDamaiOrder(orderTickets.getOrderTicketsId(), orderTicketData.getIsMember());
             }
             log.info(UserPathDto.setData("订单支付成功回调", syncOrderParam, ""));
             return "success";