Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinDamaiServiceImpl.java

@@ -205,10 +205,9 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
             AlibabaDamaiMevOpenBatchpushticketRequest req = new AlibabaDamaiMevOpenBatchpushticketRequest();
             List<ThirdTicketPushOpenParam> list2 = new ArrayList<>();
             List<OrderPushDamaiDto> data = orderTicketsMapper.pushDamaiDetailsList(ticketsId);
-
+            log.info("FOREACH STEP 1 = "+ticketsId);
             for (int i = 0; i < data.size(); i++) {
                 OrderPushDamaiDto item = data.get(i);
-                log.info("FOREACH STEP 1 = "+ticketsId);
                 log.info("FOREACH STEP 2 = "+item.getStatus());
                 ThirdTicketPushOpenParam obj3 = new ThirdTicketPushOpenParam();
                 long orderTicketEntitiesKey = 0l;

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

@@ -153,8 +153,9 @@ public class AdamUserServiceImpl implements IAdamUserService {
             initThirdPartObjs.add(new Object[]{thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()});
 
             s = System.currentTimeMillis();
-            adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), uid);
-            adamRdmService.setUidByMobile(param.getMobile(), uid);
+            adamRdmService.addThirdPartVoListByUid(thirdPartInfoVo.getUid(), null, thirdPartInfoVo);
+            adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), thirdPartInfoVo.getUid());
+            adamRdmService.setUidByMobile(param.getMobile(), thirdPartInfoVo.getUid());
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
             s = System.currentTimeMillis();