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

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

docu/dev_transfer.sql

+--  退款转赠添加  --
+ALTER TABLE kylin_performance_status ADD is_transfer tinyint DEFAULT 0 COMMENT '是否支持转赠';
+ALTER TABLE kylin_performance_status ADD transfer_start_time datetime NULL DEFAULT NULL COMMENT '转赠开启时间';
+ALTER TABLE kylin_performance_status ADD transfer_end_time datetime NULL DEFAULT NULL COMMENT '转赠结束时间';
+
+ALTER TABLE kylin_order_ticket_relations ADD transfer_uid varchar(255) DEFAULT "" COMMENT '转赠用户id';
+
+drop table if exists kylin_order_task;
+create table kylin_order_task
+(
+    mid        bigint unsigned auto_increment primary key,
+    order_id    varchar(64) default '',
+    status    int(3) comment '状态 [10-转赠订单可失效]',
+    created_at datetime ,
+    updated_at datetime ,
+    comment    text
+) engine = InnoDB comment '订单定时任务表';
\ No newline at end of file

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

@@ -24,6 +24,10 @@ public class AdamRedisConst {
     public static final String INFO_ENTERS = INFO.concat("enters:");
     public static final String INFO_ADDRESSES = INFO.concat("addresses:");
     public static final String INFO_CERTIFICATION = INFO.concat("certification:");
+    /**
+     * 认证失败标记
+     */
+    public static final String INFO_CERTIFICATION_JUNK = INFO.concat("certification_junk:");
 
     public static final String INFO_MEMBER_SIMPLE = INFO.concat("member:simple");
     public static final String INFO_MEMBER_CATEGORY = INFO.concat("member:category:");

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

+package com.liquidnet.service.adam.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
+import com.liquidnet.service.adam.dto.AdamUserInfoDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel(value = "AdamUserInfoVo", description = "用户详情")
+@Data
+public class AdamUserInfoSimpleVo implements java.io.Serializable, Cloneable {
+    private static final long serialVersionUID = 8479869354894030303L;
+    @ApiModelProperty(position = 10, value = "用户ID[64]")
+    private String uid;
+    @ApiModelProperty(position = 11, value = "手机号[20]")
+    private String mobile;
+    @ApiModelProperty(position = 14, value = "昵称[32]")
+    private String nickname;
+
+    private static final AdamUserInfoSimpleVo obj = new AdamUserInfoSimpleVo();
+
+    public static AdamUserInfoSimpleVo getNew() {
+        try {
+            return (AdamUserInfoSimpleVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new AdamUserInfoSimpleVo();
+    }
+}

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

@@ -26,6 +26,8 @@ public class KylinRedisConst {
     public static final String ORDER_REFUND_BY_ORDER_ID = "kylin:order:refund:orderId:";
     public static final String ORDER_REFUND = "kylin:order:refund:orderRefundsId:";
 
+    public static final String ORDER_TRANSFER = "kylin:order:transfer:uid:";
+
     public static final String USERID_BUY_INFO = "kylin:buy:userId:";
     public static final String IDCARD_BUY_INFO = "kylin:buy:idCard:";
     public static final String PERFORMANCE_ID = "performanceId";

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/admin/PerformanceTransferConfigVo.java

+package com.liquidnet.service.kylin.dto.vo.admin;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel
+@Data
+public class PerformanceTransferConfigVo {
+
+    private String performancesId;
+    private String title;
+    private Integer isCanTransfer;
+    private String transferStartTime;
+    private String transferEndTime;
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -16,7 +16,7 @@ import java.util.List;
 
 @ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
 @Data
-public class KylinOrderTicketVo implements Serializable,Cloneable {
+public class KylinOrderTicketVo implements Serializable, Cloneable {
     private Integer mid;
     private static final long serialVersionUID = 5325511589667456213L;
     @ApiModelProperty(position = 10, value = "ID")
@@ -29,9 +29,13 @@ public class KylinOrderTicketVo implements Serializable,Cloneable {
     private String userMobile;
     @ApiModelProperty(position = 14, value = "演出名称")
     private String performanceTitle;
+    @ApiModelProperty(position = 15, value = "票种名称")
     private String ticketTitle;
+    @ApiModelProperty(position = 15, value = "开始时间")
     private String timeStart;
+    @ApiModelProperty(position = 15, value = "适用时间")
     private String useStart;
+    @ApiModelProperty(position = 15, value = "演出图片")
     private String performanceImg;
     @ApiModelProperty(position = 15, value = "订单号")
     private String orderCode;
@@ -81,51 +85,81 @@ public class KylinOrderTicketVo implements Serializable,Cloneable {
     private String getTicketDescribe;
     @ApiModelProperty(position = 38, value = "订单过期时间(分钟)")
     private Integer payCountdownMinute;
-
+    @ApiModelProperty(position = 15, value = "快递方式")
     private Integer expressType;
+    @ApiModelProperty(position = 15, value = "是否学生票")
     private Integer isStudent;
+    @ApiModelProperty(position = 15, value = "转赠状态[0可转赠,1转赠中,2已转赠,3转赠订单,4待接收,5被退回,6已退回]")
     private Integer transferStatus;
+    @ApiModelProperty(position = 15, value = "订单状态[订单状态:0待付款，1已付款，2已关闭，3正在退款，4已退款, 5待关闭 6部分退款]")
     private Integer status;
+    @ApiModelProperty(position = 15, value = "支付状态[支付状态:0未支付 1已支付 2支付失败]")
     private Integer payStatus;
-
+    @ApiModelProperty(position = 15, value = "转赠订单id")
     private String transferId;
+    @ApiModelProperty(position = 15, value = "转赠用户id")
+    private String transferUid;
+    @ApiModelProperty(position = 15, value = "直播id")
     private String liveId;
+    @ApiModelProperty(position = 15, value = "演出id")
     private String performanceId;
+    @ApiModelProperty(position = 15, value = "场次id")
     private String timeId;
+    @ApiModelProperty(position = 15, value = "票种id")
     private String ticketId;
+    @ApiModelProperty(position = 15, value = "代理id")
     private String agentId;
+    @ApiModelProperty(position = 15, value = "是否会员")
     private Integer isMember;
-
+    @ApiModelProperty(position = 15, value = "订单过期日期")
     private String overdueAt;
+    @ApiModelProperty(position = 15, value = "创建时间")
     private String createdAt;
+    @ApiModelProperty(position = 15, value = "更新时间")
     private String updatedAt;
 
-//    private Integer isCanRefund;
+    //    private Integer isCanRefund;
+    @ApiModelProperty(position = 15, value = "退款相关列表")
     private List<OrderRefundListVo> orderRefundListVos;
 
     private LocalDateTime changeDate;
 
+    @ApiModelProperty(position = 15, value = "是否实名")
     private Integer isTrueName;
+    @ApiModelProperty(position = 15, value = "购票须知")
     private String noticeImage;
     private String notice;
+    @ApiModelProperty(position = 15, value = "票种类型")
     private Integer ticketType;
+    @ApiModelProperty(position = 15, value = "演出名称")
     private String fieldName;
-
+    @ApiModelProperty(position = 20, value = "转赠时间")
+    private String transferTime;
+    @ApiModelProperty(position = 15, value = "票单列表")
     private List<KylinOrderTicketEntitiesVo> entitiesVoList;
 
+    public void setTransferTime(String transferTime) {
+        this.transferTime = transferTime==null?"":transferTime;
+    }
+
+    public String getTransferTime() {
+        return transferTime==null?"":transferTime;
+    }
+
     public void setOrderTicket(KylinOrderTickets orderTicket) {
-        BeanUtils.copyProperties(orderTicket,this);
+        BeanUtils.copyProperties(orderTicket, this);
     }
 
     public void setOrderTicketStatus(KylinOrderTicketStatus orderTicketStatus) {
-        BeanUtils.copyProperties(orderTicketStatus,this);
+        BeanUtils.copyProperties(orderTicketStatus, this);
     }
 
     public void setOrderTicketRelation(KylinOrderTicketRelations orderTicketRelation) {
-        BeanUtils.copyProperties(orderTicketRelation,this);
+        BeanUtils.copyProperties(orderTicketRelation, this);
     }
 
     private static final KylinOrderTicketVo obj = new KylinOrderTicketVo();
+
     public static KylinOrderTicketVo getNew() {
         try {
             return (KylinOrderTicketVo) obj.clone();

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -112,6 +112,14 @@ public class KylinPerformanceVo {
     private String refundOpenTime;
     private String refundCloseTime;
 
+    private Integer isTransfer;
+    private String transferStartTime;
+    private String transferEndTime;
+
+//    private Integer isRefundPoundage;
+//    private Integer isRefundVoucher;
+//    private Integer isRefundExpress;
+
     public void setPerformance(KylinPerformances performance) {
         this.mid = performance.getMid();
         this.performancesId = performance.getPerformancesId();
@@ -120,13 +128,13 @@ public class KylinPerformanceVo {
         this.timeStart = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeStart());
         this.timeEnd = DateUtil.Formatter.yyyyMMddHHmmss.format(performance.getTimeEnd());
         this.type = performance.getType();
-        this.details =performance.getDetails();
+        this.details = performance.getDetails();
         this.noticeImage = performance.getNoticeImage();
-        this.notice=performance.getNotice();
-        this.approvalUrl=performance.getApprovalUrl();
+        this.notice = performance.getNotice();
+        this.approvalUrl = performance.getApprovalUrl();
     }
 
-    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime,LocalDateTime sellTime,int isAdvance,int isDiscount,int payCountdownMinute) {
+    public void setTimePriceVipAndLack(int isLackRegister, int isMember, int isExclusive, BigDecimal price, LocalDateTime stopSellTime, LocalDateTime sellMemberTime, LocalDateTime sellTime, int isAdvance, int isDiscount, int payCountdownMinute) {
         this.isLackRegister = isLackRegister;
         this.isMember = isMember;
         this.isExclusive = isExclusive;
@@ -141,7 +149,7 @@ public class KylinPerformanceVo {
         this.payCountdownMinute = payCountdownMinute;
     }
 
-    public void setFieldsData(KylinFields fields,String cityName){
+    public void setFieldsData(KylinFields fields, String cityName) {
         this.longitude = fields.getLongitude();
         this.latitude = fields.getLatitude();
         this.cityName = cityName;
@@ -156,11 +164,14 @@ public class KylinPerformanceVo {
         this.limitCount = performanceStatus.getLimitCount();
         this.limitCountMember = performanceStatus.getLimitCountMember();
         this.sysDamai = performanceStatus.getSyncDamai();
-        this.isShow=performanceStatus.getIsShow();
+        this.isShow = performanceStatus.getIsShow();
         this.isCanRefund = performanceStatus.getIsCanRefund();
         this.isOpenRefundPresent = performanceStatus.getIsOpenRefundPresent();
         this.refundOpenTime = DateUtil.Formatter.yyyyMMddHHmmss.format(performanceStatus.getRefundOpenTime());
         this.refundCloseTime = DateUtil.Formatter.yyyyMMddHHmmss.format(performanceStatus.getRefundCloseTime());
+        this.isTransfer = performanceStatus.getIsTransfer();
+        this.transferStartTime = DateUtil.Formatter.yyyyMMddHHmmss.format(performanceStatus.getTransferStartTime());
+        this.transferEndTime = DateUtil.Formatter.yyyyMMddHHmmss.format(performanceStatus.getTransferEndTime());
     }
 
     public void setPerformanceRelations(KylinPerformanceRelations performanceRelations) {

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/KylinOrderListVo.java

 package com.liquidnet.service.kylin.dto.vo.returns;
 
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 
 @Data
-public class KylinOrderListVo implements Serializable,Cloneable {
+@ApiModel
+public class KylinOrderListVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 6554829077875538374L;
+    @ApiModelProperty(value = "订单id", example = "")
     private String orderTicketsId;
+    @ApiModelProperty(value = "演出id", example = "")
     private String performanceId;
+    @ApiModelProperty(value = "票种id", example = "")
     private String ticketId;
+    @ApiModelProperty(value = "演出标题", example = "")
     private String performanceTitle;
+    @ApiModelProperty(value = "演出图片", example = "")
     private String performanceImg;
+    @ApiModelProperty(value = "订单号", example = "")
     private String orderCode;
+    @ApiModelProperty(value = "开售时间", example = "")
     private String timeStart;
+    @ApiModelProperty(value = "票种名称", example = "")
     private String ticketTitle;
+    @ApiModelProperty(value = "适用开始时间", example = "")
     private String useStart;
+    @ApiModelProperty(value = "订单过期时间", example = "")
     private String overdueAt;
+    @ApiModelProperty(value = "过期倒计时", example = "")
     private Long restTime;
+    @ApiModelProperty(value = "实际支付价格", example = "")
     private BigDecimal priceActual;
+    @ApiModelProperty(value = "数量", example = "")
     private Integer number;
+    @ApiModelProperty(value = "订单状态(订单状态:0待付款，1已付款，2已关闭，3正在退款，4已退款, 5待关闭，6部分退款，" +
+            "11转赠中,12已转赠,13转赠订单,14待接收,15被退回,16已退回)", example = "")
     private Integer status;
+    @ApiModelProperty(value = "快递状态", example = "")
     private Integer expressStatus;
+    @ApiModelProperty(value = "取票方式", example = "")
     private String getTicketType;
+    @ApiModelProperty(value = "转赠状态")
+    private Integer transferStatus;
+    @ApiModelProperty(value = "创建时间", example = "")
     private String createdAt;
 
     private static final KylinOrderListVo obj = new KylinOrderListVo();
+
     public static KylinOrderListVo getNew() {
         try {
             return (KylinOrderListVo) obj.clone();
@@ -34,4 +59,63 @@ public class KylinOrderListVo implements Serializable,Cloneable {
             return new KylinOrderListVo();
         }
     }
+
+    public void setStatus(Integer status) {
+        if(status.equals(1) && transferStatus!=null) {
+            if (this.transferStatus.equals(1)) {
+                this.status = 11;
+            } else if (this.transferStatus.equals(2)) {
+                this.status = 12;
+            } else if (this.transferStatus.equals(3)) {
+                this.status = 13;
+            } else if (this.transferStatus.equals(4)) {
+                this.status = 14;
+            } else if (this.transferStatus.equals(5)) {
+                this.status = 15;
+            } else if (this.transferStatus.equals(6)) {
+                this.status = 16;
+            } else {
+                this.status = status;
+            }
+        }else{
+            this.status = status;
+        }
+    }
+
+    public KylinOrderListVo copy(KylinOrderTicketVo vo) {
+        if (null == vo) return this;
+
+        this.orderTicketsId = vo.getOrderTicketsId();
+        this.performanceId = vo.getPerformanceId();
+        this.ticketId = vo.getTicketId();
+        this.performanceTitle = vo.getPerformanceTitle();
+        this.performanceImg = vo.getPerformanceImg();
+        this.orderCode = vo.getOrderCode();
+        this.timeStart = vo.getTimeStart();
+        this.ticketTitle = vo.getTicketTitle();
+        this.useStart = vo.getUseStart();
+        this.overdueAt = vo.getOverdueAt();
+        this.priceActual = vo.getPriceActual();
+        this.number = vo.getNumber();
+        this.expressStatus = 0;
+        this.getTicketType = vo.getGetTicketType();
+        this.createdAt = vo.getCreatedAt();
+        this.restTime = 0L;
+        if (vo.getTransferStatus().equals(1)) {
+            this.status = 11;
+        } else if (vo.getTransferStatus().equals(2)) {
+            this.status = 12;
+        } else if (vo.getTransferStatus().equals(3)) {
+            this.status = 13;
+        } else if (vo.getTransferStatus().equals(4)) {
+            this.status = 14;
+        } else if (vo.getTransferStatus().equals(5)) {
+            this.status = 15;
+        } else if (vo.getTransferStatus().equals(6)) {
+            this.status = 16;
+        } else {
+            this.status = vo.getStatus();
+        }
+        return this;
+    }
 }

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -2,20 +2,40 @@ package com.liquidnet.service.kylin.dto.vo.returns;
 
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.entity.KylinFields;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
-public class OrderDetailsVo implements Cloneable{
+@ApiModel(value = "OrderDetailsVo", description = "订单详情外层数据")
+public class OrderDetailsVo implements Cloneable {
+    @ApiModelProperty(position = 10, value = "订单详情vo")
     private KylinOrderTicketVo orderTicketVo;
+    @ApiModelProperty(position = 10, value = "入场须知")
     private String enterDescribe;
+    @ApiModelProperty(position = 10, value = "快递状态")
     private Integer expressStatus;
+    @ApiModelProperty(position = 10, value = "订单失效时间")
     private Long restTime;
+    @ApiModelProperty(position = 10, value = "订单转赠失效时间")
+    private Long restTransferTime;
+    @ApiModelProperty(position = 10, value = "是否可退款")
     private Integer isCanRefund;
+    @ApiModelProperty(position = 10, value = "是否展示二维码")
+    private Integer isShowQrCode;
+    @ApiModelProperty(position = 10, value = "二维码显示时间")
+    private String showQrCodeTime;
+    @ApiModelProperty(position = 10, value = "是否可转赠")
+    private Integer isCanTransfer;
+    @ApiModelProperty(position = 10, value = "是否可回退")
+    private Integer isCanBack;
+    @ApiModelProperty(position = 10, value = "退款相关list")
     private List<KylinOrderRefundsOrderCodeVo> orderRefundsVoList;
 
     private static final OrderDetailsVo obj = new OrderDetailsVo();
+
     public static OrderDetailsVo getNew() {
         try {
             return (OrderDetailsVo) obj.clone();

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

@@ -20,7 +20,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-20
  */
-public interface IKylinOrderTicketsService  {
+public interface IKylinOrderTicketsService {
 
     //订单列表(状态 待支付 已支付 倒计时 已失效)
     PageInfo<List<KylinOrderListVo>> orderList();
@@ -35,18 +35,34 @@ public interface IKylinOrderTicketsService  {
     ResponseDto<KylinOrderTicketPreVo> toOrderRefundDetails(String orderId);
 
     //退款详情
-    ResponseDto<OrderRefundVo> orderRefundDetails(String orderId,String orderRefundId);
+    ResponseDto<OrderRefundVo> orderRefundDetails(String orderId, String orderRefundId);
 
     /**
      * 发起退款
-     * @param orderId                   订单id
-     * @param orderTicketEntitiesId     票单id
-     * @param reason                    退款原因
-     * @param picList                   证据截图
-     * @return                          是否成功
+     *
+     * @param orderId               订单id
+     * @param orderTicketEntitiesId 票单id
+     * @param reason                退款原因
+     * @param picList               证据截图
+     * @return 是否成功
      */
     String sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList);
 
     //退款撤回
     ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId);
+
+    //发起转赠订单
+    ResponseDto<String> orderTransfer(String orderId, String transferUid, String transferMobile);
+
+    //撤回转赠订单
+    ResponseDto<String> orderTransferWithdraw(String orderId);
+
+    //接受转赠订单
+    ResponseDto<String> orderTransferAccept(String enterIdList);
+
+    //拒绝转赠订单
+    ResponseDto<String> orderTransferReject();
+
+    //拒绝转赠订单
+    ResponseDto<String> orderTransferBack(String orderId);
 }

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
+import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 
@@ -182,7 +183,23 @@ public interface IKylinPerformancesAdminService {
      * 修改 演出退款配置
      * @return
      */
-    boolean changeRefundConfig(String performancesId,
+    String changeRefundConfig(String performancesId,
+                               Integer isCanRefund,
+                               String refundOpenTime,
+                               String refundCloseTime);
+
+    /**
+     * 获取 演出转赠配置
+     * @param performanceId
+     * @return
+     */
+    PerformanceTransferConfigVo getTransferConfig(String performanceId);
+
+    /**
+     * 修改 演出转赠配置
+     * @return
+     */
+    String changeTransferConfig(String performancesId,
                                Integer isCanRefund,
                                String refundOpenTime,
                                String refundCloseTime);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -81,9 +81,8 @@ public class KylinOrderRefundAdminController extends BaseController {
     @Log(title = "订单退款列表", businessType = BusinessType.DETAIL)
     @PostMapping("applyOrder")
     @ResponseBody
-    public RefundOrderDetailsVo applyOrder(RefundApplyParam refundApplyParam) {
-        RefundOrderDetailsVo orderInfo = kylinOrderRefundsServiceImpl.orderDetails(refundApplyParam.getOrderCode());
-        return orderInfo;
+    public AjaxResult applyOrder(RefundApplyParam refundApplyParam) {
+        return kylinOrderRefundsServiceImpl.orderDetails(refundApplyParam.getOrderCode());
     }
 
     @Log(title = "订单退款列表", businessType = BusinessType.INSERT)

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinPerformancesController.java

@@ -18,6 +18,7 @@ import com.liquidnet.service.kylin.dto.param.SysDamaiParam;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
 import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
 import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
+import com.liquidnet.service.kylin.dto.vo.admin.PerformanceTransferConfigVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import com.liquidnet.service.kylin.service.other.DamaiService;
@@ -198,7 +199,25 @@ public class KylinPerformancesController extends BaseController {
                                          @RequestParam("isCanRefund") Integer isCanRefund,
                                          @RequestParam("refundOpenTime") String refundOpenTime,
                                          @RequestParam("refundCloseTime") String refundCloseTime) {
-        boolean result = kylinPerformancesService.changeRefundConfig(performancesId,isCanRefund,refundOpenTime,refundCloseTime);
-        return toAjax(result);
+        String result = kylinPerformancesService.changeRefundConfig(performancesId, isCanRefund, refundOpenTime, refundCloseTime);
+        return this.success(result);
+    }
+
+    @GetMapping(value = "/transferConfig/{performancesId}")
+    public String getTransferConfig(@PathVariable("performancesId") String performancesId, ModelMap mmap) {
+        PerformanceTransferConfigVo result = kylinPerformancesService.getTransferConfig(performancesId);
+        mmap.put("performanceTransferConfigVo", result);
+        return prefix + "/transferConfig";
+    }
+
+    //@RequiresPermissions("kylin:performances:view")
+    @PostMapping(value = "/transferConfig/change")
+    @ResponseBody
+    public AjaxResult changeTransferConfig(@RequestParam("performancesId") String performancesId,
+                                           @RequestParam("isCanTransfer") Integer isCanTransfer,
+                                           @RequestParam("transferStartTime") String transferStartTime,
+                                           @RequestParam("transferEndTime") String transferEndTime) {
+        String result = kylinPerformancesService.changeTransferConfig(performancesId, isCanTransfer, transferStartTime, transferEndTime);
+        return this.success(result);
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -9,9 +9,9 @@
         <div class="col-sm-12">
             <div class="tabs-container">
                 <ul class="nav nav-tabs">
-                    <li class="active"><a data-toggle="tab" href="#tab-2" aria-expanded="false">演出详情</a>
+                    <li id="li-tab-2" class="active"><a data-toggle="tab" href="#tab-2" aria-expanded="false">演出详情</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-1" aria-expanded="true" id="tab-nav-1"> 演出数据</a>
+                    <li id="li-tab-1"><a data-toggle="tab" href="#tab-1" aria-expanded="true" id="tab-nav-1"> 演出数据</a>
                     </li>
 <!--                    <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">校园分销</a>-->
 <!--                    </li>-->
@@ -19,13 +19,15 @@
 <!--                    </li>-->
 <!--                    <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">状态管理</a>-->
 <!--                    </li>-->
-                    <li class=""><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a>
+                    <li id="li-tab-6"><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a>
+                    <li id="li-tab-3"><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
+                    <li id="li-tab-4"><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
+                    <li id="li-tab-5"><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
+                    </li>
+                    <li id="li-tab-7"><a data-toggle="tab" href="#tab-7" aria-expanded="false" onclick="transferInfo()">转赠配置</a>
                     </li>
                 </ul>
                 <div class="tab-content">
@@ -241,6 +243,12 @@
                                     height=800px frameborder=0></iframe>
                         </div>
                     </div>
+                    <div id="tab-7" class="tab-pane">
+                        <div class="panel-body">
+                            <iframe id="transfer_iframe" name="transfer_iframe" marginwidth=0 marginheight=0 width=100%
+                                    height=800px frameborder=0></iframe>
+                        </div>
+                    </div>
                 </div>
 
 
@@ -254,6 +262,42 @@
     const isShow = '[[${kylinPerformanceMisVo.isShow}]]';
     const auditStatus = '[[${kylinPerformanceMisVo.auditStatus}]]';
 
+    var agentFlag = [[${@permission.hasPermi('kylin:performances:agent')}]];
+    if(agentFlag=="hidden"){
+        document.getElementById("li-tab-4").style.display = "none";
+    }
+
+    var otherFlag = [[${@permission.hasPermi('kylin:performances:audit')}]];
+    if(otherFlag=="hidden"){
+        document.getElementById("li-tab-2").style.display = "none";
+        document.getElementById("tab-2").style.display = "none";
+    }
+
+    var refundFlag = [[${@permission.hasPermi('kylin:performances:refund')}]];
+    if(refundFlag=="hidden"){
+        document.getElementById("li-tab-6").style.display = "none";
+    }
+
+    var memberFlag = [[${@permission.hasPermi('kylin:performances:member')}]];
+    if(memberFlag=="hidden"){
+        document.getElementById("li-tab-3").style.display = "none";
+    }
+
+    var damaiFlag = [[${@permission.hasPermi('kylin:performances:damai')}]];
+    if(damaiFlag=="hidden"){
+        document.getElementById("li-tab-5").style.display = "none";
+    }
+
+    var dataFlag = [[${@permission.hasPermi('kylin:performances:data')}]];
+    if(dataFlag=="hidden"){
+        document.getElementById("li-tab-1").style.display = "none";
+    }
+
+    var transferFlag = [[${@permission.hasPermi('kylin:performances:transfer')}]];
+    if(transferFlag=="hidden"){
+        document.getElementById("li-tab-7").style.display = "none";
+    }
+
     if (auditStatus != 0) {
         document.getElementsByName("auditBtn")[0].style.display = "none";
     }
@@ -322,6 +366,11 @@
         document.getElementById("refundConfig_iframe").src = "../refundConfig/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
     }
 
+    //转赠配置
+    function transferInfo(){
+        document.getElementById("transfer_iframe").src = "../transferConfig/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
+    }
+
     $("#tab-nav-1").bind("click", function () {
         $("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
     });

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/refundConfig.html

@@ -87,6 +87,7 @@
             $.operate.post(prefix + "/refundConfig/change",
                 param,
                 function (res) {
+                    alert(res.msg);
                     location.reload();
                 });
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/transferConfig.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('转赠管理')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-transfer-edit" th:object="${performanceTransferConfigVo}">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">演出id：</label>
+            <div class="col-sm-8">
+                <input name="performancesId" th:field="*{performancesId}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">演出名称：</label>
+            <div class="col-sm-8">
+                <input name="title" th:field="*{title}" class="form-control" type="text" readonly>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">开启转赠：</label>
+            <div class="col-sm-8" th:if="*{isCanTransfer==1}">
+                <div class="radio check-box">
+                    <input type="radio" value="1" name="performance_isCanTransfer" checked>开启</label>
+                </div>
+                <div class="radio check-box">
+                    <input type="radio" value="0" name="performance_isCanTransfer">关闭</label>
+                </div>
+            </div>
+            <div class="col-sm-8" th:if="*{isCanTransfer==0}">
+                <div class="radio check-box">
+                    <input type="radio" value="1" name="performance_isCanTransfer">开启</label>
+                </div>
+                <div class="radio check-box">
+                    <input type="radio" value="0" name="performance_isCanTransfer" checked> 关闭</label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">定时： </label>
+            <input th:field="${performanceTransferConfigVo.transferStartTime}" type="text"
+                   style="width: 200px;float: left"
+                   class="form-control" id="startTime" placeholder="开始时间选择" name="transferOpenTime"
+                   required/>
+            <span class="control-label" style="float: left;margin-left: 10px;margin-right: 10px"> — </span>
+            <input th:field="${performanceTransferConfigVo.transferEndTime}" type="text"
+                   style="width: 200px;float: left"
+                   class="form-control" id="endTime" placeholder="结束时间选择" name="transferCloseTime"
+                   required/>
+        </div>
+
+        <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler()">
+            修改
+        </button>
+
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "kylin/performances";
+
+    $("#form-transfer-edit").validate({
+        focusCleanup: true
+    });
+
+    $("#startTime").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
+    $("#endTime").datetimepicker({
+        format: "yyyy-mm-dd hh:ii:ss",
+        autoclose: true
+    });
+
+    function submitHandler() {
+        var param = {
+            performancesId: '[[${performanceTransferConfigVo.performancesId}]]'.replaceAll("\"", ""),
+            isCanTransfer: parseInt($("input[name^='performance_isCanTransfer']:checked").val()),
+            transferStartTime: $("input[name^='transferStartTime']").val(),
+            transferEndTime: $("input[name^='transferEndTime']").val()
+        }
+
+        if ($("input[name^='transferStartTime']").val() == "" || $("input[name^='transferEndTime']").val() == "") {
+            alert("定时时间不能为空");
+        } else {
+            $.operate.post(prefix + "/transferConfig/change",
+                param,
+                function (res) {
+                    alert(res.msg);
+                    location.reload();
+                });
+        }
+    }
+</script>
+</body>
+</html>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/applyView.html

@@ -63,17 +63,17 @@
                             $.modal.loading("正在查询订单，请稍后...");
                         },
                         success: function (result) {
-                            if (result.msg) {
+                            if (result.status > 0) {
                                 $.modal.closeLoading();
-                                layer.msg("未找到该订单信息");
+                                layer.msg(result.msg);
                                 return false;
                             } else {
-                                $("#orderTicketsId").val(result.orderTicketVo.orderTicketsId);
-                                $('input[name="RefundPriceExpress"]').val(result.orderTicketVo.priceExpress);
-                                $('input[name="RefundPriceExpress"]').attr("max", result.orderTicketVo.priceExpress);
-                                $("#performanceTitle").text(result.kylinPerformanceVo.title);
+                                $("#orderTicketsId").val(result.data.orderTicketVo.orderTicketsId);
+                                $('input[name="RefundPriceExpress"]').val(result.data.orderTicketVo.priceExpress);
+                                $('input[name="RefundPriceExpress"]').attr("max", result.data.orderTicketVo.priceExpress);
+                                $("#performanceTitle").text(result.data.kylinPerformanceVo.title);
                                 var options = {
-                                    data: result.kylinOrderTicketEntitiesDao,
+                                    data: result.data.kylinOrderTicketEntitiesDao,
                                     pagination: false,
                                     columns: [{
                                         checkbox: true

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -13,10 +13,7 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceAgentVo;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceDamaiVo;
-import com.liquidnet.service.kylin.dto.vo.admin.KylinPerformanceMemberHistoryVo;
-import com.liquidnet.service.kylin.dto.vo.admin.PerformanceRefundConfigVo;
+import com.liquidnet.service.kylin.dto.vo.admin.*;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinPerformanceMisVo;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketPartnerVo;
@@ -581,10 +578,57 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     }
 
     @Override
-    public boolean changeRefundConfig(String performancesId,
+    public PerformanceTransferConfigVo getTransferConfig(String performanceId) {
+        KylinPerformances kylinPerformances = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performanceId));
+        KylinPerformanceStatus kylinPerformanceStatus = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performanceId));
+        PerformanceTransferConfigVo vo = new PerformanceTransferConfigVo();
+        vo.setPerformancesId(kylinPerformances.getPerformancesId());
+        vo.setTitle(kylinPerformances.getTitle());
+        vo.setIsCanTransfer(kylinPerformanceStatus.getIsTransfer());
+        vo.setTransferStartTime(kylinPerformanceStatus.getTransferStartTime() == null ? "" : DateUtil.Formatter.yyyyMMddHHmmss.format(kylinPerformanceStatus.getTransferStartTime()));
+        vo.setTransferEndTime(kylinPerformanceStatus.getTransferEndTime() == null ? "" : DateUtil.Formatter.yyyyMMddHHmmss.format(kylinPerformanceStatus.getTransferEndTime()));
+        return vo;
+    }
+
+    @Override
+    public String changeTransferConfig(String performancesId,
+                                        Integer isCanTransfer,
+                                        String transferStartTime,
+                                        String transferEndTime) {
+        KylinPerformanceStatus kylinPerformanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+        if(kylinPerformanceStatusData.getIsCanRefund().equals(1) && isCanTransfer.equals(1)){
+            return "修改失败，演出已开启退款";
+        }
+        KylinPerformances kylinPerformances = performancesMapper.selectOne(new UpdateWrapper<KylinPerformances>().eq("performances_id", performancesId));
+        if(!(kylinPerformances.getType().equals(1) || kylinPerformances.getType().equals(101))){
+            return "修改失败，只支持音乐节类型演出";
+        }
+
+
+        KylinPerformanceStatus kylinPerformanceStatus = new KylinPerformanceStatus();
+        kylinPerformanceStatus.setIsTransfer(isCanTransfer);
+        kylinPerformanceStatus.setTransferStartTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(transferStartTime));
+        kylinPerformanceStatus.setTransferEndTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(transferEndTime));
+        try {
+            performanceStatusMapper.update(kylinPerformanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+            performanceVoUtils.performanceVoStatus(performancesId);
+            return "修改成功";
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "修改失败";
+        }
+    }
+
+    @Override
+    public String changeRefundConfig(String performancesId,
                                       Integer isCanRefund,
                                       String refundOpenTime,
                                       String refundCloseTime) {
+        KylinPerformanceStatus kylinPerformanceStatusData = performanceStatusMapper.selectOne(new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
+        if(kylinPerformanceStatusData.getIsTransfer().equals(1) && isCanRefund.equals(1)){
+            return "修改失败，演出已开启转赠";
+        }
+
         KylinPerformanceStatus kylinPerformanceStatus = new KylinPerformanceStatus();
         kylinPerformanceStatus.setIsCanRefund(isCanRefund);
         kylinPerformanceStatus.setRefundOpenTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(refundOpenTime));
@@ -592,10 +636,10 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         try {
             performanceStatusMapper.update(kylinPerformanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performancesId));
             performanceVoUtils.performanceVoStatus(performancesId);
-            return true;
+            return "修改成功";
         } catch (Exception e) {
             e.printStackTrace();
-            return false;
+            return "修改失败";
         }
     }
 
@@ -654,7 +698,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         //找到所有ticketId
         List<TicketTimesTicketCreatePartnerVo> timesVoList = vo.getTicketTimes();
         for (TicketTimesTicketCreatePartnerVo timesVo : timesVoList) {
-            for (KylinTicketPartnerVo ticketVo : timesVo.getTicket()){
+            for (KylinTicketPartnerVo ticketVo : timesVo.getTicket()) {
                 List<String> orderTicketRedisIdList = new ArrayList<>();
                 List<String> userRedisIdList = new ArrayList<>();
                 List<String> orderTicketIdList = new ArrayList<>();

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

@@ -120,6 +120,9 @@ public class DataUtils {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
         }
         return (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);

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

@@ -269,6 +269,7 @@ public class PerformanceVoUtils {
             performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString());
             performanceRelations.setCreatedAt(null);
             performanceRelations.setUpdatedAt(updatedAt);
+            performanceRelations.setMerchantId(null);
 
             performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performances.getPerformancesId()));
             performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performances.getPerformancesId()));

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsRegex.java

@@ -17,7 +17,7 @@ public class LnsRegex {
         /**
          * 汉字-姓名（2～20位）
          */
-        public static final String CN_HANZI = "^[\\u4e00-\\u9fa5]{2,20}$";
+        public static final String CN_HANZI = "^[\\u4e00-\\u9fa5+\\·?\\u4e00-\\u9fa5+]{2,30}$";
         /**
          * 汉字-省|市|区（2～30位）
          */

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -149,7 +149,7 @@ public final class RedisUtil {
             }
 
             //删除Redis
-            for (Integer redisDb: hashMap.keySet()) {
+            for (Integer redisDb : hashMap.keySet()) {
                 ArrayList<String> delRedisKeyList = hashMap.get(redisDb);
                 redisConfig.getRedisTemplateByDb(redisDb).delete(delRedisKeyList);
             }
@@ -746,4 +746,22 @@ public final class RedisUtil {
     public Object getDB15RedisGet(String redisKey) {
         return redisConfig.getRedisTemplateByDb(15).opsForValue().get(redisKey);
     }
+
+
+    public boolean getDB15RedisHasKey(String redisKey, String item) {
+        return redisConfig.getRedisTemplateByDb(15).opsForSet().isMember(redisKey, item);
+    }
+
+
+    public static void main(String[] args) {
+        String[] keys = {
+                "adam:identity:mobile:18518013286"
+        };
+        for (String key : keys) {
+            long value = key.hashCode();
+            int idx = ((int) (value ^ (value >>> 32)) % 250);
+            System.out.printf("\n[%s] - idx:%s", key, idx);
+        }
+    }
+
 }

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/constant/MQConst.java

@@ -45,6 +45,9 @@ public class MQConst {
         SQL_ORDER_WITHDRAW("kylin:stream:rk.order.withdraw", "group.order.withdraw", "订单申请撤回"),
         SQL_ORDER_OVERTIME_REFUND("kylin:stream:rk.order.overtime.refund", "group.order.overtime.refund", "超时支付申请退款"),
         SQL_STATION("kylin:stream:rk.station", "group.station", "验票更新"),
+        SQL_TRANSFER("kylin:stream:rk.transfer", "group.transfer", "订单发起转赠"),
+        SQL_TRANSFER_RESULT("kylin:stream:rk.transfer.result", "group.transfer.result", "订单结果转赠"),
+        SQL_TRANSFER_OVERTIME("kylin:stream:rk.transfer.overtime", "group.transfer.overtime", "订单结果转赠"),
         ;
         private final String key;
         private final String group;
@@ -77,6 +80,7 @@ public class MQConst {
         ANSWERINSERT_DRAW("sweet:stream:rk.answerInsert", "group.answerInsert", "答案"),
         SWEET_USER_INSERT_DRAW("sweet:stream:rk.sweetUserInsert", "group.sweetUserInsert", "关注服务号的用户信息"),
         SWEET_REMIND_INSERT_DRAW("sweet:stream:rk.remindInsert", "group.remindInsert", "提醒记录"),
+        SWEET_APPLET_USER_INSERT_DRAW("sweet:stream:rk.sweetAppletUserInsert", "group.sweetAppletUserInsert", "小程序登录记录用户解密后信息"),
         ;
 
         private final String key;

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/constant/SmsEnum.java

@@ -55,6 +55,16 @@ public class SmsEnum {
          * - 您已成功购买${name}门票。可至个人中心查看订单，个人中心地址:http://t.cn/ExMlr1B。演出${time}开始。请持购票人身份证到现场取票。咨询电话:4001680650。
          */
         SMS_181500419,
+        /**
+         * 微信关注正在现场服务号通知
+         * - 模版内容:您已成功购买$(name)门票。可至个人中心查看订单http://tcn/ExMir1B。演出$(time)开始。微信关注正在现场服务号，联系我们。
+         */
+        SMS_223192705,
+        /**
+         * 微信关注正在现场服务号通知
+         * - 模版内容:您已成功购买$(name)门票。可至个人中心查看订单http://tcn/ExMir1B。演出$(time)开始。微信关注摩登天空服务号，联系我们。
+         */
+        SMS_223203737,
         ;
     }
 }

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

@@ -63,8 +63,6 @@ liquidnet:
         localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
       url: http://devkylin.zhengzai.tv/kylin
     order:
-      adam:
-        url: http://devadam.zhengzai.tv/adam
       url-pay:
         pay: http://devdragon.zhengzai.tv/dragon/pay/dragonPay
         check: http://devdragon.zhengzai.tv/dragon/pay/checkOrder

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-dev.yml

@@ -24,3 +24,5 @@ liquidnet:
     pay: ${liquidnet.service.kylin.url-pay.pay}
     check: ${liquidnet.service.kylin.url-pay.check}
     localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
+  adam:
+    url: ${liquidnet.service.adam.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin-test.yml

@@ -24,3 +24,5 @@ liquidnet:
     pay: ${liquidnet.service.kylin.url-pay.pay}
     check: ${liquidnet.service.kylin.url-pay.check}
     localUrl: ${liquidnet.service.kylin.url-pay.localUrl}
+  adam:
+    url: ${liquidnet.service.adam.url}
\ No newline at end of file

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-dev.yml

@@ -25,4 +25,4 @@ liquidnet:
     check: ${liquidnet.service.order.url-pay.check}
     localUrl: ${liquidnet.service.order.url-pay.localUrl}
   adam:
-    url:${liquidnet.service.order.adam.url}
+    url:${liquidnet.service.adam.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-order-test.yml

@@ -25,4 +25,4 @@ liquidnet:
     check: ${liquidnet.service.order.url-pay.check}
     localUrl: ${liquidnet.service.order.url-pay.localUrl}
   adam:
-    url:${liquidnet.service.order.adam.url}
+    url:${liquidnet.service.adam.url}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTask.java

+package com.liquidnet.service.kylin.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class KylinOrderTask implements Serializable {
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * order_id
+     */
+    private String orderId;
+
+    /**
+     * status
+     */
+    private Integer status;
+
+    /**
+     * created_at
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * updated_at
+     */
+    private LocalDateTime updatedAt;
+
+    /**
+     * comment
+     */
+    private String comment;
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketRelations.java

@@ -41,6 +41,11 @@ public class KylinOrderTicketRelations implements Serializable  ,Cloneable{
      */
     private String transferId;
 
+    /**
+     * 转增用户id
+     */
+    private String transferUid;
+
     /**
      * 关联直播id
      */

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTicketStatus.java

@@ -47,7 +47,7 @@ public class KylinOrderTicketStatus implements Serializable,Cloneable  {
     private Integer isStudent;
 
     /**
-     * 转移状态，0未转移，1收到他人转赠，2已转赠给他人
+     *
      */
     private Integer transferStatus;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinPerformanceStatus.java

@@ -109,6 +109,36 @@ public class KylinPerformanceStatus implements Serializable  ,Cloneable{
      */
     private LocalDateTime refundCloseTime;
 
+    /**
+     * 是否开启转赠 0否 1是
+     */
+    private Integer isTransfer;
+
+    /**
+     * 转赠开始时间
+     */
+    private LocalDateTime transferStartTime;
+
+    /**
+     * 转赠结束时间
+     */
+    private LocalDateTime transferEndTime;
+
+//    /**
+//     * 是否有手续费
+//     */
+//    private Integer isRefundPoundage;
+//
+//    /**
+//     * 是否退优惠券
+//     */
+//    private Integer isRefundVoucher;
+//
+//    /**
+//     * 是否退快递费
+//     */
+//    private Integer isRefundExpress;
+
     /**
      * 创建时间
      */

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinOrderTaskMapper.java

+package com.liquidnet.service.kylin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.kylin.dao.BannerDetailsDao;
+import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
+import com.liquidnet.service.kylin.entity.KylinBanners;
+import com.liquidnet.service.kylin.entity.KylinOrderTask;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 轮播图 Mapper 接口 处理数据库
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-05-01
+ */
+public interface KylinOrderTaskMapper extends BaseMapper<KylinOrderTask> {
+
+}

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

@@ -22,7 +22,7 @@
         mobile
         FROM kylin_check_user
         <where>
-            merchant_id=#{merchantId} AND `status` = 1
+            `status` = 1
             <if test="mobile !=null and mobile !='' ">
                 AND `mobile` LIKE concat('%', #{mobile}, '%')
             </if>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.kylin.mapper.KylinOrderTaskMapper">
+
+</mapper>

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

@@ -64,6 +64,7 @@
         <where>
             r.performance_id=#{targetId}
             AND s.status IN (1, 3, 6)
+            AND s.transfer_status IN (0, 5)
             AND s.pay_status=1
             AND o.coupon_type='no'
             AND o.payment_type IN
@@ -82,6 +83,7 @@
         <where>
             r.performance_id=${targetId}
             AND s.status IN (1, 3, 6)
+            AND s.transfer_status IN (0, 5)
             AND s.pay_status=1
             AND o.coupon_type='no'
             AND o.mid>${mid}

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

@@ -176,7 +176,10 @@
         ) AS 'total_sale_price' ,
         otr.performance_id AS 'performance_id' FROM kylin_order_tickets AS ot LEFT JOIN kylin_order_ticket_status AS ots
         ON ots.order_id = ot.order_tickets_id LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id =
-        ot.order_tickets_id WHERE (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3 or ots.`status` = 6) AND coupon_type = 'no' GROUP BY otr.performance_id
+        ot.order_tickets_id
+        WHERE (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3 or ots.`status` = 6) AND coupon_type = 'no'
+        and ots.transfer_status in (0,1,2,5)
+        GROUP BY otr.performance_id
         ) AS ot ON ot.performance_id = p.performances_id
         <where>
             <if test="title!=''">
@@ -265,7 +268,7 @@
         LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
         LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
         WHERE
-        (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3 or ots.`status` = 6) and coupon_type ='no'
+        (ots.`status` = 1 or ots.`status` = 0 or ots.`status` = 3 or ots.`status` = 6) and coupon_type ='no' and ots.transfer_status in (0,1,2,5)
         GROUP BY otr.performance_id
         ) AS ot ON ot.performance_id = p.performances_id
         <where>
@@ -423,7 +426,7 @@
                         inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                         inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
-                  and kots.`status` in(1,3,6) and kot.coupon_type ='no'
+                  and kots.`status` in(1,3,6) and kot.coupon_type ='no' and kots.transfer_status in (0,1,2,5)
                 group by kotr.performance_id,kotr.ticket_id
             ) AS ot ON (ot.performance_id = kp.performances_id and ot.ticket_id = kp.ticket_id)
                 left JOIN(
@@ -435,7 +438,7 @@
                         inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                         inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
-                  and kots.`status` = 0 and kot.coupon_type ='no'
+                  and kots.`status` = 0 and kot.coupon_type ='no' and kots.transfer_status in (0,1,2,5)
                 group by kotr.performance_id,kotr.ticket_id
             ) AS otp ON (otp.performance_id = kp.performances_id and otp.ticket_id = kp.ticket_id)
                 left JOIN(
@@ -448,7 +451,7 @@
                         inner join kylin_order_tickets AS kot on kotr.order_id = kot.order_tickets_id
                         inner JOIN kylin_order_ticket_status AS kots ON kots.order_id = kot.order_tickets_id
                 WHERE 1>0 and kotr.performance_id = ${performancesId}
-                  and kots.`status` in(4,6) and kot.coupon_type ='no'
+                  and kots.`status` in(4,6) and kot.coupon_type ='no' and kots.transfer_status in (0,1,2,5)
                 group by kotr.performance_id,kotr.ticket_id
             ) AS rd ON (rd.performance_id = kp.performances_id and rd.ticket_id = kp.ticket_id)
                 left join kylin_tickets kt on kt.tickets_id = kp.ticket_id

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/task/FeignPlatformTaskClient.java

@@ -19,4 +19,7 @@ public interface FeignPlatformTaskClient {
 
     @PostMapping("platform/performance/checkPerformanceTime")
     ResponseDto<String> checkPerformanceTime();
+
+    @PostMapping("platform/order/checkTransferOrder")
+    ResponseDto<Boolean> checkTransferOrder(Integer minute);
 }

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

@@ -136,6 +136,9 @@ public class AdamEntersController {
             if (!Pattern.matches(LnsRegex.Valid.CN_HANZI, parameter.getName())) {
                 return ResponseDto.failure(ErrorMapping.get("10103"));
             }
+            if (!Pattern.matches(LnsRegex.Valid.CN_ID_CARD_REF, parameter.getIdCard())) {
+                return ResponseDto.failure(ErrorMapping.get("10104"));
+            }
         }
         if (StringUtils.isBlank(parameter.getEntersId())) {
             return ResponseDto.failure(ErrorMapping.get("10015"));

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

@@ -231,9 +231,6 @@ public class AdamUserController {
             return ResponseDto.failure(ErrorMapping.get("10104"));
         }
         AdamRealInfoVo vo = adamUserService.identity(CurrentUtil.getCurrentUid(), name, idCard);
-        if (null == vo) {
-            return ResponseDto.failure(ErrorMapping.get("10000"));
-        }
         vo.setName(SensitizeUtil.chineseName(vo.getName()));
         vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
         return ResponseDto.success(vo);
@@ -318,6 +315,30 @@ public class AdamUserController {
         return ResponseDto.success(map);
     }
 
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "用户简易信息", notes = "根据用户手机号查询用户姓名，id，手机号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mobile", value = "手机号"),
+    })
+    @PostMapping(value = {"gif/mobile"})
+    public ResponseDto<AdamUserInfoSimpleVo> getInfoByMobile(@Pattern(regexp = "\\d{11}", message = "手机号格式有误")
+                                                             @RequestParam String mobile) {
+        String uid = adamRdmService.getUidByMobile(mobile);
+        if(uid==null){
+            return ResponseDto.failure("账号不存在，请确认");
+        }
+        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(uid);
+        AdamUserInfoSimpleVo vo = AdamUserInfoSimpleVo.getNew();
+        if (userInfoVo.getState().equals(1)) {
+            vo.setMobile(userInfoVo.getMobile());
+            vo.setUid(userInfoVo.getUid());
+            vo.setNickname(userInfoVo.getNickname());
+            return ResponseDto.success(vo);
+        } else {
+            return ResponseDto.failure("账号不存在，请确认");
+        }
+    }
+
     /* ---------------------------- Internal Method ---------------------------- */
 
     private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";

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

 package com.liquidnet.service.adam.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.exception.LiquidnetServiceException;
+import com.liquidnet.commons.lang.util.IdentityUtils;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.util.NknameUtil;
 import com.liquidnet.service.adam.util.ObjectUtil;
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +19,9 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -156,15 +162,81 @@ public class AdamRdmService {
         return vo;
     }
 
-    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <ID_TYPE+ID_NO, ID_NAME> */
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 认证失败的<ID_TYPE+ID_NO, ID_NAME> */
 
+    public boolean setCertificationJunk(int idType, String idNo, String idName) {
+        return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION_JUNK + idType + idNo, idName, 604800);
+    }
+
+    public boolean isCertificationJunk(int idType, String idNo, String idName) {
+        String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION_JUNK + idType + idNo);
+        return !StringUtils.isEmpty(o) && o.equals(idName);
+    }
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 认证成功的<ID_TYPE+ID_NO, ID_NAME> */
+
+    /**
+     * 目前只针对身份证类型三方服务认证成功的标记
+     *
+     * @param idType
+     * @param idNo
+     * @param idName
+     * @return
+     */
     public boolean setCertification(int idType, String idNo, String idName) {
         return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName);
     }
 
-    public boolean isCertification(int idType, String idNo, String idName) {
+    /**
+     * 目前只针对身份证类型三方服务认证成功的标记
+     *
+     * @param idType
+     * @param idNo
+     * @param idName
+     * @return
+     */
+    public int isCertification(int idType, String idNo, String idName) {
         String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION + idType + idNo);
-        return !StringUtils.isEmpty(o) && o.equals(idName);
+        if (StringUtils.isEmpty(o)) {
+            return -1;
+        }
+        return o.equals(idName) ? 1 : 0;
+//        return !StringUtils.isEmpty(o) && o.equals(idName);
+    }
+
+    /**
+     * 身份证实名处理
+     *
+     * @param uid
+     * @param name
+     * @param idCard
+     */
+    public void identityHandler1(String uid, String name, String idCard) {
+        int rst = this.isCertification(1, idCard, name);
+        switch (rst) {
+            case -1:// 本地不存在
+                if (this.isCertificationJunk(1, idCard, name)) {
+                    ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                    throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+                }
+
+                String respStr = IdentityUtils.aliThird(name, idCard);
+                JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
+                if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
+                    log.info("###实名认证失败[{}]", respStr);
+                    this.setCertificationJunk(1, idCard, name);
+                    ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                    throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+                }
+
+                this.setCertification(1, idCard, name);
+                break;
+            case 0:// 本地存在，验证不通过
+                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            case 1:// 本地存在，验证通过
+                break;
+        }
     }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, List<AdamThirdPartInfoVo>> */

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

@@ -49,11 +49,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
 
         if (1 == parameter.getType()) {
-            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
-                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
-
-                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
-            }
+//            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+//                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
+//
+//                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+//            }
+            adamRdmService.identityHandler1(currentUid, parameter.getName(), parameter.getIdCard());
         }
 
 
@@ -134,9 +135,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         LocalDateTime now = LocalDateTime.now();
 
         if (1 == parameter.getType()) {
-            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
-                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
-            }
+//            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+//                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
+//
+//                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+//            }
+            adamRdmService.identityHandler1(currentUid, parameter.getName(), parameter.getIdCard());
         }
 
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
@@ -214,14 +218,4 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         log.debug("#collect.process耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
-
-    private void identityHandler(String currentUid, String name, String idCard) {
-        String respStr = IdentityUtils.aliThird(name, idCard);
-        JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
-        if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
-            log.info("###实名认证失败[{}]", respStr);
-            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-        }
-    }
 }

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

@@ -321,17 +321,24 @@ public class AdamUserServiceImpl implements IAdamUserService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public AdamRealInfoVo identity(String uid, String name, String idCard) {
-        AdamRealInfoVo vo = null;
-        if (!adamRdmService.isCertification(1, idCard, name)) {
-            String respStr = IdentityUtils.aliThird(name, idCard);
-            JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
-            if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
-                log.info("###实名认证失败[{}]", respStr);
-                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-            }
-            adamRdmService.setCertification(1, idCard, name);
-        }
+//        if (!adamRdmService.isCertification(1, idCard, name)) {
+//            if (adamRdmService.isCertificationJunk(1, idCard, name)) {
+//                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+//                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+//            }
+//
+//            String respStr = IdentityUtils.aliThird(name, idCard);
+//            JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
+//            if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
+//                log.info("###实名认证失败[{}]", respStr);
+//                adamRdmService.setCertificationJunk(1, idCard, name);
+//                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+//                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+//            }
+//            adamRdmService.setCertification(1, idCard, name);
+//        }
+        adamRdmService.identityHandler1(uid, name, idCard);
+
 
         AdamRealName realName = new AdamRealName();
         realName.setRealNameId(IDGenerator.nextSnowId() + "");
@@ -343,12 +350,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         realName.setCreatedAt(LocalDateTime.now());
         adamRealNameService.add(realName);
 
-        vo = AdamRealInfoVo.getNew();
-        vo.setUid(uid);
-        vo.setName(name);
-        vo.setIdCard(idCard);
-        vo.setType(realName.getType());
-        vo.setState(1);
+        AdamRealInfoVo vo = AdamRealInfoVo.getNew().copy(realName);
 
         long s = System.currentTimeMillis();
         adamRdmService.setRealInfoVoByUid(uid, vo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -27,7 +27,7 @@
 
 10101=姓名或身份证件号无效
 10102=身份证号与姓名不符
-10103=已超出姓名长度限制
+10103=身份证姓名不合规
 10104=身份证号码不合规
 10105=入场人不存在
 10106=收获地址不存在

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/RedisRefundReceiver.java

@@ -32,7 +32,7 @@ public class RedisRefundReceiver implements StreamListener<String, MapRecord<Str
         log.info("body " + message.getValue());
         boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
 //        if(result){
-            log.error("consumer success delete message messageId:{} ",message.getId());
+            log.info("consumer success delete message messageId:{} ",message.getId());
             try {
 //                stringRedisTemplate.multi();
                 stringRedisTemplate.opsForStream().acknowledge(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_GROUP.getCode(), message);

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/Utils/KylinUtils.java

@@ -35,10 +35,12 @@ public class KylinUtils {
     public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
         List<KylinOrderListVo> vo = new ArrayList<>();
         List<KylinOrderListVo> redisVo = new ArrayList();
-        KylinOrderListVo voItem = new KylinOrderListVo();
         KylinOrderTicketVo data = dataSingle;
-        BeanUtils.copyProperties(data, voItem);
+        KylinOrderListVo voItem = KylinOrderListVo.getNew().copy(data);
         List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        if(redisData==null){
+            return false;
+        }
         if (type == 1) {
             redisVo.add(voItem);
             if (redisData.size() > 0) {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerKylinOptTransferOverTimeRedisStreamConfig.java

+package com.liquidnet.service.consumer.kylin.config;
+
+import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinTransferOverTimeRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_TRANSFER_OVERTIME;
+
+@Configuration
+public class ConsumerKylinOptTransferOverTimeRedisStreamConfig {
+    @Autowired
+    ConsumerKylinTransferOverTimeRdsReceiver consumerKylinTransferOverTimeRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 验票更新
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveTransferOverTimeResult(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(SQL_TRANSFER_OVERTIME.getGroup(), SQL_TRANSFER_OVERTIME.name() + t),
+                StreamOffset.create(SQL_TRANSFER_OVERTIME.getKey(), ReadOffset.lastConsumed()), consumerKylinTransferOverTimeRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 验票更新 */
+
+    @Bean
+    public Subscription subscriptionReceiveTransferOverTime1(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferOverTimeResult(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferOverTime2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferOverTimeResult(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferOverTime3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferOverTimeResult(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferOverTime4(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferOverTimeResult(listenerContainer, 4);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferOverTime5(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferOverTimeResult(listenerContainer, 5);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerKylinSqlTransferRedisStreamConfig.java

+package com.liquidnet.service.consumer.kylin.config;
+
+import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinSqlStationRdsReceiver;
+import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinTransferRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_STATION;
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_TRANSFER;
+
+@Configuration
+public class ConsumerKylinSqlTransferRedisStreamConfig {
+    @Autowired
+    ConsumerKylinTransferRdsReceiver consumerKylinTransferRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 验票更新
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveTransfer(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(SQL_TRANSFER.getGroup(), SQL_TRANSFER.name() + t),
+                StreamOffset.create(SQL_TRANSFER.getKey(), ReadOffset.lastConsumed()), consumerKylinTransferRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 验票更新 */
+
+    @Bean
+    public Subscription subscriptionReceiveTransfer1(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransfer(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransfer2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransfer(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransfer3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransfer(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransfer4(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransfer(listenerContainer, 4);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransfer5(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransfer(listenerContainer, 5);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerKylinSqlTransferResultRedisStreamConfig.java

+package com.liquidnet.service.consumer.kylin.config;
+
+import com.liquidnet.service.consumer.kylin.receiver.ConsumerKylinTransferResultRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+import static com.liquidnet.service.base.constant.MQConst.KylinQueue.SQL_TRANSFER_RESULT;
+
+@Configuration
+public class ConsumerKylinSqlTransferResultRedisStreamConfig {
+    @Autowired
+    ConsumerKylinTransferResultRdsReceiver consumerKylinTransferResultRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 验票更新
+     *
+     * @param listenerContainer
+     * @param t
+     * @return
+     */
+    private Subscription receiveTransferResult(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(SQL_TRANSFER_RESULT.getGroup(), SQL_TRANSFER_RESULT.name() + t),
+                StreamOffset.create(SQL_TRANSFER_RESULT.getKey(), ReadOffset.lastConsumed()), consumerKylinTransferResultRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    /* -------------------------------------------------------- ｜ 验票更新 */
+
+    @Bean
+    public Subscription subscriptionReceiveTransferResult1(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferResult(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferResult2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferResult(listenerContainer, 2);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferResult3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferResult(listenerContainer, 3);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferResult4(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferResult(listenerContainer, 4);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionReceiveTransferResult5(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveTransferResult(listenerContainer, 5);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/AbstractOptOrderTransferOverTimeRedisReceiver.java

+package com.liquidnet.service.consumer.kylin.receiver;
+
+import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.OrderCloseMapping;
+import com.liquidnet.service.consumer.kylin.Utils.KylinUtils;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.stream.StreamListener;
+
+import java.util.HashMap;
+
+@Slf4j
+public abstract class AbstractOptOrderTransferOverTimeRedisReceiver implements StreamListener<String, MapRecord<String, String, String>> {
+    @Autowired
+    StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private KylinUtils kylinUtils;
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+        log.debug("CONSUMER SQL[streamKey:{},messageId:{},stream:{},body:{}]",
+                this.getRedisStreamKey(), message.getId(), message.getStream(), message.getValue());
+
+        boolean result = this.consumerOrderTransferOverTimeHandler(message.getValue().get("message"));
+        log.info("CONSUMER SQL RESULT:{} ==> MESSAGE_ID:{}", result, message.getId());
+
+        try {
+            stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+            stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+        } catch (Exception e) {
+            log.error("#CONSUMER SQL RESULT:{} ==> DEL_REDIS_QUEUE_MSG_EXCEPTION[MESSAGE_ID:{},MSG:{}]", result, message.getId(), JsonUtils.toJson(message), e);
+        } finally {
+            try {
+                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private boolean consumerOrderTransferOverTimeHandler(String msg) {
+        boolean aBoolean = false;
+        try {
+            OrderCloseMapping.orderCloseMessage mqMessage = JsonUtils.fromJson(msg, OrderCloseMapping.orderCloseMessage.class);
+            if (mqMessage == null) {
+
+            } else {
+                for (int x = 0; x < mqMessage.getOrderTicketIds().size(); x++) {
+                    String orderTicketId = mqMessage.getOrderTicketIds().get(x);
+                    KylinOrderTicketVo vo = kylinUtils.getOrderTicketVo(orderTicketId);
+                    String uid = vo.getTransferUid();
+                    vo.setTransferUid("");
+                    vo.setTransferStatus(0);
+                    redisUtil.del(KylinRedisConst.ORDER_TRANSFER.concat(uid));
+                    redisUtil.set("kylin:order:id:" + orderTicketId, vo);
+                    kylinUtils.resetOrderListVo(vo.getUserId(), 2, orderTicketId, vo);
+                }
+            }
+            aBoolean = true;
+        } catch (Exception e) {
+            log.error("CONSUMER SQL FAIL ==> {}", e.getMessage(), e);
+        } finally {
+            if (!aBoolean) {
+                HashMap<String, String> map = CollectionUtil.mapStringString();
+                map.put("message", msg);
+                stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(this.getRedisStreamKey()));
+            }
+        }
+        return aBoolean;
+    }
+
+    protected abstract String getRedisStreamKey();
+
+    protected abstract String getRedisStreamGroup();
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerKylinTransferOverTimeRdsReceiver.java

+package com.liquidnet.service.consumer.kylin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerKylinTransferOverTimeRdsReceiver extends AbstractOptOrderTransferOverTimeRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.KylinQueue.SQL_TRANSFER_OVERTIME.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.KylinQueue.SQL_TRANSFER_OVERTIME.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerKylinTransferRdsReceiver.java

+package com.liquidnet.service.consumer.kylin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerKylinTransferRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.KylinQueue.SQL_TRANSFER.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.KylinQueue.SQL_TRANSFER.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerKylinTransferResultRdsReceiver.java

+package com.liquidnet.service.consumer.kylin.receiver;
+
+import com.liquidnet.service.base.constant.MQConst;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ConsumerKylinTransferResultRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.KylinQueue.SQL_TRANSFER_RESULT.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.KylinQueue.SQL_TRANSFER_RESULT.getGroup();
+    }
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/config/ConsumerSweetAppletUserRedisStreamConfig.java

+package com.liquidnet.service.consumer.sweet.config;
+
+import com.liquidnet.service.consumer.sweet.receiver.ConsumerSweetAppletUserRdsReceiver;
+import lombok.var;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.stream.Consumer;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.ReadOffset;
+import org.springframework.data.redis.connection.stream.StreamOffset;
+import org.springframework.data.redis.stream.StreamMessageListenerContainer;
+import org.springframework.data.redis.stream.Subscription;
+
+import java.time.Duration;
+
+import static com.liquidnet.service.base.constant.MQConst.SweetQueue.SWEET_APPLET_USER_INSERT_DRAW;
+
+@Configuration
+public class ConsumerSweetAppletUserRedisStreamConfig {
+    @Autowired
+    ConsumerSweetAppletUserRdsReceiver consumerSweetAppletUserRdsReceiver;
+
+    private StreamMessageListenerContainer<String, MapRecord<String, String, String>> buildStreamMessageListenerContainer(RedisConnectionFactory factory) {
+        var options = StreamMessageListenerContainer
+                .StreamMessageListenerContainerOptions
+                .builder()
+                .pollTimeout(Duration.ofMillis(1))
+                .build();
+        return StreamMessageListenerContainer.create(factory, options);
+    }
+
+    /**
+     * 小程序登录记录用户解密后信息
+     */
+    private Subscription receiveSqlSweetAppletUser(StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer, int t) {
+        return listenerContainer.receiveAutoAck(
+                Consumer.from(SWEET_APPLET_USER_INSERT_DRAW.getGroup(), SWEET_APPLET_USER_INSERT_DRAW.name() + t),
+                StreamOffset.create(SWEET_APPLET_USER_INSERT_DRAW.getKey(), ReadOffset.lastConsumed()), consumerSweetAppletUserRdsReceiver
+        );
+    }
+
+    /* —————————————————————————— ｜ —————————————————————————— ｜ —————————————————————————— */
+
+    @Bean
+    public Subscription subscriptionSqlSweetAppletUser(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlSweetAppletUser(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlSweetAppletUser2(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlSweetAppletUser(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    @Bean
+    public Subscription subscriptionSqlSweetAppletUser3(RedisConnectionFactory factory) {
+        var listenerContainer = this.buildStreamMessageListenerContainer(factory);
+        var subscription = receiveSqlSweetAppletUser(listenerContainer, 1);
+        listenerContainer.start();
+        return subscription;
+    }
+
+    /* -------------------------------------------------------- ｜  */
+}

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/AbstractSqlRedisReceiver.java

@@ -17,7 +17,7 @@ import java.util.HashMap;
 @Slf4j
 public abstract class AbstractSqlRedisReceiver implements StreamListener<String, MapRecord<String, String, String>> {
     @Autowired
-    private IBaseDao baseDao;
+    public IBaseDao baseDao;
     @Autowired
     StringRedisTemplate stringRedisTemplate;
     @Autowired

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-sweet/src/main/java/com/liquidnet/service/consumer/sweet/receiver/ConsumerSweetAppletUserRdsReceiver.java

+package com.liquidnet.service.consumer.sweet.receiver;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.connection.stream.MapRecord;
+import org.springframework.data.redis.connection.stream.StreamRecords;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+
+@Slf4j
+@Component
+public class ConsumerSweetAppletUserRdsReceiver extends AbstractSqlRedisReceiver {
+    @Override
+    protected String getRedisStreamKey() {
+        return MQConst.SweetQueue.SWEET_APPLET_USER_INSERT_DRAW.getKey();
+    }
+
+    @Override
+    protected String getRedisStreamGroup() {
+        return MQConst.SweetQueue.SWEET_APPLET_USER_INSERT_DRAW.getGroup();
+    }
+
+    @Override
+    public void onMessage(MapRecord<String, String, String> message) {
+        log.debug("CONSUMER SQL[streamKey:{},messageId:{},stream:{},body:{}]",
+                this.getRedisStreamKey(), message.getId(), message.getStream(), message.getValue());
+
+        boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
+        log.info("CONSUMER SQL RESULT:{} ==> MESSAGE_ID:{}", result, message.getId());
+
+        try {
+            stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+            stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+        } catch (Exception e) {
+            log.error("#CONSUMER SQL RESULT:{} ==> DEL_REDIS_QUEUE_MSG_EXCEPTION[MESSAGE_ID:{},MSG:{}]", result, message.getId(), JsonUtils.toJson(message), e);
+        } finally {
+            try {
+                stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
+                stringRedisTemplate.opsForStream().delete(this.getRedisStreamKey(), message.getId());
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    private boolean consumerSqlDaoHandler(String msg) {
+        Boolean aBoolean = false;
+        try {
+            SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
+            if (sqlMessage == null) {
+                aBoolean = true;
+            } else {
+                aBoolean = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
+            }
+        } catch (Exception e) {
+            log.error("CONSUMER SQL FAIL ==> {}", e.getMessage(), e);
+        } finally {
+            if (!aBoolean) {
+                HashMap<String, String> map = CollectionUtil.mapStringString();
+                map.put("message", msg);
+//                stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(this.getRedisStreamKey()));
+            }
+        }
+        return aBoolean;
+    }
+}

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/KylinTaskHandler.java

@@ -3,11 +3,13 @@ package com.liquidnet.service.executor.main.handler;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.service.feign.kylin.task.FeignPlatformTaskClient;
 import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * XxlJob开发示例（Bean模式）
@@ -28,7 +30,7 @@ public class KylinTaskHandler {
     public ReturnT<String> checkOrderTimeHandler() {
         try {
             boolean result = feignPlatformTaskClient.checkOrderTime().getData();
-            log.info("checkOrderTimeHandler：结果："+result);
+            log.info("checkOrderTimeHandler：结果：" + result);
             return ReturnT.SUCCESS;
         } catch (Exception e) {
             return ReturnT.FAIL;
@@ -39,13 +41,27 @@ public class KylinTaskHandler {
     public ReturnT<String> checkPerformanceTimeHandler() {
         try {
             String result = feignPlatformTaskClient.checkPerformanceTime().getData();
-            log.info("checkPerformanceTimeHandler：结果："+result);
+            log.info("checkPerformanceTimeHandler：结果：" + result);
             return ReturnT.SUCCESS;
         } catch (Exception e) {
             return ReturnT.FAIL;
         }
     }
 
+    @XxlJob(value = "sev-platform:checkTransferOrderHandler")
+    public ReturnT<String> checkTransferOrderHandler() {
+        try {
+            String minute = XxlJobHelper.getJobParam(); //执行参数
+            log.debug("minute = " + minute);
+            boolean result = feignPlatformTaskClient.checkTransferOrder(Integer.parseInt(minute)).getData();
+            log.info("checkTransferOrderHandler：结果：" + result);
+            return ReturnT.SUCCESS;
+        } catch (Exception e) {
+            log.info("exception = ", e);
+            return ReturnT.FAIL;
+        }
+    }
+
 //    @Autowired
 //    private FeignSequenceClient feignSequenceClient;
 //

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/redis_queue_create.txt

@@ -25,7 +25,14 @@ XGROUP CREATE kylin:stream:rk.order.overtime.refund group.order.overtime.refund
 XADD kylin:stream:rk.station * 0 0
 XGROUP CREATE kylin:stream:rk.station group.station 0
 
+XADD kylin:stream:rk.transfer * 0 0
+XGROUP CREATE kylin:stream:rk.transfer group.transfer 0
 
+XADD kylin:stream:rk.transfer.result * 0 0
+XGROUP CREATE kylin:stream:rk.transfer.result group.transfer.result 0
+
+XADD kylin:stream:rk.transfer.overtime * 0 0
+XGROUP CREATE kylin:stream:rk.transfer.overtime group.transfer.overtime 0
 
 # ==================================================
 # XGROUP DESTROY adam:stream:rk.sms.notice group.sms.sender 0

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

@@ -11,15 +11,15 @@ import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.kylin.service.impl.KylinOrderTicketsServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.*;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.HashMap;
 import java.util.List;
@@ -135,4 +135,53 @@ public class KylinOrderTicketsController {
         map.put("unPayCount", unPayCount);
         return ResponseDto.success(map);
     }
+
+    @PostMapping("transfer")
+    @ApiOperation("转赠订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "transferUid", value = "转赠目标uid"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "transferMobile", value = "转赠目标手机号"),
+    })
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> orderTransfer(@RequestParam(value = "orderId") @NotNull @NotBlank String orderId,
+                                             @RequestParam(value = "transferUid") @NotNull @NotBlank String transferUid,
+                                             @RequestParam(value = "transferMobile") @NotNull @NotBlank String transferMobile
+    ) {
+        return orderTicketsService.orderTransfer(orderId, transferUid, transferMobile);
+    }
+
+    @PostMapping("transferWithDraw")
+    @ApiOperation("转赠订单撤回")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderId", value = "订单id"),
+    })
+    public ResponseDto<String> orderTransferWithdraw(@RequestParam(value = "orderId") @NotNull @NotBlank String orderId) {
+        return orderTicketsService.orderTransferWithdraw(orderId);
+    }
+
+    @PostMapping("transferAccept")
+    @ApiOperation("转赠订单接收")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = false, dataType = "String", name = "enterIdList", value = "逗号隔开的入场人id"),
+    })
+    public ResponseDto<String> orderTransferAccept(@RequestParam(required = false) String enterIdList) {
+        return orderTicketsService.orderTransferAccept(enterIdList);
+    }
+
+    @PostMapping("transferReject")
+    @ApiOperation("转赠订单拒收")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> orderTransferReject() {
+        return orderTicketsService.orderTransferReject();
+    }
+
+    @PostMapping("transferBack")
+    @ApiOperation("转赠订单退回")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<String> orderTransferBack(@RequestParam(value = "orderId") String orderId) {
+        return orderTicketsService.orderTransferBack(orderId);
+    }
 }

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

@@ -194,7 +194,9 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
 
         List<KylinTicketTimesVo> ticketTimesList = vo.getTicketTimeList();
         if (null != ticketTimesList) {
-            for (KylinTicketTimesVo partner : ticketTimesList) {
+
+            for (int i = 0; i < ticketTimesList.size(); i++) {
+                KylinTicketTimesVo partner = ticketTimesList.get(i);
                 List<KylinTicketVo> ticketList = partner.getTicketList();
                 List<KylinTicketVo> ticketListNew = ObjectUtil.getKylinTicketVoArrayList();
                 for (KylinTicketVo ticket : ticketList) {
@@ -204,16 +206,17 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                     Integer isMemberStatus = getIsMemberStatus(ticket);
                     ticket.setIsMemberStatus(isMemberStatus);
                     if (null == isAgent || 0 == isAgent) {
-                        if (0 == ticket.getIsAgent()) {
-                            ticketListNew.add(ticket);
-                        }
-                    } else if (1 == isAgent) {
+                        ticketListNew.add(ticket);
+                    } else if (1 >= isAgent) {
                         if (1 == ticket.getIsAgent()) {
                             ticketListNew.add(ticket);
                         }
                     }
                 }
                 partner.setTicketList(ticketListNew);
+                if (ticketListNew.size() == 0) {
+                    ticketTimesList.remove(i);
+                }
             }
         }
 

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

@@ -34,6 +34,53 @@ public class DataUtils {
     @Autowired
     private RedisUtil redisUtil;
 
+
+    /**
+     * 转赠订单
+     *
+     * @param uid
+     * @param vo
+     */
+    public void setTransferOrder(String uid, KylinOrderTicketVo vo) {
+        String redisKey = KylinRedisConst.ORDER_TRANSFER.concat(uid);
+        redisUtil.set(redisKey, vo);
+    }
+
+    /**
+     * 转赠订单
+     *
+     * @param uid
+     */
+    public KylinOrderTicketVo getTransferOrder(String uid) {
+        String redisKey = KylinRedisConst.ORDER_TRANSFER.concat(uid);
+        Object obj = redisUtil.get(redisKey);
+        if (obj != null) {
+            return (KylinOrderTicketVo) obj;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 转赠订单
+     *
+     * @param uid
+     */
+    public void delTransferOrder(String uid) {
+        String redisKey = KylinRedisConst.ORDER_TRANSFER.concat(uid);
+        redisUtil.del(redisKey);
+    }
+
+    /**
+     * 转赠订单
+     *
+     * @param uid
+     */
+    public boolean hasTransferOrder(String uid) {
+        String redisKey = KylinRedisConst.ORDER_TRANSFER.concat(uid);
+        return redisUtil.hasKey(redisKey);
+    }
+
     /**
      * 获取普通剩余库存
      *
@@ -64,13 +111,15 @@ public class DataUtils {
 
     public List<KylinOrderListVo> getOrderList(String userId) {
         Object obj = redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
-        ;
         if (obj != null) {
             return (List<KylinOrderListVo>) obj;
         } else {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
             return voList;
         }
@@ -88,6 +137,9 @@ public class DataUtils {
             return (KylinOrderTicketVo) obj;
         } else {
             KylinOrderTicketVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
+            if(ticketData==null){
+                return null;
+            }
             List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
             ticketData.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
             redisUtil.set(KylinRedisConst.ORDER + orderId, ticketData);
@@ -95,6 +147,11 @@ public class DataUtils {
         }
     }
 
+    public void setOrderTicketVo(String orderId, KylinOrderTicketVo vo) {
+        String redisKey = KylinRedisConst.ORDER + orderId;
+        redisUtil.set(redisKey, vo);
+    }
+
     /**
      * 删除订单redis
      *
@@ -278,6 +335,9 @@ public class DataUtils {
         if (obj == null) {
             // 固定条件
             Query query = getCommonWhere();
+            // 排序
+            Sort sortName = Sort.by(Sort.Direction.ASC, "sellTime");
+            query.with(sortName);
 
             // 今天的
             HashMap toDayTime = DateUtil.oneDayStartEnd();
@@ -292,6 +352,9 @@ public class DataUtils {
 
             // 固定条件
             Query queryT = getCommonWhere();
+            // 排序
+            Sort sortNameT = Sort.by(Sort.Direction.ASC, "sellTime");
+            queryT.with(sortNameT);
 
             // 三天的
             Calendar cal = Calendar.getInstance();
@@ -547,4 +610,78 @@ public class DataUtils {
         return kylinPerformanceVoList;
     }
 
+    /**
+     * 演出是否实名
+     *
+     * @param performanceId
+     */
+    public int getPerformanceIsTrueName(String performanceId) {
+        Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId);
+        if (obj!=null) {
+            return (int)obj;
+        }else{
+            int isTrueName = getPerformanceVo(performanceId).getIsTrueName();
+            redisUtil.set(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId,isTrueName);
+            return isTrueName;
+        }
+    }
+
+    public void changeBuyInfo(String userId, String idCard, String performanceId, String ticketId, int buyCount) {
+        String redisKey;
+
+        int isTrueName = getPerformanceIsTrueName(performanceId);
+
+        if (0 == isTrueName) {
+            redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
+        } else {
+            redisKey = KylinRedisConst.IDCARD_BUY_INFO + idCard;
+        }
+
+        String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
+        String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
+
+        if (buyCount > 0) {
+            redisUtil.incr(ticketIdKey, buyCount);
+            redisUtil.incr(performanceIdKey, buyCount);
+        } else {
+            redisUtil.decr(ticketIdKey, Math.abs(buyCount));
+            redisUtil.decr(performanceIdKey, Math.abs(buyCount));
+        }
+    }
+
+    // 获取 用户维度 演出购买数量
+    public int getUserPBuyCount(String userId, String performanceId) {
+        try {
+            return (int) redisUtil.get(KylinRedisConst.USERID_BUY_INFO + userId + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    // 获取 用户维度 票种购买数量
+    public int getUserTBuyCount(String userId, String ticketId) {
+        try {
+            return (int) redisUtil.get(KylinRedisConst.USERID_BUY_INFO + userId + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    // 获取 证件维度 演出购买数量
+    public int getIdCardPBuyCount(String idCard, String performanceId) {
+        try {
+            return (int) redisUtil.get(KylinRedisConst.IDCARD_BUY_INFO + idCard + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    // 获取 证件维度 票种购买数量
+    public int getIdCardTBuyCount(String idCard, String ticketId) {
+        try {
+            return (int) redisUtil.get(KylinRedisConst.IDCARD_BUY_INFO + idCard + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
 }

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

 package com.liquidnet.service.kylin.utils;
 
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
@@ -24,6 +25,8 @@ public class ObjectUtil {
     private static final ArrayList<KylinOrderListVo> kylinOrderListVoArrayList = new ArrayList<>();
     private static final ArrayList<KylinBanners> kylinBannerListArrayList = new ArrayList<>();
     private static final PagedResult<KylinStationPerformanceVo> kylinStationPerformanceVoPagedResult = new PagedResult<>();
+    private static final ArrayList<AdamEntersVo> arrayListObject = new ArrayList<>();
+
 
     public static ArrayList<KylinStationPerformanceVo> getKylinStationPerformanceVoArrayList() {
         return (ArrayList<KylinStationPerformanceVo>) kylinStationPerformanceVoArrayList.clone();
@@ -72,4 +75,8 @@ public class ObjectUtil {
     public static PagedResult<KylinStationPerformanceVo> getKylinStationPerformanceVoPagedResult() {
         return kylinStationPerformanceVoPagedResult.clone();
     }
+
+    public static ArrayList<AdamEntersVo> cloneArrayListObject() {
+        return (ArrayList<AdamEntersVo>) arrayListObject.clone();
+    }
 }

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

 package com.liquidnet.service.kylin.utils;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
+import com.liquidnet.service.kylin.dto.vo.returns.PayInnerResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import javax.xml.ws.Response;
 import java.util.List;
 
 @Component
@@ -15,6 +23,97 @@ public class OrderUtils {
 
     @Autowired
     private DataUtils dataUtils;
+    @Value("${liquidnet.adam.url}")
+    private String adamUrl;
+
+
+    public String judgeOrderLimit(
+            int type,
+            String userId,
+            String idCard,
+            String performanceId,
+            String ticketId,
+            int performanceLimitCount,
+            int performanceMemberLimitCount,
+            int ticketLimitCount,
+            int ticketMemberLimitCount,
+            int performanceBuyCount,
+            int ticketBuyCount,
+            int memberType,
+            int isTrueName
+    ) {
+        Integer[] integers;
+        if (101 == type) {
+            integers = festivalOrderLimit(userId, idCard, performanceId, ticketId, performanceBuyCount, ticketBuyCount, isTrueName);
+        } else {
+            integers = roadShowOrderLimit(userId, idCard, performanceId, ticketId, performanceBuyCount, ticketBuyCount, isTrueName);
+        }
+        return judgeMemberType(performanceLimitCount, performanceMemberLimitCount, ticketLimitCount, ticketMemberLimitCount, memberType, integers[0], integers[1], isTrueName);
+    }
+
+    public Integer[] roadShowOrderLimit(
+            String userId,
+            String idCard,
+            String performanceId,
+            String ticketId,
+            int performanceBuyCount,
+            int ticketBuyCount,
+            int isTrueName
+    ) {
+        if (1 == isTrueName) {//实名
+            performanceBuyCount += dataUtils.getIdCardPBuyCount(idCard, performanceId);
+            ticketBuyCount += dataUtils.getIdCardTBuyCount(idCard, ticketId);
+        } else {//非实名
+            performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId);
+            ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
+        }
+        Integer[] array = new Integer[2];
+        array[0] = performanceBuyCount;
+        array[1] = ticketBuyCount;
+        return array;
+    }
+
+    public Integer[] festivalOrderLimit(
+            String userId,
+            String idCard,
+            String performanceId,
+            String ticketId,
+            int performanceBuyCount,
+            int ticketBuyCount,
+            int isTrueName
+    ) {
+        if (1 == isTrueName) {//实名
+            performanceBuyCount += dataUtils.getIdCardPBuyCount(idCard, performanceId);
+            ticketBuyCount += dataUtils.getIdCardTBuyCount(idCard, ticketId);
+        } else {//非实名
+            performanceBuyCount += dataUtils.getUserPBuyCount(userId, performanceId);
+            ticketBuyCount += dataUtils.getUserTBuyCount(userId, ticketId);
+        }
+
+        Integer[] array = new Integer[2];
+        array[0] = performanceBuyCount;
+        array[1] = ticketBuyCount;
+        return array;
+    }
+
+    public String judgeMemberType(int performanceLimitCount, int performanceMemberLimitCount, int ticketLimitCount, int ticketMemberLimitCount, int memberType, int performanceBuyCount, int ticketBuyCount, int isTrueName) {
+        if (memberType == 1 || memberType == 2) {
+            if (performanceBuyCount > performanceMemberLimitCount && performanceMemberLimitCount != 0) {
+                return (1 == isTrueName ? "实名制" : "本场") + "演出限购" + performanceMemberLimitCount + "张，已超出";//超过演出维度购买量
+            }
+            if (ticketBuyCount > ticketMemberLimitCount && ticketMemberLimitCount != 0) {
+                return (1 == isTrueName ? "实名制" : "该") + "票种限购" + ticketMemberLimitCount + "张，已超出";//超过票维度购买量
+            }
+        } else {//非会员区间
+            if (performanceBuyCount > performanceLimitCount && performanceLimitCount != 0) {
+                return (1 == isTrueName ? "实名制" : "本场") + "演出限购" + performanceLimitCount + "张，已超出";//超过演出维度购买量
+            }
+            if (ticketBuyCount > ticketLimitCount && ticketLimitCount != 0) {
+                return (1 == isTrueName ? "实名制" : "该") + "票种限购" + ticketLimitCount + "张，已超出";//超过票维度购买量
+            }
+        }
+        return "";
+    }
 
     /**
      * @param userId  用户id
@@ -24,14 +123,14 @@ public class OrderUtils {
     public Boolean resetOrderListVo(String userId, Integer type, String orderId, KylinOrderTicketVo dataSingle) {
         List<KylinOrderListVo> vo = ObjectUtil.getKylinOrderListVoArrayList();
         List<KylinOrderListVo> redisVo = ObjectUtil.getKylinOrderListVoArrayList();
-        KylinOrderListVo voItem = KylinOrderListVo.getNew();
         KylinOrderTicketVo data;
         if (dataSingle == null) {
             data = dataUtils.getOrderTicketVo(orderId);
         } else {
             data = dataSingle;
         }
-        BeanUtils.copyProperties(data, voItem);
+
+        KylinOrderListVo voItem = KylinOrderListVo.getNew().copy(data);
         List<KylinOrderListVo> redisData = dataUtils.getOrderList(userId);
         if (type == 1) {
             redisVo.add(voItem);
@@ -77,4 +176,12 @@ public class OrderUtils {
                 return false;
         }
     }
+
+
+    public List<AdamEntersVo> getEnters(String entersIds, String uid){
+        String returnVo = HttpUtil.get("https://testadam.zhengzai.tv"+"/adam/rsc/inquire/enters?entersIds="+entersIds+"&uid="+uid,null);
+        ResponseDto<List<AdamEntersVo>> ResponseVo = JsonUtils.fromJson(returnVo, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
+        });
+        return ResponseVo.getData();
+    }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -44,4 +44,9 @@ kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 
 
+# ------------------------用户转赠相关接口----------------------------
+kylin_order_task.insert = INSERT INTO `kylin_order_task`(`order_id` , `status` , `created_at`) VALUES (? ,? ,?);
+kylin_order_task.delete = DELETE FROM kylin_order_task WHERE order_id = ?;
+kylin_order_ticket_status.transfer.update = UPDATE kylin_order_ticket_status SET transfer_status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+kylin_order_ticket_relation.transfer.update = UPDATE kylin_order_ticket_relations SET transfer_uid = ?, transfer_id = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 

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

@@ -857,9 +857,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 SmsEnum.ADTemplate adTemplate = null;
                 if (orderTicketData.getGetTicketType().equals("express")) {
-                    adTemplate = SmsEnum.ADTemplate.SMS_181490473;
+                    adTemplate = SmsEnum.ADTemplate.SMS_223203737;
                 } else if (orderTicketData.getGetTicketType().equals("electronic")) {
-                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_171358560 : SmsEnum.ADTemplate.SMS_181500419;
+                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_223203737 : SmsEnum.ADTemplate.SMS_223203737;
                 }
 
                 if (null != adTemplate) {
@@ -907,12 +907,22 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     }
 
     public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
-        boolean isAgent = ticketData.getIsAgent() == 1;
-        if (isAgent) {
-            return redisUtil.sHasKey(KylinRedisConst.AGENT, agentId);
-        } else {
+        if(agentId.equals(0)){
             return true;
+        }else{
+            boolean isAgent = ticketData.getIsAgent() == 1;
+            if (isAgent) {
+                return true;
+            } else {
+                return !redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
+            }
         }
+//        boolean isAgent = ticketData.getIsAgent() == 1;
+//        if (isAgent) {
+//            return redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
+//        } else {
+//            return true;
+//        }
     }
 
     private boolean sycDamaiOrder(String orderId, int isMember) {

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

@@ -60,6 +60,9 @@ public class DataUtils {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
             return voList;
         }

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -35,4 +36,11 @@ public class KylinOrderTicketsController {
     public ResponseDto<Boolean> checkOrderTime() {
         return ResponseDto.success(kylinCheckOrderTime.checkOrderTime(""));
     }
+
+    @PostMapping("checkTransferOrder")
+    @ApiOperation("转赠订单失效脚本")
+    @ApiResponse(code = 200, message = "接口返回对象参数")
+    public ResponseDto<Boolean> checkTransferOrder(@RequestParam Integer minute) {
+        return ResponseDto.success(kylinCheckOrderTime.checkTransferOrder(minute));
+    }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPerformancesPartnerController.java

@@ -57,9 +57,9 @@ public class KylinCheckUserPerformancesPartnerController {
     public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(@RequestParam("merchantId") @NotNull(message = "商户ID不能为空") String merchantId,
                                                                            @RequestParam("checkUserId") @NotNull(message = "验票用户ID不能为空") String checkUserId,
                                                                            @RequestParam("page") @NotNull(message = "页数不能为空") @Min(1) int page,
-                                                                           @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1)int size,
+                                                                           @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1) int size,
                                                                            @RequestParam("name") String name) {
-        return userPerformancesPartnerService.childPerformanceList(merchantId, checkUserId, page, size,name);
+        return userPerformancesPartnerService.childPerformanceList(merchantId, checkUserId, page, size, name);
     }
 
     @GetMapping(value = "unRelation")
@@ -70,6 +70,6 @@ public class KylinCheckUserPerformancesPartnerController {
                                                                              @RequestParam("page") @NotNull(message = "页数不能为空") @Min(1) int page,
                                                                              @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1) int size,
                                                                              @RequestParam("name") String name) {
-        return userPerformancesPartnerService.unChildPerformanceList(merchantId, checkUserId, page, size,name);
+        return userPerformancesPartnerService.unChildPerformanceList(merchantId, checkUserId, page, size, name);
     }
 }

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

 package com.liquidnet.service.platform.service.impl.kylin;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.OrderCloseMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.OrderScriptDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
-import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.mapper.KylinOrderTaskMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketRelationsMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketStatusMapper;
 import com.liquidnet.service.kylin.mapper.KylinOrderTicketsMapper;
@@ -18,6 +19,7 @@ import com.liquidnet.service.platform.utils.DataUtils;
 import com.liquidnet.service.platform.utils.QueueUtils;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
+import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -55,6 +57,8 @@ public class DMCheckOrderTimeImpl extends ServiceImpl<KylinOrderTicketsMapper, K
     private KylinOrderTicketStatusMapper orderTicketStatusMapper;
     @Autowired
     private KylinOrderTicketRelationsMapper orderTicketRelationsMapper;
+    @Autowired
+    private KylinOrderTaskMapper orderTaskMapper;
 
     public boolean checkOrderTime(String userId) {
         List<OrderScriptDto> dtoData = orderTicketsMapper.orderScriptDto(userId);
@@ -141,4 +145,57 @@ public class DMCheckOrderTimeImpl extends ServiceImpl<KylinOrderTicketsMapper, K
         }
         return true;
     }
+
+    public boolean checkTransferOrder(Integer minute) {
+        LocalDateTime now = LocalDateTime.now();
+        List<KylinOrderTask> task = orderTaskMapper.selectList(
+                Wrappers.lambdaQuery(KylinOrderTask.class).eq(KylinOrderTask::getStatus, 10).last("and NOW() > DATE_SUB(created_at,INTERVAL -("+minute+") MINUTE)")
+        );
+        ArrayList<String> orderIdList = CollectionUtil.arrayListString();
+        for (KylinOrderTask item : task) {
+            orderIdList.add(item.getOrderId());
+        }
+
+        if (orderIdList.size() == 0) {
+            return true;
+        }
+
+        //处理原订单mongo
+        HashMap<String, Object> mapMongo = new HashMap<>();
+        mapMongo.put("transferStatus", 0);
+        mapMongo.put("transferUid", "");
+        mapMongo.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
+        mapMongo.put("changeDate", now);
+        mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateMany(
+                Query.query(Criteria.where("orderTicketsId").in(orderIdList)).getQueryObject(),
+                new BasicDBObject("$set", mongoConverter.convertToMongoType(mapMongo))
+        );
+        //处理原订单mysql
+        KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
+        orderTicketStatus.setTransferStatus(0);
+        orderTicketStatus.setUpdatedAt(now);
+        orderTicketStatusMapper.update(orderTicketStatus, new UpdateWrapper<KylinOrderTicketStatus>().in("order_id", orderIdList));
+        KylinOrderTicketRelations orderTicketRelations = new KylinOrderTicketRelations();
+        orderTicketRelations.setTransferUid("");
+        orderTicketRelations.setUpdatedAt(now);
+        orderTicketRelationsMapper.update(orderTicketRelations, new UpdateWrapper<KylinOrderTicketRelations>().in("order_id", orderIdList));
+//      mysql 删除持久化数据
+        orderTaskMapper.delete(Wrappers.lambdaQuery(KylinOrderTask.class).eq(KylinOrderTask::getStatus, 10).last("and NOW() > DATE_SUB(created_at,INTERVAL -("+minute+") MINUTE)"));
+        //处理原订单redis
+        int forSize = 500;
+        int forCount = orderIdList.size() % forSize == 0 ? orderIdList.size() / forSize : (orderIdList.size() / forSize) + 1;
+        for (int i = 0; i < forCount; i++) {
+            LinkedList<String> mqList = new LinkedList<>();
+            for (int y = 0; y < forSize; y++) {
+                try {
+                    String t = orderIdList.get(i * 500 + y);
+                    mqList.add(t);
+                } catch (Exception e) {
+                    break;
+                }
+            }
+            queueUtils.sendMsgByRedis(MQConst.KylinQueue.SQL_TRANSFER_OVERTIME.getKey(), OrderCloseMapping.get(mqList));
+        }
+        return true;
+    }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinCheckUserPartnerServiceImpl.java

@@ -57,6 +57,9 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
         try {
             PageHelper.startPage(page, size);
             List<ChildListDao> data = checkUserMapper.childSimpleList(merchantId, mobile);
+            for (ChildListDao item : data) {
+                item.setMobile(item.getMobile().substring(0, 3) + "****" + item.getMobile().substring(7));
+            }
             pageInfo = new PageInfo(data);
             return pageInfo;
         } catch (Exception e) {
@@ -86,8 +89,8 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
     public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) {
         try {
 
-            int count = checkUserMapper.selectCount(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile,mobile).eq(KylinCheckUser::getStatus,1));
-            if(count>0){
+            int count = checkUserMapper.selectCount(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile, mobile).eq(KylinCheckUser::getStatus, 1));
+            if (count > 0) {
                 return ResponseDto.failure("手机号已存在");
             }
 
@@ -114,8 +117,8 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
     @Override
     public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) {
         try {
-            KylinCheckUser kylinCheckUser = checkUserMapper.selectOne(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile,mobile).eq(KylinCheckUser::getStatus,1));
-            if(kylinCheckUser!=null && !kylinCheckUser.getCheckUserId().equals(checkUserId)){
+            KylinCheckUser kylinCheckUser = checkUserMapper.selectOne(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile, mobile).eq(KylinCheckUser::getStatus, 1));
+            if (kylinCheckUser != null && !kylinCheckUser.getCheckUserId().equals(checkUserId)) {
                 return ResponseDto.failure("手机号已存在");
             }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -112,10 +112,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             if (createParam == null) {
                 result = createStep1(step1Param);
-                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(),"createStep1", step1Param,result));
+                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "createStep1", step1Param, result));
             } else {// 修改
                 result = updateStep1(step1Param);
-                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(),"updateStep1", step1Param,result));
+                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "updateStep1", step1Param, result));
             }
         }
         return result;
@@ -219,7 +219,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         if (null != performanceStatus) {
             data.setStatus(performanceStatus.getStatus());
         }
-        log.info(UserPathDto.setPartnerData("0","getStep1", "performancesId="+performancesId,data));
+        log.info(UserPathDto.setPartnerData("0", "getStep1", "performancesId=" + performancesId, data));
         return ResponseDto.success(data);
     }
 
@@ -232,10 +232,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, step2Param.getPerformancesId()));
             if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
                 result = createStep2(step2Param);
-                log.info(UserPathDto.setPartnerData("0","createStep2", step2Param,result));
+                log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, result));
             } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9) {// 修改
                 result = updateStep2(step2Param);
-                log.info(UserPathDto.setPartnerData("0","updateStep2(step2Param", step2Param,result));
+                log.info(UserPathDto.setPartnerData("0", "updateStep2(step2Param", step2Param, result));
             } else if (performanceStatus.getStatus() == 10) {
                 result = ResponseDto.failure("演出已结束不可修改");
             }
@@ -384,7 +384,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     performanceStatus.setLimitCount(step2Param.getLimitCount());
                     performanceStatusMapper.update(performanceStatus, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performanceId));
 
-                    dataUtils.setPerformanceIsTrueName(performanceId,step2Param.getIsTrueName());
+                    dataUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
 
                     //提示：票种价格、售票时间、票种购票限制 直接生效 (演出购票限制，购票须知 演出是否实名 票种缺货登记 票种是否电子票 票种是否快递票 票种最低购买张数 票种是否显示二维码)
                     List<TicketTimesTicketCreatePartnerVo> timeList = kylinPerformanceMisVo.getTicketTimes();
@@ -477,7 +477,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         }
 
         performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-        log.info(UserPathDto.setPartnerData("0","getStep2", "performancesId="+performancesId,performanceStep2Param));
+        log.info(UserPathDto.setPartnerData("0", "getStep2", "performancesId=" + performancesId, performanceStep2Param));
         return ResponseDto.success(performanceStep2Param);
     }
 
@@ -524,7 +524,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             }
 //            判断状态
             performanceVoTask.performanceVoStatus(performancesId);
-            log.info(UserPathDto.setPartnerData("0","onLinePerformance", "performancesId="+performancesId,"上线成功"));
+            log.info(UserPathDto.setPartnerData("0", "onLinePerformance", "performancesId=" + performancesId, "上线成功"));
             return ResponseDto.success("上线成功");
         } catch (Exception e) {
             log.debug("上线失败", e);
@@ -546,7 +546,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         , Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
 
                 performanceVoTask.performanceVoStatus(performancesId);
-                log.info(UserPathDto.setPartnerData("0","outLinePerformance", "performancesId="+performancesId,"下线成功"));
+                log.info(UserPathDto.setPartnerData("0", "outLinePerformance", "performancesId=" + performancesId, "下线成功"));
                 return ResponseDto.success("下线成功");
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20111));
@@ -585,7 +585,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     mongoTemplate.insert(ticketItem, KylinTicketPartnerVo.class.getSimpleName());
                 }
             }
-            log.info(UserPathDto.setPartnerData("0","copyPerformance", "performancesId="+performancesId,performancePartnerVo.getPerformancesId()));
+            log.info(UserPathDto.setPartnerData("0", "copyPerformance", "performancesId=" + performancesId, performancePartnerVo.getPerformancesId()));
             return performancePartnerVo.getPerformancesId();
         } catch (Exception e) {
             e.printStackTrace();
@@ -673,7 +673,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                         object
                 );
-                log.info(UserPathDto.setPartnerData("0","withdraw", "performancesId="+performancesId,"撤回成功"));
+                log.info(UserPathDto.setPartnerData("0", "withdraw", "performancesId=" + performancesId, "撤回成功"));
                 return ResponseDto.success("撤回成功");
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20116));

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

@@ -149,6 +149,9 @@ public class DataUtils {
             List<KylinOrderListVo> voList = mongoTemplate.find(Query.query(Criteria.where("userId").is(userId))
                             .with(Sort.by(Sort.Direction.DESC, "createdAt")).limit(40),
                     KylinOrderListVo.class, KylinOrderTicketVo.class.getSimpleName());
+            for (KylinOrderListVo item : voList){
+                item.setStatus(item.getStatus());
+            }
             redisUtil.set(KylinRedisConst.ORDER_LIST + userId, voList);
             return voList;
         }

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -440,6 +440,28 @@ CREATE TABLE `sweet_wechat_user`
   COLLATE utf8mb4_unicode_ci
   ROW_FORMAT = DYNAMIC COMMENT '正在现场服务号关注事件储存用户信息表';
 
+-- 小程序登录记录用户解密后信息表
+drop TABLE if exists `sweet_applet_user`;
+CREATE TABLE `sweet_applet_user`
+(
+    `mid`                bigint unsigned NOT NULL AUTO_INCREMENT,
+    `user_id`            varchar(200)    NOT NULL DEFAULT '' COMMENT 'user_id',
+    `openId`             varchar(200)    NOT NULL DEFAULT '' COMMENT 'openId',
+    `unionId`            varchar(200)    NOT NULL DEFAULT '' COMMENT 'unionId',
+    `getPhoneNumber`     varchar(200)    NOT NULL DEFAULT '' COMMENT '手机号',
+    `getPurePhoneNumber` varchar(200)    NOT NULL DEFAULT '' COMMENT '手机号',
+    `getCountryCode`     varchar(200)    NOT NULL DEFAULT '' COMMENT '地区码',
+    `type`               tinyint         NOT NULL DEFAULT 0 COMMENT '1草莓 2五百里 3mdsk 4正在',
+    `created_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`         datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`mid`),
+    KEY `sweet_applet_user_user_id` (`user_id`),
+    UNIQUE KEY (openId, unionId, getPurePhoneNumber)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT '小程序登录记录用户解密后信息表';
+
 -- 答题表
 drop TABLE if exists `sweet_answer`;
 CREATE TABLE `sweet_answer`

liquidnet-bus-service/liquidnet-service-sweet/docu/redis_queue_create.txt

@@ -19,4 +19,8 @@ XGROUP CREATE sweet:stream:rk.sweetUserInsert group.sweetUserInsert 0
 
 --     提醒记录     --
 XADD sweet:stream:rk.remindInsert * 0 0
-XGROUP CREATE sweet:stream:rk.remindInsert group.remindInsert 0
+XGROUP CREATE sweet:stream:rk.remindInsert group.remindInsert 0
\ No newline at end of file
+
+--     小程序登录记录用户解密后信息     --
+XADD sweet:stream:rk.sweetAppletUserInsert * 0 0
+XGROUP CREATE sweet:stream:rk.sweetAppletUserInsert group.sweetAppletUserInsert 0
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -4,8 +4,12 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.sweet.utils.QueueUtils;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import org.apache.commons.lang3.StringUtils;
@@ -16,7 +20,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.Objects;
 
 /**
@@ -34,6 +40,9 @@ public class SweetWechatLoginServiceImpl {
     @Autowired
     private SweetWechatService sweetWechatService;
 
+    @Autowired
+    QueueUtils queueUtils;
+
     @Value("${liquidnet.service.adam.url}")
     private String adamUrl;
 
@@ -56,8 +65,6 @@ public class SweetWechatLoginServiceImpl {
                 return ResponseDto.failure("解密手机号码信息错误");
             }
 
-            registerByMobile(wxMaPhoneNumberInfo.getPurePhoneNumber());
-
             String unionId = sessionInfo.getUnionid();
             String openId = sessionInfo.getOpenid();
 
@@ -68,6 +75,18 @@ public class SweetWechatLoginServiceImpl {
             userInfo.put("getPurePhoneNumber", wxMaPhoneNumberInfo.getPurePhoneNumber());
             userInfo.put("getCountryCode", wxMaPhoneNumberInfo.getCountryCode());
 
+            registerByMobile(wxMaPhoneNumberInfo.getPurePhoneNumber());
+
+            LinkedList<String> sqls = CollectionUtil.linkedListString();
+            LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+            sqls.add(SqlMapping.get("sweet_applet_user.insert"));
+            sqlsDataA.add(new Object[]{
+                    IDGenerator.nextSnowId(), openId, unionId, wxMaPhoneNumberInfo.getPhoneNumber(), wxMaPhoneNumberInfo.getPurePhoneNumber()
+                    , wxMaPhoneNumberInfo.getCountryCode(), type
+            });
+            queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_APPLET_USER_INSERT_DRAW.getKey(),
+                    SqlMapping.gets(sqls, sqlsDataA));
+
             return ResponseDto.success(userInfo);
         } catch (Exception e) {
             log.error("WechatUserInfoError", e);

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -66,4 +66,6 @@ sweet_answer.insert=INSERT INTO sweet_answer (answer_id,phone,answer_json,img_ur
 sweet_user.insert=INSERT INTO sweet_wechat_user (user_id,openId,unionId,nickname,sexDesc,sex,headImgUrl,language,country,province,city,subscribeTime,subscribeScene) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)
 sweet_user.update=UPDATE sweet_wechat_user SET is_cancel = ?, updated_at = ?  WHERE unionId = ?
 # --------------------------提醒记录--------------------------
-sweet_remind.insert=INSERT INTO sweet_remind (remind_id,openId,unionId,performancesId) VALUES (?,?,?,?)
+sweet_remind.insert=INSERT INTO sweet_remind (remind_id,openId,unionId,performancesId) VALUES (?,?,?,?)
\ No newline at end of file
+# --------------------------小程序登录记录用户解密后信息--------------------------
+sweet_applet_user.insert=INSERT INTO sweet_applet_user (user_id,openId,unionId,getPhoneNumber,getPurePhoneNumber,getCountryCode,type) VALUES (?,?,?,?,?,?,?)
\ No newline at end of file