Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketRelationsService.java

+package com.liquidnet.service.kylin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
+
+/**
+ * <p>
+ * 订单 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface IKylinOrderTicketRelationsService extends IService<KylinOrderTicketRelations> {
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketStatusService.java

+package com.liquidnet.service.kylin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.PayAgainParam;
+import com.liquidnet.service.kylin.dto.param.PayOrderParam;
+import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.returns.OrderDetailsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayResultVo;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
+import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface IKylinOrderTicketStatusService extends IService<KylinOrderTicketStatus> {
+
+}

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -298,7 +298,7 @@ create table adam_member_code
     member_id       varchar(255) comment '会员ID',
     member_price_id varchar(255) comment '会员价格ID',
     member_no       varchar(20) comment '预留会员号',
-    state           tinyint comment '0-未用,1-已用,2-失效',
+    state           tinyint comment '0-未用,1-已用,2-不可用',
     created_at      datetime(3),
     updated_at      datetime(3),
     buy_order_no    varchar(255) default null comment '购买会员码订单号',

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

@@ -33,7 +33,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
 
-            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
+            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

@@ -33,7 +33,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
 
-            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
+            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'))";

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

@@ -27,9 +27,6 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
     @Autowired
     IAdamMemberOrderService adamMemberOrderService;
 
-    public static final String MEMBER_NAME = "摩登天空会员";
-    public static final String MEMBER_ID = "1";
-
     // APPWEPAY|APPALIPAY|WAPWEPAY|WAPALIPAY|JSWEPAY|GIFT_CODE|VIP_CODE|APPLETWEPAY
     public static final Map<String, String> dfMap = new HashMap<>();
     public static final Map<String, String> ptMap = new HashMap<>();
@@ -57,9 +54,9 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         HttpServletRequest request = ServletUtils.getRequest();
         String lS = request.getParameter(DM_LS), flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
         if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
-            log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_member_order"));
+            log.info("DM.flush.member_order:{}", userMapper.executeForDM("adam_member_order"));
 
-            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").ne(null)), AdamMemberOrder.class.getSimpleName()).getDeletedCount());
+            log.info("DM.flush.AdamMemberOrderVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberOrderVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_vip_card_orders where status in (1,5)";

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

@@ -33,7 +33,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(request.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").ne(null)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
+            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";

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

@@ -33,7 +33,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(request.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").ne(null)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
+            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/DMUserInformationProcessor.java

@@ -55,7 +55,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
             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").ne(null)), AdamUserInfoVo.class.getSimpleName()).getDeletedCount());
+            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 ";

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

@@ -33,7 +33,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(request.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").ne(null)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
+            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";

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

@@ -28,7 +28,7 @@ public class DataController {
 
     @PostMapping("order")
     @ApiOperation("订单数据迁移")
-    public ResponseDto<Boolean> order(int month) {
+    public ResponseDto<Boolean> order(String month) {
         Boolean result = data.order(month);
         return ResponseDto.success(result);
     }

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

+package com.liquidnet.service.kylin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
+import com.liquidnet.service.kylin.entity.KylinTickets;
+import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper;
+import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketRelationsService;
+import com.liquidnet.service.kylin.service.IKylinTicketsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 票 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-06
+ */
+@Service
+public class KylinOrderTicketRelationsImpl extends ServiceImpl<KylinOrderTicketRelationsMapper, KylinOrderTicketRelations> implements IKylinOrderTicketRelationsService {
+
+}

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

+package com.liquidnet.service.kylin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
+import com.liquidnet.service.kylin.entity.KylinTickets;
+import com.liquidnet.service.kylin.mapper.KylinOrderTicketStatusMapper;
+import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketStatusService;
+import com.liquidnet.service.kylin.service.IKylinTicketsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 票 服务实现类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-06
+ */
+@Service
+public class KylinOrderTicketStatusImpl extends ServiceImpl<KylinOrderTicketStatusMapper, KylinOrderTicketStatus> implements IKylinOrderTicketStatusService {
+
+}

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

@@ -605,7 +605,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketVo.setTicketTitle(ticketData.getTitle());
         orderTicketVo.setUseStart(ticketData.getUseStart());
         orderTicketVo.setTimeStart(performanceData.getTimeStart());
-        orderTicketVo.setOverdueAt(orderTickets.getCreatedAt().plusMinutes(performanceData.getPayCountdownMinute()).plusSeconds(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        orderTicketVo.setOverdueAt(orderTickets.getCreatedAt().plusMinutes(performanceData.getPayCountdownMinute()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         orderTicketVo.setCreatedAt(orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
         currentTime = System.currentTimeMillis();