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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRealInfoVo.java

@@ -17,7 +17,7 @@ public class AdamRealInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 12, value = "证件号[50]")
     private String idCard;
     @ApiModelProperty(position = 13, value = "类型[1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证]")
-    private String type;
+    private Integer type;
     @ApiModelProperty(position = 14, value = "状态:1-正常")
     private Integer state;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-client/liquidnet-client-job/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -59,4 +59,9 @@ liquidnet:
       phpMallUrl: https://devmall.zhengzai.tv
       phpMerchantApiUrl: https://devmerchantapi.zhengzai.tv
       phpPassportUrl: https://devpassport.zhengzai.tv
+      shunfeng:
+        url: "https://butler-dev-ms.sf-express.com"
+        sk: 21e9a70f677a2bf29dfa2b3bead4f018
+        appid: 557104628450889728
+        custid: 7551234567
 #application-dev-end
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -63,3 +63,8 @@ liquidnet:
       phpMallUrl: https://testmall.zhengzai.tv
       phpMerchantApiUrl: https://testmerchantapi.zhengzai.tv
       phpPassportUrl: https://testpassport.zhengzai.tv
+      shunfeng:
+        url: "https://butler-dev-ms.sf-express.com"
+        sk: 21e9a70f677a2bf29dfa2b3bead4f018
+        appid: 557104628450889728
+        custid: 7551234567
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml

@@ -40,10 +40,10 @@ liquidnet:
       accessKeyId: LTAI4FxrURzMvvu9reFgwY5o
       accessKeySecret: Ym5tfAxOf2zX20MgjikLI3Wz3tlwVV
     shunfeng:
-      url: "https://butler-dev-ms.sf-express.com"
-      sk: 21e9a70f677a2bf29dfa2b3bead4f018
-      appid: 557104628450889728
-      custid: 7551234567
+      url: ${liquidnet.client.admin.shunfeng.url}
+      sk: ${liquidnet.client.admin.shunfeng.sk}
+      appid: ${liquidnet.client.admin.shunfeng.appid}
+      custid: ${liquidnet.client.admin.shunfeng.custid}
       jCompany: 北京正在映画互联网有限公司
       jContact: 姜秀龙
       jMobile: 15811009011

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamRealName.java

@@ -32,7 +32,7 @@ public class AdamRealName implements Serializable {
     /**
      * 1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证
      */
-    private String type;
+    private Integer type;
 
     /**
      * 真实姓名

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserPerformancesMapper.xml

@@ -34,17 +34,18 @@
     <!-- 第三方 验票员未配置 演出 -->
     <select id="unChildPerformanceList" parameterType="java.util.Map" resultMap="childPerformanceDaoResult">
         SELECT p.performances_id,
-               p.title,
-               p.time_start,
-               p.time_end
+        p.title,
+        p.time_start,
+        p.time_end
+        DATE_SUB(p.time_start,INTERVAL -3 DAY) as 'can_dwon_time'
         FROM kylin_performances AS p
-                 LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
+        LEFT JOIN kylin_performance_relations AS pr ON pr.performance_id = p.performances_id
         WHERE p.performances_id NOT IN (
-            SELECT performance_id
-            FROM kylin_check_user_performances
-            WHERE check_user_id = #{checkUserId}
+        SELECT performance_id
+        FROM kylin_check_user_performances
+        WHERE check_user_id = #{checkUserId}
         )
-          AND pr.merchant_id = #{merchantId}
+        AND pr.merchant_id = #{merchantId}
         <if test="name!=''">
             AND title LIKE concat('%', #{name}, '%')
         </if>

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

@@ -83,13 +83,13 @@ drop table if exists adam_real_name;
 create table adam_real_name
 (
     mid          bigint unsigned auto_increment primary key,
-    real_name_id varchar(64)                not null,
-    uid          varchar(64)                not null,
-    type         enum ('1','2','3','4','5') not null default '1' comment '1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证',
-    name         varchar(60)                not null comment '真实姓名',
-    id_card      varchar(30)                not null comment '证件号码',
-    state        tinyint                    not null comment '0-INIT,1-NORMAL,2-INVALID',
-    created_at   datetime(3)                not null,
+    real_name_id varchar(64) not null,
+    uid          varchar(64) not null,
+    type         tinyint     not null comment '1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证',
+    name         varchar(60) not null comment '真实姓名',
+    id_card      varchar(30) not null comment '证件号码',
+    state        tinyint     not null comment '0-INIT,1-NORMAL,2-INVALID',
+    created_at   datetime(3) not null,
     updated_at   datetime(3),
     comment      text
 ) engine = InnoDB comment '实名信息';

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

@@ -395,7 +395,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
                 AdamRealName realName = new AdamRealName();
                 realName.setRealNameId(IDGenerator.nextSnowId() + "");
                 realName.setUid(uid);
-                realName.setType("1");
+                realName.setType(1);
                 realName.setName(name);
                 realName.setIdCard(idCard);
                 realName.setState(1);

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

@@ -90,6 +90,10 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 
                         entersList.add(enters);
                         vos.add(vo);
+
+                        if (enters.getType() == 1) {
+                            adamRdmService.setCertification(1, enters.getIdCard(), enters.getName());
+                        }
                     }
                     if (entersList.size() == 500) {
                         tl += entersList.size();

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

@@ -244,7 +244,12 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
                     memberCode.setUseAt(row.getLocalDateTime(12));
 
                     memberCodeList.add(memberCode);
-                    vos.add(AdamMemberCodeVo.getNew().copy(memberCode));
+                    AdamMemberCodeVo vo = AdamMemberCodeVo.getNew().copy(memberCode);
+                    vos.add(vo);
+
+                    if (memberCode.getState() == 0) {
+                        adamRdmService.setMemberCodeVoByCode(memberCode.getCode(), vo);
+                    }
 //                }
                     if (memberCodeList.size() == 500) {
                         tl += memberCodeList.size();

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

@@ -78,7 +78,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                         AdamRealName realName = new AdamRealName();
                         realName.setRealNameId(row.getString(1));
                         realName.setUid(uid);
-                        realName.setType("1");
+                        realName.setType(1);
                         realName.setName(row.getString(3));
                         realName.setIdCard(row.getString(4));
                         realName.setState(1);
@@ -87,13 +87,15 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
 
                         AdamRealInfoVo vo = AdamRealInfoVo.getNew();
                         vo.setUid(uid);
-                        vo.setType(realName.getType());
+                        vo.setType(1);
                         vo.setName(realName.getName());
                         vo.setIdCard(realName.getIdCard());
                         vo.setState(1);
 
                         realNameList.add(realName);
                         vos.add(vo);
+
+                        adamRdmService.setCertification(1, realName.getIdCard(), realName.getName());
                     }
                     if (realNameList.size() == 500) {
                         tl += realNameList.size();

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

@@ -22,6 +22,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.Collections;
 
 @Slf4j
 @Service
@@ -84,6 +85,8 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             AdamMemberVo vo = AdamMemberVo.getNew().copy(o);
 
+            adamRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
+
             memberMapper.insert(o);
             mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
 
@@ -124,6 +127,8 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             AdamMemberPriceVo vo = AdamMemberPriceVo.getNew().copy(o);
 
+            adamRdmService.setMemberPriceVoByMemberId(vo.getMemberId(), Collections.singletonList(vo));
+
             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/DMUserMemberProcessor.java

@@ -95,6 +95,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
 
                         userMemberList.add(userMember);
                         vos.add(vo);
+
+                        adamRdmService.setUserMemberVoByUid(uid, vo);
                     }
                     if (userMemberList.size() == 500) {
                         tl += userMemberList.size();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-prod-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-consumer/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-prod-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

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

@@ -117,6 +117,10 @@ public class MongoVoUtils {
                         if (kylinTicketVo.getIsExclusive() == 1) {
                             isExclusive = 1;
                         }
+
+                        if (isAdvance == 0 && isDiscount == 0 && isExclusive == 0) {
+                            isMember = 0;
+                        }
                     }
                     if (kylinTicketVo.getIsLackRegister() == 1) {
                         isLackRegister = 1;
@@ -141,12 +145,12 @@ public class MongoVoUtils {
                 }
 
 //                if(ticketList.size()>0) {
-                    KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
-                    kylinTicketTimesVo.setTicketTimes(tt1);
-                    kylinTicketTimesVo.setPerformanceId(times.getPerformanceId());
-                    kylinTicketTimesVo.setTimeId(times.getTimesId());
-                    kylinTicketTimesVo.setTicketList(ticketList);
-                    timeList.add(kylinTicketTimesVo);
+                KylinTicketTimesVo kylinTicketTimesVo = new KylinTicketTimesVo();
+                kylinTicketTimesVo.setTicketTimes(tt1);
+                kylinTicketTimesVo.setPerformanceId(times.getPerformanceId());
+                kylinTicketTimesVo.setTimeId(times.getTimesId());
+                kylinTicketTimesVo.setTicketList(ticketList);
+                timeList.add(kylinTicketTimesVo);
 //                }
             }
 
@@ -154,7 +158,7 @@ public class MongoVoUtils {
             voData.setPerformanceStatus(p2);
             voData.setPerformanceRelations(p3);
             voData.setFieldsData(fields, cityName);
-            voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellMemberTime,sellTime, isAdvance, isDiscount, payCountdownMinute);
+            voData.setTimePriceVipAndLack(isLackRegister, isMember, isExclusive, price, stopSellTime, sellMemberTime, sellTime, isAdvance, isDiscount, payCountdownMinute);
             voData.setTicketTimeList(timeList);
             voData.setAppStatus(p2.getStatus());
             return voData;
@@ -181,7 +185,7 @@ public class MongoVoUtils {
         }
         BeanUtils.copyProperties(data, voItem);
         List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
-        if(type == 1) {
+        if (type == 1) {
             redisVo.add(voItem);
             if (redisData.size() > 0) {
                 if (redisData.get(0).getOrderTicketsId().equals(orderId)) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ liquidnet:
     path: /data/logs
     name: support-config
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
   rabbitmq:
     host: 127.0.0.1
     port: 5672

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-prod-server1.yml

@@ -23,7 +23,7 @@ spring:
 
 eureka:
   instance:
-    hostname: 172.17.192.65
+    hostname: 172.17.207.189
     preferIpAddress: true
     health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
     status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
@@ -38,7 +38,7 @@ eureka:
     register-with-eureka: true #禁止自己当做服务注册
     fetch-registry: true       #屏蔽注册信息
     serviceUrl:
-      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.196.19:7001${server.servlet.context-path}/eureka
+      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.207.189:7001${server.servlet.context-path}/eureka
 #  instance:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-prod-server2.yml

-liquidnet:
-  logfile:
-    path: /data/logs
-    name: support-eureka
-    file-max-size: 200MB
-    pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level: debug
-
-server:
-  port: 7001
-  servlet:
-    context-path: /eureka-server
-
-spring:
-  application:
-    name: liquidnet-support-eureka
-  security:
-    user:
-      name: user
-      password: user123
-
-eureka:
-  instance:
-    hostname: 172.17.196.19
-    preferIpAddress: true
-    health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
-    status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
-    home-page-url: http://localhost:${server.port}${server.servlet.context-path}
-    metadata-map:
-      configPath: ${server.servlet.context-path}
-      management.context-path: ${server.servlet.context-path}
-  server:
-    enable-self-preservation: false  # 设为false，关闭自我保护 #自我保护设置 解决Eureka Server不踢出已关停的节点的问题,同时客户端也需要配置
-    eviction-interval-timer-in-ms: 4000 # 清理间隔（单位毫秒，默认是60*1000）
-  client:
-    register-with-eureka: true #禁止自己当做服务注册
-    fetch-registry: true       #屏蔽注册信息
-    serviceUrl:
-      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.192.65:7001${server.servlet.context-path}/eureka
-#  instance:
-#    prefer-ip-address: true
-#    instance-id: ${spring.application.name}:${server.port}
-#     hostname: localhost
-
-logging:
-  file:
-    name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
-    max-size: 200MB
-  pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-  level:
-    root: info
-    #以下是为指定包设置日志级别
-    com.liquidnet: ${liquidnet.logfile.level}
\ No newline at end of file

liquidnet-bus-support/liquidnet-support-zuul/src/main/resources/bootstrap-prod.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.192.65:7001
+    host: 172.17.207.189:7001
 # end-prod-这里是配置信息基本值
 
 spring: