Merge branch 'dev' into test

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

@@ -60,11 +60,10 @@ public class AdamMemberOrderVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 20, value = "客户端版本")
     private String version;
 
-    @ApiModelProperty(position = 21, value = "兑换码")
-    private String memberCode;
-
-    @ApiModelProperty(position = 22, value = "会员须知")
+    @ApiModelProperty(position = 21, value = "会员须知")
     private String memberNotes;
+    @ApiModelProperty(position = 22, value = "会员码信息")
+    private AdamMemberCodeVo memberCodeVo;
 
     public static final AdamMemberOrderVo obj = new AdamMemberOrderVo();
 

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamRdmService.java

@@ -104,6 +104,11 @@ public interface IAdamRdmService {
 
     AdamMemberCodeVo getMemberCodeVoByCode(String memberCode);
 
+    /**
+     * Temporarily connect Mongo
+     */
+    AdamMemberCodeVo getMemberCodeVoByBuyOrderNo(String buyOrderNo);
+
     void delMemberCodeVoByCode(String memberCode);
 
     boolean setTagsForSex(List<AdamTagVo> voList);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

 package com.liquidnet.client.admin.zhengzai.kylin.utils;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.*;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
-import com.liquidnet.service.kylin.entity.KylinBuyNotice;
-import com.liquidnet.service.kylin.mapper.KylinBuyNoticeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -152,22 +147,6 @@ public class DataUtils {
         redisUtil.del(KylinRedisConst.ORDER_ENTITIES + orderEntitiesId);
     }
 
-    /**
-     * 删除 banner redis
-     * @param bannerId
-     */
-    public void delBannersRedis(String bannerId) {
-        redisUtil.del(KylinRedisConst.BANNERS + bannerId);
-    }
-
-    /**
-     * 删除 推荐演出 redis
-     * @param recommendId
-     */
-    public void delPerformanceRecommendRedis(String recommendId) {
-        redisUtil.del(KylinRedisConst.PERFORMANCES_RECOMMEND + recommendId);
-    }
-
     /**
      * 删除 验票账号 redis
      * @param checkUserId
@@ -223,22 +202,6 @@ public class DataUtils {
         }
     }
 
-    /**
-     * 获取巡演列表redis
-     */
-    public List<KylinPerformanceVo> getRoadList(String roadShowId) {
-        String redisKey = KylinRedisConst.PERFORMANCES_ROADLIST.concat(roadShowId);
-        if (!redisUtil.hasKey(redisKey)) {
-            List<KylinPerformanceVo> roadList = mongoTemplate.find(
-                    Query.query(Criteria.where("roadShowId").is(roadShowId)),
-                    KylinPerformanceVo.class,
-                    KylinPerformanceVo.class.getSimpleName()
-            );
-            redisUtil.set(redisKey, roadList);
-        }
-        return (List<KylinPerformanceVo>) redisUtil.get(redisKey);
-    }
-
     /**
      * 根据演出id 获取 演出vo 详情
      *

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

@@ -23,7 +23,7 @@ public class AdamAddresses implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String addressesId;
 

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

@@ -23,7 +23,7 @@ public class AdamCollection implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String uid;
 

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

-package com.liquidnet.service.adam.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * TOKEN
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-11
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-public class AdamDeviceToken implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
-
-    private String uid;
-
-    private String android;
-
-    private String ios;
-
-    private String ipad;
-
-    private Integer isLast;
-
-    private LocalDateTime createdAt;
-
-    private LocalDateTime updatedAt;
-
-
-}

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

@@ -23,7 +23,7 @@ public class AdamDisposed implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String uid;
 

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

@@ -23,7 +23,7 @@ public class AdamEnters implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String entersId;
 

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

@@ -18,7 +18,7 @@ public class AdamMember implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 会员卡id

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

@@ -15,7 +15,7 @@ public class AdamMemberCode {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
     /**
      * 会员码
      */

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

@@ -16,7 +16,7 @@ public class AdamMemberOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 订单号
@@ -29,7 +29,7 @@ public class AdamMemberOrder implements Serializable {
     /**
      * 购买方式:0-购买会员 1-购买会员码,2-使用会员码
      */
-    private String mode;
+    private Integer mode;
     /**
      * 原价
      */

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

@@ -19,7 +19,7 @@ public class AdamMemberPrice implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     /**
      * 会员价格ID

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

@@ -23,7 +23,7 @@ public class AdamRealName implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String realNameId;
 

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

@@ -23,7 +23,7 @@ public class AdamThirdParty implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String uid;
 

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

@@ -23,7 +23,7 @@ public class AdamUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String uid;
 

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

@@ -23,7 +23,7 @@ public class AdamUserInfo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String uid;
 

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

@@ -13,7 +13,7 @@ public class AdamUserMember {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "mid", type = IdType.AUTO)
-    private Integer mid;
+    private Long mid;
 
     private String uid;
 

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamDeviceTokenMapper.java

-package com.liquidnet.service.adam.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.liquidnet.service.adam.entity.AdamDeviceToken;
-
-/**
- * <p>
- * TOKEN Mapper 接口
- * </p>
- *
- * @author liquidnet
- * @since 2021-05-11
- */
-public interface AdamDeviceTokenMapper extends BaseMapper<AdamDeviceToken> {
-
-}

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

@@ -4,7 +4,7 @@ use ln_scene;
 drop table if exists adam_third_party;
 create table adam_third_party
 (
-    mid        int unsigned auto_increment primary key,
+    mid        bigint unsigned auto_increment primary key,
     uid        varchar(64) default '',
     open_id    varchar(64) comment '第三方ID',
     avatar     varchar(255) comment '第三方头像',
@@ -52,7 +52,7 @@ create unique index uidx_third_party_uid_open_id on adam_third_party (uid, open_
 drop table if exists adam_user;
 create table adam_user
 (
-    mid         int unsigned auto_increment primary key,
+    mid         bigint unsigned auto_increment primary key,
     uid         varchar(64) not null,
     mobile      varchar(30) not null,
     passwd      varchar(64),
@@ -70,7 +70,7 @@ create unique index uidx_user_uid on adam_user (uid);
 drop table if exists adam_user_info;
 create table adam_user_info
 (
-    mid              int unsigned auto_increment primary key,
+    mid              bigint unsigned auto_increment primary key,
     uid              varchar(64) not null,
     nickname         varchar(32) comment '昵称',
     sex              varchar(50) comment '性别',
@@ -92,7 +92,7 @@ create unique index idx_user_info_uid on adam_user_info (uid);
 drop table if exists adam_real_name;
 create table adam_real_name
 (
-    mid          int unsigned auto_increment primary key,
+    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-军官证',
@@ -109,7 +109,7 @@ create unique index idx_real_name_uid on adam_real_name (uid);
 drop table if exists adam_enters;
 create table adam_enters
 (
-    mid        int unsigned auto_increment primary key,
+    mid        bigint unsigned auto_increment primary key,
     #     `user_id` int(11) NOT NULL DEFAULT '0' COMMENT '用户id',
     enters_id  varchar(64) not null,
     uid        varchar(64) not null comment '用户id',
@@ -132,19 +132,19 @@ create index idx_enters_uid on adam_enters (uid);
 drop table if exists adam_addresses;
 create table adam_addresses
 (
-    mid          int unsigned auto_increment not null primary key,
-    addresses_id varchar(64)                 not null,
-    uid          varchar(64)                 not null,
-    name         varchar(30)                 not null comment '姓名',
-    phone        varchar(30)                 not null comment '手机号',
-    province     varchar(30)                 not null comment '省份',
-    city         varchar(30)                 not null comment '城市',
-    county       varchar(30)                 not null comment '区县',
-    address      varchar(100)                not null comment '详细地址',
-    is_default   boolean                     not null default false comment '是否为默认:0-否,1-是,第一个默认1',
+    mid          bigint unsigned auto_increment not null primary key,
+    addresses_id varchar(64)                    not null,
+    uid          varchar(64)                    not null,
+    name         varchar(30)                    not null comment '姓名',
+    phone        varchar(30)                    not null comment '手机号',
+    province     varchar(30)                    not null comment '省份',
+    city         varchar(30)                    not null comment '城市',
+    county       varchar(30)                    not null comment '区县',
+    address      varchar(100)                   not null comment '详细地址',
+    is_default   boolean                        not null default false comment '是否为默认:0-否,1-是,第一个默认1',
     #     is_certification enum ('yes','no')          not null default 'no' comment '入场人的身份证号是否认证',
-    state        tinyint                     not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
-    created_at   datetime(3)                 not null,
+    state        tinyint                        not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
+    created_at   datetime(3)                    not null,
     updated_at   datetime(3),
     deleted_at   datetime(3),
     comment      text
@@ -176,7 +176,7 @@ create index idx_addresses_uid on adam_addresses (uid);
 drop table if exists adam_collection;
 create table adam_collection
 (
-    mid        int unsigned auto_increment primary key,
+    mid        bigint unsigned auto_increment primary key,
     uid        varchar(64)       not null,
     content_id varchar(64)       not null,
     type       varchar(30)       not null comment '收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG',
@@ -191,12 +191,12 @@ create unique index uidx_collection_uid_content_id on adam_collection (uid, cont
 drop table if exists adam_disposed;
 create table adam_disposed
 (
-    mid        int unsigned auto_increment not null primary key,
-    uid        varchar(64)                 not null,
-    content_id int unsigned                not null,
-    type       varchar(30)                 not null comment '想去类型:TICKET',
-    state      tinyint default 1           not null comment '1-正常,2-删除',
-    created_at datetime(3)                 not null,
+    mid        bigint unsigned auto_increment not null primary key,
+    uid        varchar(64)                    not null,
+    content_id int unsigned                   not null,
+    type       varchar(30)                    not null comment '想去类型:TICKET',
+    state      tinyint default 1              not null comment '1-正常,2-删除',
+    created_at datetime(3)                    not null,
     updated_at datetime(3),
     comment    text
 ) engine = InnoDB comment '想去';
@@ -206,7 +206,7 @@ create index idx_disposed_content on adam_disposed (content_id);
 drop table if exists adam_member;
 create table adam_member
 (
-    mid               int unsigned auto_increment primary key,
+    mid               bigint unsigned auto_increment primary key,
     member_id         varchar(255) comment '会员id',
     name              varchar(64),
     title             varchar(100),
@@ -233,7 +233,7 @@ create table adam_member
 drop table if exists adam_member_price;
 create table adam_member_price
 (
-    mid             int unsigned auto_increment primary key,
+    mid             bigint unsigned auto_increment primary key,
     member_price_id varchar(64) comment '会员价格id',
     member_id       varchar(64)                                                  NOT NULL comment '会员种类ID',
     state           tinyint                                                      NOT NULL DEFAULT '0' COMMENT '0不可用、1上线中、2已下线',
@@ -250,7 +250,7 @@ create table adam_member_price
 drop table if exists adam_member_order;
 create table adam_member_order
 (
-    mid             int unsigned auto_increment primary key,
+    mid             bigint unsigned auto_increment primary key,
     order_no        varchar(64),
     uid             varchar(64),
     mode            tinyint comment '购买方式:0-购买会员,1-购买会员码',
@@ -278,7 +278,7 @@ create table adam_member_order
 drop table if exists adam_user_member;
 create table adam_user_member
 (
-    mid        int unsigned auto_increment primary key,
+    mid        bigint unsigned auto_increment primary key,
     uid        varchar(64) not null,
     member_id  varchar(255) comment '会员类型id',
     member_no  varchar(20) not null,
@@ -292,7 +292,7 @@ create table adam_user_member
 drop table if exists adam_member_code;
 create table adam_member_code
 (
-    mid             int unsigned auto_increment primary key,
+    mid             bigint unsigned auto_increment primary key,
     code            varchar(20) comment '会员码',
     type            int          default 0 comment '类型:1-购买,2-赠送(后台生成)',
     member_id       varchar(255) comment '会员ID',

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

@@ -239,9 +239,17 @@ public class AdamMemberOrderController {
     @GetMapping("info/{orderNo}")
     public ResponseDto<AdamMemberOrderVo> getMemberOrderList(@NotBlank @PathVariable String orderNo) {
         AdamMemberOrderVo mOrderVo = adamRdmService.getShotMemberOrderVoByOrderNo(orderNo);
-        AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(mOrderVo.getMemberId());
-        mOrderVo.setMemberNotes(memberVo.getNotes());
-        return ResponseDto.success(mOrderVo);
+        if (null != mOrderVo) {
+            AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(mOrderVo.getMemberId());
+            mOrderVo.setMemberNotes(memberVo.getNotes());
+            if (mOrderVo.getMode() == 1) {
+                AdamMemberCodeVo memberCodeVo = adamRdmService.getMemberCodeVoByBuyOrderNo(mOrderVo.getOrderNo());
+
+                mOrderVo.setMemberCodeVo(memberCodeVo);
+            }
+            return ResponseDto.success(mOrderVo);
+        }
+        return ResponseDto.failure(ErrorMapping.get("10211"));
     }
 
     @ApiOperationSupport(order = 7)

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

 package com.liquidnet.service.adam.controller.admin;
 
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.service.adam.service.processor.*;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
@@ -12,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+@ApiSupport(order = 90062)
 @Api(tags = "DM")
 @Slf4j
 @Validated
@@ -33,66 +36,67 @@ public class AdamDMAdminController extends AdamBaseController {
     @Autowired
     DMTracesInfoProcessor dmTracesInfoProcessor;
 
+    @ApiOperationSupport(order = 0)
     @ApiOperation(value = "user")
     @GetMapping(value = {"user"})
     public ResponseDto<Object> dataMigrationForUser(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
         dmUserInformationProcessor.handler(flg);
         return ResponseDto.success();
     }
 
+    @ApiOperationSupport(order = 1)
     @ApiOperation(value = "tpa")
     @GetMapping(value = {"tpa"})
     public ResponseDto<Object> dataMigrationForTpa(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
         dmThirdPartsProcessor.handler(flg);
         return ResponseDto.success();
     }
 
+    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "real")
     @GetMapping(value = {"real"})
     public ResponseDto<Object> dataMigrationForReal(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
         dmRealNameProcessor.handler(flg);
         return ResponseDto.success();
     }
 
+    @ApiOperationSupport(order = 3)
     @ApiOperation(value = "vip")
     @GetMapping(value = {"vip"})
     public ResponseDto<Object> dataMigrationForVip(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
         dmUserMemberProcessor.handler(flg);
         return ResponseDto.success();
     }
 
-    @ApiOperation(value = "morder")
-    @GetMapping(value = {"morder"})
-    public ResponseDto<Object> dataMigrationForMOrder(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
+    @ApiOperationSupport(order = 4)
+    @ApiOperation(value = "traces")
+    @GetMapping(value = {"traces"})
+    public ResponseDto<Object> dataMigrationForTraces(@RequestParam boolean flg) {
+        dmTracesInfoProcessor.handler(flg);
         return ResponseDto.success();
     }
 
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "enters")
     @GetMapping(value = {"enters"})
     public ResponseDto<Object> dataMigrationForEnters(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
         dmEntersProcessor.handler(flg);
         return ResponseDto.success();
     }
 
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "addr")
     @GetMapping(value = {"addr"})
     public ResponseDto<Object> dataMigrationForAddr(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
         dmAddressesProcessor.handler(flg);
         return ResponseDto.success();
     }
 
-    @ApiOperation(value = "traces")
-    @GetMapping(value = {"traces"})
-    public ResponseDto<Object> dataMigrationForTraces(@RequestParam boolean flg) {
-//        if (!verify(alis)) return ResponseDto.failure();
-        dmTracesInfoProcessor.handler(flg);
+    @ApiOperationSupport(order = 7)
+    @ApiOperation(value = "morder")
+    @GetMapping(value = {"morder"})
+    public ResponseDto<Object> dataMigrationForMOrder(@RequestParam boolean flg) {
+
         return ResponseDto.success();
     }
 }

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

@@ -256,9 +256,9 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
             initMemberCodeVo.setType(1);// 1-购买,2-赠送
             initMemberCodeVo.setMemberNo(memberNo);
             initMemberCodeVo.setState(0);
-            initMemberCodeVo.setBuyOrderNo(parameter.getCode());
+            initMemberCodeVo.setBuyOrderNo(handleMemberOrderVo.getOrderNo());
             initMemberCodeVo.setBuyUid(handleMemberOrderVo.getUid());
-            initMemberCodeVo.setBuyAt(now);
+            initMemberCodeVo.setBuyAt(handleMemberOrderVo.getCreatedAt());
             initMemberCodeVo.setCreatedAt(now);
 
             long s = System.currentTimeMillis();
@@ -268,9 +268,6 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
             adamRdmService.setMemberCodeVoByCode(initMemberCodeVo.getCode(), initMemberCodeVo);
             log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
-            handleMemberOrderVo.setMemberCode(initMemberCodeVo.getCode());
-            handleMemberOrderVo.setMemberNo(memberNo);
-
             toMqSqls.add(SqlMapping.get("adam_member_code.add"));
             operationObjs.add(new Object[]{
                     initMemberCodeVo.getCode(), initMemberCodeVo.getType(), initMemberCodeVo.getMemberId(), initMemberCodeVo.getMemberPriceId(),
@@ -344,7 +341,6 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         initMemberOrderVo.setClientIp(CurrentUtil.getCliIpAddr());
         initMemberOrderVo.setSource(CurrentUtil.getCliSource());
         initMemberOrderVo.setVersion(CurrentUtil.getCliVersion());
-        initMemberOrderVo.setMemberCode(param.getMemberCode());
 
         LinkedList<String> toMqSqls = new LinkedList<>();
         LinkedList<Object[]> updateMemberCodeObjs = new LinkedList<>(),
@@ -429,7 +425,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
 
     @Override
     public PageInfo<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) {
-        Query query = Query.query(Criteria.where("uid").is(uid).and("state").is(1));
+        Query query = Query.query(Criteria.where("uid").is(uid).and("state").in(1,5));
 
         long count = mongoTemplate.count(query, AdamMemberOrderVo.class.getSimpleName());
 

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

@@ -498,6 +498,18 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
         return vo;
     }
 
+    @Override
+    public AdamMemberCodeVo getMemberCodeVoByBuyOrderNo(String buyOrderNo) {
+        Query query = Query.query(Criteria.where("buyOrderNo").is(buyOrderNo));
+        query.fields().include("code").include("memberNo").include("state").include("type");
+        long s = System.currentTimeMillis();
+        AdamMemberCodeVo vo = mongoTemplate.findOne(
+                query, AdamMemberCodeVo.class, AdamMemberCodeVo.class.getSimpleName()
+        );
+        log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
+        return vo;
+    }
+
     @Override
     public void delMemberCodeVoByCode(String memberCode) {
         redisUtil.del(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode));

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

@@ -1022,6 +1022,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 LocalDateTime now = LocalDateTime.now();
                 Long currentTime = System.currentTimeMillis();
                 HashMap<String, Integer> mapSurplusGeneral = new HashMap<>();
+                ArrayList<String> orderDataList = new ArrayList<>();
                 ArrayList<String> orderIdList = new ArrayList<>();
                 HashMap<String, Object> mapMongo = new HashMap<>();
 
@@ -1032,7 +1033,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             mapMongo.put("status", KylinTableStatusConst.ORDER_STATUS2);
                             mapMongo.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
                             mapMongo.put("changeDate", now);
-                            orderIdList.add(item.getOrderTicketsId() + "," + item.getUserId());
+                            orderDataList.add(item.getOrderTicketsId() + "," + item.getUserId());
+                            orderIdList.add(item.getUserId());
                             mapSurplusGeneral.put(item.getTicketId(), mapSurplusGeneral.get(item.getTicketId()) == null ? item.getNumber() : mapSurplusGeneral.get(item.getTicketId()) + item.getNumber());
                         } catch (Exception e) {
                             log.debug("CHECK TIME SYNC = " + e.getMessage());
@@ -1044,7 +1046,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 }
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("FOR 循环 -> time:" + (currentTime) + "毫秒");
-                if (orderIdList.size() > 0) {
+                if (orderDataList.size() > 0) {
                     //库存
                     for (Map.Entry<String, Integer> entry : mapSurplusGeneral.entrySet()) {
                         dataUtils.changeSurplusGeneral(entry.getKey(), entry.getValue());
@@ -1055,7 +1057,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     //mysql
                     String orderStr = "";
                     for (int i = 0; i < orderIdList.size(); i++) {
-                        String orderTicketId = orderIdList.get(i).split(",")[0];
+                        String orderTicketId = orderIdList.get(i);
                         orderStr += "'" + orderTicketId + "',";
                     }
 
@@ -1081,7 +1083,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                     Thread thread = new Thread(() -> {
                         //redis 列表
-                        orderIdList.forEach(t -> {
+                        orderDataList.forEach(t -> {
                             String orderTicketId = t.split(",")[0];
                             String uid = t.split(",")[1];
                             KylinOrderTicketVo vo = dataUtils.getOrderTicketVo(orderTicketId);

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

@@ -167,6 +167,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
     public HashMap<String, Object> ticketTimesPartner(String performancesId, Integer isAgent) {
         KylinPerformanceVo vo = dataUtils.getPerformanceVo(performancesId);
+        vo = checkAppStatus(vo);
 
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         for (KylinTicketTimesVo partner : ticketTimesList) {
@@ -347,8 +348,8 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     }
 
     public int checkTicketStatus(KylinTicketVo ticketItem) {
-        int status = 0;
         int getStatus = ticketItem.getStatus();
+        int status = getStatus;
         if (null != ticketItem) {
             if (6 == getStatus || 9 == getStatus || 10 == getStatus) {
                 String timeStart = ticketItem.getTimeStart();

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

@@ -139,21 +139,6 @@ public class DataUtils {
         }
     }
 
-    /**
-     * 根据演出id 获取 演出vo 详情
-     *
-     * @param performanceId
-     * @return
-     */
-    public KylinPerformanceVo getPerformanceVo(String performanceId) {
-        if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
-        } else {
-            KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-            redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
-        }
-        return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
-    }
-
     public void setOrderList(String userId, List<KylinOrderListVo> vo) {
         redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
     }
@@ -195,54 +180,6 @@ public class DataUtils {
         redisUtil.del(KylinRedisConst.ORDER + orderId);
     }
 
-    /**
-     * 获取bannerVo
-     *
-     * @param bannerId
-     * @return
-     */
-    public KylinBannersVo getBannersVo(String bannerId) {
-        if (redisUtil.hasKey(KylinRedisConst.BANNERS + bannerId)) {
-        } else {
-            KylinBannersVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("bannersId").is(bannerId)), KylinBannersVo.class, KylinBannersVo.class.getSimpleName());
-            redisUtil.set(KylinRedisConst.BANNERS + bannerId, ticketData);
-        }
-        return (KylinBannersVo) redisUtil.get(KylinRedisConst.BANNERS + bannerId);
-    }
-
-    /**
-     * 删除 banner redis
-     *
-     * @param bannerId
-     */
-    public void delBannersRedis(String bannerId) {
-        redisUtil.del(KylinRedisConst.BANNERS + bannerId);
-    }
-
-    /**
-     * 获取 推荐演出vo
-     *
-     * @param recommendId
-     * @return
-     */
-    public KylinPerformanceVo getPerformanceRecommendVo(String recommendId) {
-        if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES_RECOMMEND + recommendId)) {
-        } else {
-            KylinPerformanceVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(recommendId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-            redisUtil.set(KylinRedisConst.PERFORMANCES_RECOMMEND + recommendId, ticketData);
-        }
-        return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES_RECOMMEND + recommendId);
-    }
-
-    /**
-     * 删除 推荐演出 redis
-     *
-     * @param recommendId
-     */
-    public void delPerformanceRecommendRedis(String recommendId) {
-        redisUtil.del(KylinRedisConst.PERFORMANCES_RECOMMEND + recommendId);
-    }
-
     /**
      * 获取 验票账号 vo
      *
@@ -491,6 +428,21 @@ public class DataUtils {
         redisUtil.del(KylinRedisConst.ORDER_ENTITIES + orderEntitiesId);
     }
 
+    /**
+     * 根据演出id 获取 演出vo 详情
+     *
+     * @param performanceId
+     * @return
+     */
+    public KylinPerformanceVo getPerformanceVo(String performanceId) {
+        if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
+        } else {
+            KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
+            redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
+        }
+        return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
+    }
+
     /**
      * 获取演出列表redis
      *