DM;

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

@@ -153,7 +153,14 @@ public class AdamMemberOrderController {
         return "success";
     }
 
-    @ApiOperationSupport(order = 3)
+//    @ApiOperationSupport(order = 3)
+//    @ApiOperation(value = "会员码详情")
+//    @GetMapping("check/code")
+//    public ResponseDto<AdamMemberCodeVo> getMemberOrderList(@NotBlank @PathVariable String orderNo) {
+//        return ResponseDto.success(adamRdmService.getShotMemberOrderVoByOrderNo(orderNo));
+//    }
+
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "使用兑换码")
     @PostMapping("exchange")
     public ResponseDto<AdamMemberOrderResult> exchangeMemberCode(@Valid @RequestBody AdamMemberOrderCodeParam param) {
@@ -177,7 +184,7 @@ public class AdamMemberOrderController {
         return adamMemberOrderService.exchangeMemberCode(param);
     }
 
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "会员订单列表")
     @GetMapping("list")
     public ResponseDto<PageInfo<AdamMemberOrderSimpleVo>> list(@RequestParam(defaultValue = "1", required = false) int pageNo,
@@ -185,14 +192,14 @@ public class AdamMemberOrderController {
         return ResponseDto.success(adamMemberOrderService.queryPage(CurrentUtil.getCurrentUid(), pageNo, pageSize));
     }
 
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "会员订单详情")
     @GetMapping("info/{orderNo}")
     public ResponseDto<AdamMemberOrderVo> getMemberOrderList(@NotBlank @PathVariable String orderNo) {
         return ResponseDto.success(adamRdmService.getShotMemberOrderVoByOrderNo(orderNo));
     }
 
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "会员订单状态")
     @GetMapping("check")
     public ResponseDto<Integer> checkOrderResult(@NotBlank @RequestParam String orderNo) {

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

 package com.liquidnet.service.adam.service;
 
 import com.liquidnet.service.adam.mapper.AdamUserMapper;
+import com.liquidnet.service.adam.service.processor.DMAddressesProcessor;
 import com.liquidnet.service.adam.service.processor.DMEntersProcessor;
 import com.mysql.cj.jdbc.result.ResultSetImpl;
 import lombok.SneakyThrows;
@@ -44,7 +45,7 @@ public abstract class DataMigrationProcessorService {
     private void preHandler() {
         Class.forName("com.mysql.cj.jdbc.Driver");
         String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/";
-        if (this instanceof DMEntersProcessor) {
+        if (this instanceof DMEntersProcessor || this instanceof DMAddressesProcessor) {
             url += "mall";
         } else {
             url += "passport";

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

@@ -36,7 +36,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
             log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from enters where type <> 1 or (type = 1 and is_certification = 'yes')";
+        String sqlCount = "select count(1) from enters where (type <> 1 or (type = 1 and is_certification = 'yes'))";
         String field = "id,user_id,type,`name`,mobile,idcode,if(is_default='no', 0, 1),created_at";
 //                     1-id,2-user_id,3-type,4-`name`,5-mobile,6-idcode,7-if(is_default='no', 0, 1),8-created_at
         String sql = sqlCount.replace("count(1)", field);
@@ -51,7 +51,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);
 
 

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

@@ -50,7 +50,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);
 
 

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

@@ -108,7 +108,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
             o.setCreatedAt(row.getLocalDateTime(8));
             o.setUpdatedAt(row.getLocalDateTime(9));
 
-            AdamMemberPriceVo vo = AdamMemberPriceVo.getNew();
+            AdamMemberPriceVo vo = AdamMemberPriceVo.getNew().copy(o);
 
             memberPriceMapper.insert(o);
             mongoTemplate.insert(vo, AdamMemberPriceVo.class.getSimpleName());

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

@@ -71,7 +71,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);
 
 

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

@@ -53,7 +53,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 2, num = 0;
+        int ct = row.getInt(1), pSize = 1000, num = 0;
         log.info("DM数据迁移总数:{}", ct);