Merge branch 'dev' into test

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

@@ -117,7 +117,7 @@
                     <div class="cell" th:text="${@dict.getLabel('zhengzai_ticket_type',respBean.type)}">0</div>
                 </td>
                 <td>
-                    <div class="cell" th:text="${respBean.useStart} - ${respBean.useEnd}">2021-03-06</div>
+                    <div class="cell" >[[${respBean.useStart}]] - [[${respBean.useEnd}]]</div>
                 </td>
                 <td>
                     <div class="cell" th:text="${respBean.saleGeneral}">0</div>

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

@@ -51,11 +51,6 @@ public class KylinRefundExecuteServiceImpl {
 
     @Async
     public void refundBatchApply(String targetId, String refundBatchId, String reason) {
-        // TODO: 2021/6/20  sleepTest
-        try {
-            Thread.sleep(5000);
-        } catch (Exception e) {}
-
         RefundApplyParam refundApplyParam = new RefundApplyParam();
         int count;
         int limitNum = 10;
@@ -97,11 +92,6 @@ public class KylinRefundExecuteServiceImpl {
 
     @Async
     public void refundBatchStatus(RefundBatchApplyParam refundBatchApplyParam, String type) {
-        // TODO: 2021/6/20  sleepTest
-        try {
-            Thread.sleep(5000);
-        } catch (Exception e) {}
-
         String refundBatchId = refundBatchApplyParam.getRefundBatchId();
         Integer status = refundBatchApplyParam.getRefundStatus();
         // 处理查询订单状态

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

@@ -1236,7 +1236,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             List<KylinOrderRefundsVoBase> orderRefundsVoList = dataUtils.getOrderRefundVoByOrderId(orderTicketsId);
             for (KylinOrderRefundsVoBase item : orderRefundsVoList) {
                 int status = item.getStatus();
-                if (status != 2 && status != 4 && status != 6) {
+                if (status != 2 && status != 4 && status != 6 && !item.getOrderRefundsId().equals(orderRefundsId)) {
                     refundingCount += 1;
                 }
             }

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

@@ -290,7 +290,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         Query query = new BasicQuery(queryObject);
         /*String nowTimeStr = DateUtil.getNowTime();
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));*/
-        query.addCriteria(Criteria.where("appStatus").in(3, 6, 8, 9, 10));
+        query.addCriteria(Criteria.where("appStatus").in(6, 8, 9, 10));
 
         long count = mongoTemplate.count(query, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 

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

@@ -106,7 +106,7 @@ public class KylinRefundsStatusServiceImpl {
         LinkedList<Object[]> sqlsDataB = new LinkedList<>();
         for (String v : ticketEntityIds) {
             sqlsDataB.add(new Object[]{
-                    entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), v
+                    entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), v, orderInfo.getChangeDate(), orderInfo.getChangeDate()
             });
             /*kylinOrderTicketEntitiesMapper.update(entitiesTable, new UpdateWrapper<KylinOrderTicketEntities>()
                     .eq("order_ticket_entities_id", v));*/
@@ -182,7 +182,7 @@ public class KylinRefundsStatusServiceImpl {
         sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
 
         sqlsDataA.add(new Object[]{
-                orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId()
+                orderStatusTable.getStatus(), orderStatusTable.getUpdatedAt(), orderInfo.getOrderTicketsId(), orderInfo.getChangeDate(), orderInfo.getChangeDate()
         });
 
         sqlsDataC.add(new Object[]{

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

@@ -564,7 +564,7 @@ public class DataUtils {
         LocalDateTime nowTime = LocalDateTime.now();
         String nowTimeStr = DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime);
         query.addCriteria(Criteria.where("timeEnd").gte(nowTimeStr));
-        query.addCriteria(Criteria.where("appStatus").in(3, 6, 8, 9, 10));
+        query.addCriteria(Criteria.where("appStatus").in(6, 8, 9, 10));
         query.addCriteria(Criteria.where("isShow").is(1));
         return query;
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -45,8 +45,8 @@ kylin_order_ticket_entities.withDraw=UPDATE kylin_order_ticket_entities SET is_p
 kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_at = ?  WHERE order_refunds_id = ?
 
 # ------------------------超时支付申请退款----------------------------
-kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ?
-kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ?
+kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DMRdmService.java

@@ -30,6 +30,13 @@ public class DMRdmService {
     @Autowired
     RedisUtil redisUtil;
 
+    public Integer getSwitch(String rk) {
+        Integer i = (Integer) redisUtil.get(rk);
+        return null == i ? 1 : i;
+    }
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <Mobile｜OPENID, UID> */
+
     public boolean setUidByMobile(String mobile, String uid) {
         return redisUtil.set(AdamRedisConst.IDENTITY_MOBILE.concat(mobile), uid);
     }
@@ -84,6 +91,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId);
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, USER_INFO> */
+
     public boolean setUserInfoVoByUid(String uid, AdamUserInfoVo vo) {
         return redisUtil.set(AdamRedisConst.INFO_USER.concat(uid), vo);
     }
@@ -108,6 +117,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.INFO_USER.concat(uid));
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, REAL_INFO> */
+
     public boolean setRealInfoVoByUid(String uid, AdamRealInfoVo vo) {
         return redisUtil.set(AdamRedisConst.INFO_REAL_NAME.concat(uid), vo);
     }
@@ -132,6 +143,8 @@ public class DMRdmService {
         return vo;
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <ID_TYPE+ID_NO, ID_NAME> */
+
     public boolean setCertification(int idType, String idNo, String idName) {
         return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName);
     }
@@ -141,6 +154,8 @@ public class DMRdmService {
         return !StringUtils.isEmpty(o) && o.equals(idName);
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, List<AdamThirdPartInfoVo>> */
+
     public boolean setThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> voList) {
         return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY.concat(uid), voList);
     }
@@ -178,6 +193,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.INFO_THIRD_PARTY.concat(uid));
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, List<AdamEntersVo>> */
+
     public boolean setEntersVoByUid(String uid, List<AdamEntersVo> list) {
         return redisUtil.set(AdamRedisConst.INFO_ENTERS.concat(uid), list);
     }
@@ -213,6 +230,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.INFO_ENTERS.concat(uid));
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, List<AdamAddressesVo>> */
+
     public boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list) {
         return redisUtil.set(AdamRedisConst.INFO_ADDRESSES.concat(uid), list);
     }
@@ -243,6 +262,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.INFO_ADDRESSES.concat(uid));
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | List<购买会员黑名单UID> */
+
     public boolean setBlacklistForMember(List<String> uids) {
         return redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, uids);
     }
@@ -251,6 +272,8 @@ public class DMRdmService {
         return (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID);
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, USER_MEMBER> */
+
     public boolean setUserMemberVoByUid(String uid, AdamUserMemberVo vo) {
         return redisUtil.set(AdamRedisConst.INFO_USER_MEMBER.concat(uid), vo);
     }
@@ -277,6 +300,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.INFO_USER_MEMBER.concat(uid));
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_SIMPLE_INFO> */
+
     public AdamMemberSimpleVo getMemberSimpleVo() {
         AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE);
         if (null == vo) {
@@ -294,6 +319,8 @@ public class DMRdmService {
         return vo;
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_ID, MEMBER_INFO> */
+
     public boolean setMemberVoByMemberId(String memberId, AdamMemberVo vo) {
         return redisUtil.set(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId), vo);
     }
@@ -319,6 +346,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId));
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_ID, List<AdamMemberPriceVo>> */
+
     public boolean setMemberPriceVoByMemberId(String memberId, List<AdamMemberPriceVo> vos) {
         return redisUtil.set(AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId), vos);
     }
@@ -358,6 +387,8 @@ public class DMRdmService {
         return null;
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_ID, List<AdamMemberRightsVo>> */
+
     public boolean setMemberRightsVoByMemberId(String memberId, List<AdamMemberRightsVo> vos) {
         return redisUtil.set(AdamRedisConst.INFO_MEMBER_RIGHTS.concat(memberId), vos);
     }
@@ -380,6 +411,8 @@ public class DMRdmService {
         return vos;
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | MEMBER_AGREEMENT */
+
     public String getMemberAgreement() {
         String val = (String) redisUtil.get(AdamRedisConst.INFO_MEMBER_AGREEMENT);
         if (StringUtils.isEmpty(val)) {
@@ -390,6 +423,8 @@ public class DMRdmService {
         return val;
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <ORDER_NO, MEMBER_ORDER_INFO> */
+
     public boolean setShotMemberOrderVoByOrderNo(String orderNo, AdamMemberOrderVo vo) {
         return redisUtil.set(AdamRedisConst.SHOT_MEMBER_ORDER + orderNo, vo);
     }
@@ -416,6 +451,8 @@ public class DMRdmService {
         redisUtil.del(AdamRedisConst.SHOT_MEMBER_ORDER + orderNo);
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | INCR_MEMBER_NO */
+
     public boolean setMaxMemberNo(int val) {
         return redisUtil.set(AdamRedisConst.INCR_MEMBER_NO, val);
     }
@@ -429,6 +466,8 @@ public class DMRdmService {
         return null == o ? -1 : (int) o;
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_CODE, MEMBER_CODE_INFO> */
+
     public boolean setMemberCodeVoByCode(String memberCode, AdamMemberCodeVo vo) {
         return redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode), vo);
     }
@@ -450,6 +489,12 @@ public class DMRdmService {
         return vo;
     }
 
+    public void delMemberCodeVoByCode(String memberCode) {
+        redisUtil.del(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode));
+    }
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
+
     /**
      * Temporarily connect Mongo
      */
@@ -464,9 +509,7 @@ public class DMRdmService {
         return vo;
     }
 
-    public void delMemberCodeVoByCode(String memberCode) {
-        redisUtil.del(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode));
-    }
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | TAGS:List<AdamTagVo> */
 
     public boolean setTagsForSex(List<AdamTagVo> voList) {
         return redisUtil.set(AdamRedisConst.INFO_TAGS_SEX, voList);
@@ -484,6 +527,24 @@ public class DMRdmService {
         return (List<AdamTagParentVo>) redisUtil.get(AdamRedisConst.INFO_TAGS_MUSIC);
     }
 
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
+
+
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
+
+
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
+
+
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
+
+
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |  */
+
 
 
     /* ========================================================== | Other micro-service data inquiry */

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DataMigrationProcessorService.java

@@ -31,7 +31,7 @@ public abstract class DataMigrationProcessorService {
     @Autowired
     public MongoTemplate mongoTemplate;
     @Autowired
-    public DMRdmService DMRdmService;
+    public DMRdmService dmRdmService;
     @Autowired
     public AdamUserMapper userMapper;
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMCollectionProcessor.java

@@ -23,12 +23,6 @@ import java.util.List;
 @Slf4j
 @Service
 public class DMCollectionProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMCollectionService dmCollectionService;
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java

@@ -23,12 +23,6 @@ import java.util.List;
 @Slf4j
 @Service
 public class DMEntersProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMEntersService dmEntersService;
 
@@ -99,7 +93,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
                         vos.add(vo);
 
                         if (enters.getType() == 1) {
-                            DMRdmService.setCertification(1, enters.getIdCard(), enters.getName());
+                            dmRdmService.setCertification(1, enters.getIdCard(), enters.getName());
                         }
                     }
                     if (entersList.size() == 500 || (entersList.size() > 0 && smFlg)) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberCodeProcessor.java

@@ -25,12 +25,6 @@ import java.util.Map;
 @Slf4j
 @Service
 public class DMMemberCodeProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMMemberCodeService dmMemberCodeService;
 
@@ -254,7 +248,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
                     vos.add(vo);
 
                     if (memberCode.getState() == 0) {
-                        DMRdmService.setMemberCodeVoByCode(memberCode.getCode(), vo);
+                        dmRdmService.setMemberCodeVoByCode(memberCode.getCode(), vo);
                     }
 //                }
                     if (memberCodeList.size() == 500) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberOrderProcessor.java

@@ -25,12 +25,6 @@ import java.util.Map;
 @Slf4j
 @Service
 public class DMMemberOrderProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMMemberOrderService dmMemberOrderService;
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMRealNameProcessor.java

@@ -23,12 +23,6 @@ import java.util.List;
 @Slf4j
 @Service
 public class DMRealNameProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMRealNameService dmRealNameService;
 
@@ -102,7 +96,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                         realNameList.add(realName);
                         vos.add(vo);
 
-                        DMRdmService.setCertification(1, realName.getIdCard(), realName.getName());
+                        dmRdmService.setCertification(1, realName.getIdCard(), realName.getName());
                     }
                     if (realNameList.size() == 500 || (realNameList.size() > 0 && smFlg)) {
                         tl += realNameList.size();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java

@@ -25,12 +25,6 @@ import java.util.List;
 @Slf4j
 @Service
 public class DMThirdPartsProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMThirdPartyService dmThirdPartyService;
 
@@ -112,7 +106,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                         vos.add(vo);
 
                         if (currentYear.isBefore(createdAt)) {
-                            DMRdmService.setUidByPlatformOpenId(thirdParty.getPlatform(), thirdParty.getOpenId(), uid);
+                            dmRdmService.setUidByPlatformOpenId(thirdParty.getPlatform(), thirdParty.getOpenId(), uid);
                         }
                     }
                     if (thirdPartyList.size() == 500 || (thirdPartyList.size() > 0 && smFlg)) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMTracesInfoProcessor.java

@@ -6,15 +6,12 @@ import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
 import com.liquidnet.service.adam.mapper.AdamMemberPriceMapper;
-import com.liquidnet.service.adam.mapper.AdamUserMapper;
-import com.liquidnet.service.platform.service.impl.adam.dm.DMRdmService;
 import com.liquidnet.service.platform.service.impl.adam.dm.DataMigrationProcessorService;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
@@ -23,17 +20,13 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 
 @Slf4j
 @Service
 public class DMTracesInfoProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     AdamMemberMapper memberMapper;
     @Autowired
@@ -50,6 +43,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
         }
         this.memberCardInfoHandler();
         this.memberCardPriceHandler();
+        this.userMemberBlackListHandler();
     }
 
     @SneakyThrows
@@ -63,7 +57,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             Class.forName(DB_DRIVER);
             connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
-
+            log.info("DM.execute ----------------------------> start.sql:{}", sql);
             statement = connection.prepareStatement(sql);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -91,11 +85,13 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             AdamMemberVo vo = AdamMemberVo.getNew().copy(o);
 
-            DMRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
+            dmRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
 
             memberMapper.insert(o);
             mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
 
+            log.info("DM.execute ----------------------------> end");
+
             row.close();
             statement.close();
             connection.close();
@@ -126,9 +122,8 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 //        1-id,2-vip_card_id,3-status,4-name,5-price,6-days,7-detail,8-created_at,9-updated_at
 
             Class.forName(DB_DRIVER);
-//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
-            String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
-            connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            log.info("DM.execute ----------------------------> start.sql:{}", sql);
             statement = connection.prepareStatement(sql);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -147,10 +142,58 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             AdamMemberPriceVo vo = AdamMemberPriceVo.getNew().copy(o);
 
-            DMRdmService.setMemberPriceVoByMemberId(vo.getMemberId(), Collections.singletonList(vo));
+            dmRdmService.setMemberPriceVoByMemberId(vo.getMemberId(), Collections.singletonList(vo));
 
             memberPriceMapper.insert(o);
             mongoTemplate.insert(vo, AdamMemberPriceVo.class.getSimpleName());
+
+            log.info("DM.execute ----------------------------> end");
+
+            row.close();
+            statement.close();
+            connection.close();
+        } catch (Exception throwables) {
+            throwables.printStackTrace();
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
+    }
+
+    @SneakyThrows
+    private void userMemberBlackListHandler() {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
+            String sql = "select distinct uid from vip_black_list_record where status=0 and uid is not null and uid<>''";
+
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sql);
+            row = (ResultSetImpl) statement.executeQuery();
+            log.info("DM.execute ----------------------------> start.sql:{}", sql);
+
+            List<String> userMemberBlackList = new ArrayList<>();
+            while (row.next()) {
+                userMemberBlackList.add(row.getString(1));
+            }
+
+            boolean rst = dmRdmService.setBlacklistForMember(userMemberBlackList);
+
+            log.info("DM.execute ----------------------------> end.counts:{} - {}", userMemberBlackList.size(), rst);
+            row.close();
+            statement.close();
+            connection.close();
         } catch (Exception throwables) {
             throwables.printStackTrace();
         }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -32,12 +32,6 @@ import java.util.Map;
 @Slf4j
 @Service
 public class DMUserInformationProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMUserService dmUserService;
     @Autowired
@@ -150,7 +144,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
 
                         if (StringUtils.length(mobile) == 11 &&
                                 (currentYear.isBefore(createdAt) || currentYear.isBefore(updatedAt))) {
-                            DMRdmService.setUidByMobile(mobile, uid);
+                            dmRdmService.setUidByMobile(mobile, uid);
                         }
                     }
                     if (userList.size() == 500 || (userList.size() > 0 && smFlg)) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserMemberProcessor.java

@@ -23,12 +23,6 @@ import java.util.List;
 @Slf4j
 @Service
 public class DMUserMemberProcessor extends DataMigrationProcessorService {
-//    @Autowired
-//    MongoTemplate mongoTemplate;
-//    @Autowired
-//    DMRdmService DMRdmService;
-//    @Autowired
-//    AdamUserMapper userMapper;
     @Autowired
     DMUserMemberService dmUserMemberService;
 
@@ -103,7 +97,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                         userMemberList.add(userMember);
                         vos.add(vo);
 
-                        DMRdmService.setUserMemberVoByUid(uid, vo);
+                        dmRdmService.setUserMemberVoByUid(uid, vo);
                     }
                     if (userMemberList.size() == 500 || (userMemberList.size() > 0 && smFlg)) {
                         tl += userMemberList.size();