Merge remote-tracking branch 'origin/dev' into dev

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/controller/admin/AdamDMAdminController.java

@@ -101,6 +101,8 @@ public class AdamDMAdminController {
     private boolean verify(int alis) {
         LocalDateTime now = LocalDateTime.now();
         int hour = now.getHour();
-        return alis == Integer.parseInt((hour > 12 ? hour - 12 : hour) + "" + now.getMinute());
+        int ali = Integer.parseInt((hour > 12 ? hour - 12 : hour) + "" + now.getMinute());
+        log.info("ali:{},alis:{}", ali, alis);
+        return alis == ali;
     }
 }

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;
@@ -43,8 +44,9 @@ public abstract class DataMigrationProcessorService {
     @SneakyThrows
     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) {
+        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/";
+//        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/";
+        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/DMAddressesProcessor.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.adam.service.processor;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -12,6 +13,8 @@ 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;
 
 @Slf4j
@@ -29,6 +32,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
+
+            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from addresses where 1=1";

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.processor;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
+import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.mapper.AdamEntersMapper;
@@ -12,6 +13,8 @@ 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;
 
 @Slf4j
@@ -29,9 +32,11 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
+
+            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);
@@ -46,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

@@ -12,6 +12,8 @@ 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;
 
 @Slf4j
@@ -29,6 +31,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
+
+            log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_real_name where 1=1";
@@ -46,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/DMThirdPartsProcessor.java

@@ -12,6 +12,8 @@ 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;
 
 @Slf4j
@@ -29,6 +31,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
+
+            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_third_parts where `status`=1 and delete_tag=0";

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

@@ -4,6 +4,7 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
+import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
@@ -15,6 +16,8 @@ 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;
 
 import javax.servlet.http.HttpServletRequest;
@@ -37,6 +40,9 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
             log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price"));
+
+            log.info("DM.flush.AdamMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberVo.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamMemberPriceVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberPriceVo.class.getSimpleName()).getDeletedCount());
         }
         this.memberCardInfoHandler();
         this.memberCardPriceHandler();
@@ -102,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

@@ -18,6 +18,8 @@ import org.apache.commons.lang3.RandomStringUtils;
 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;
 
 import java.sql.SQLException;
@@ -50,6 +52,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
             log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
+
+            log.info("DM.flush.AdamUserInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from users where delete_tag in (0,1) and length(mobile)=11 ";
@@ -67,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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service.processor;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.ServletUtils;
+import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.adam.mapper.AdamUserMemberMapper;
@@ -12,6 +13,8 @@ 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;
 
 import javax.servlet.http.HttpServletRequest;
@@ -31,6 +34,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
     protected void dataProcessing(boolean flg) {
         if (StringUtils.isNotEmpty(ServletUtils.getRequest().getParameter(DM_FLUSH))) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
+
+            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_cards where 1=1";
@@ -48,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);
 
 

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -114,7 +114,37 @@ public class ConsumerProcessor {
             exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
             value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
     ))
-    public void consumerOrderCreate(Message msg, Channel channel) {
+    public void consumerOrderCreate1(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_CREATE   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+
+    // 订单创建
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
+    ))
+    public void consumerOrderCreate2(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_CREATE   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+
+    // 订单创建
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
+    ))
+    public void consumerOrderCreate3(Message msg, Channel channel) {
+        log.info("===   CONSUMER_ORDER_CREATE   ===");
+        this.consumerSqlDaoHandler(msg, channel);
+    }
+
+    // 订单创建
+    @RabbitListener(bindings = @QueueBinding(
+            exchange = @Exchange(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE), key = MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
+            value = @Queue(MQConst.QUEUES_SQL_ORDER_CREATE)
+    ))
+    public void consumerOrderCreate4(Message msg, Channel channel) {
         log.info("===   CONSUMER_ORDER_CREATE   ===");
         this.consumerSqlDaoHandler(msg, channel);
     }