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

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

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class AdamDisposedParam implements java.io.Serializable {
     private static final long serialVersionUID = 7397579764049783649L;
-    @ApiModelProperty(position = 11, required = true, value = "内容ID[64]", example = "Swagger")
+    @ApiModelProperty(position = 11, required = true, value = "内容ID[64]")
     private String contentId;
     @ApiModelProperty(position = 12, required = true, value = "内容类型", allowableValues = "VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG")
     private String type;

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

@@ -13,7 +13,7 @@ public class AdamEntersParam implements java.io.Serializable {
     private static final long serialVersionUID = 8628253022063935727L;
     @ApiModelProperty(position = 10, required = false, value = "入场人ID，编辑时必传[50]")
     private String entersId;
-    @ApiModelProperty(position = 11, required = true, value = "入场人姓名[50]", example = "Swagger")
+    @ApiModelProperty(position = 11, required = true, value = "入场人姓名[50]", example = "测试")
     @Pattern(regexp = LnsRegex.Valid.CHINESE_HANZI, message = "姓名必须为2～20位汉字")
     private String name;
     @ApiModelProperty(position = 12, required = true, value = "入场人手机号[11]", example = "13100000000")

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

@@ -8,7 +8,7 @@ import lombok.Data;
 @Data
 public class AdamEntersResult implements java.io.Serializable {
     private static final long serialVersionUID = 3219448286221952517L;
-    @ApiModelProperty(position = 10, required = true, value = "入场人名称[50]", example = "Swagger")
+    @ApiModelProperty(position = 10, required = true, value = "入场人名称[50]", example = "测试")
     private String name;
     @ApiModelProperty(position = 11, required = true, value = "入场人手机号[11]", example = "13100000000")
     private String mobile;

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

 package com.liquidnet.service.adam.dto.vo;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.entity.AdamAddresses;
 import io.swagger.annotations.ApiModel;
@@ -12,6 +13,8 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -3096308044365829079L;
     @ApiModelProperty(position = 10, value = "收获地址ID[64]")
     private String addressesId;
+    @ApiModelProperty(position = 11, value = "用户ID[64]")
+    private String uid;
     @ApiModelProperty(position = 11, value = "姓名[30]")
     private String name;
     @ApiModelProperty(position = 12, value = "手机号[11]")
@@ -24,8 +27,13 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     private String county;
     @ApiModelProperty(position = 16, value = "详细地址[100]")
     private String address;
-    @ApiModelProperty(position = 18, value = "是否为默认:0-否,1-是")
+    @ApiModelProperty(position = 17, value = "是否为默认:0-否,1-是")
     private Boolean isDefault;
+    @ApiModelProperty(position = 18, value = "状态:0-INIT,1-NORMAL,2-INVALID")
+    private Integer state;
+    private String createdAt;
+    private String updatedAt;
+    private String deletedAt;
 
     private static final AdamAddressesVo obj = new AdamAddressesVo();
 
@@ -41,6 +49,7 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
     public AdamAddressesVo copy(AdamAddresses source) {
         if (null == source) return this;
         this.setAddressesId(source.getAddressesId());
+        this.setUid(source.getUid());
         this.setName(source.getName());
         this.setPhone(SensitizeUtil.custom(source.getPhone(), 3, 4));
         this.setProvince(source.getProvince());
@@ -48,6 +57,10 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
         this.setCounty(source.getCounty());
         this.setAddress(source.getAddress());
         this.setIsDefault(source.getIsDefault());
+        this.setState(source.getState());
+        this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmssTrim.format(source.getCreatedAt()));
+        this.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmssTrim.format(source.getUpdatedAt()));
+        this.setDeletedAt(DateUtil.Formatter.yyyyMMddHHmmssTrim.format(source.getDeletedAt()));
         return this;
     }
 }

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

 package com.liquidnet.service.adam.dto.vo;
 
+import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import io.swagger.annotations.ApiModel;
@@ -12,16 +13,23 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
     private static final long serialVersionUID = -9143065766410946012L;
     @ApiModelProperty(position = 10, value = "入场人ID[64]")
     private String entersId;
-    @ApiModelProperty(position = 11, value = "入场人名称[50]")
+    @ApiModelProperty(position = 11, value = "用户ID[50]")
+    private String uid;
+    @ApiModelProperty(position = 12, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
+    private Integer type;
+    @ApiModelProperty(position = 13, value = "姓名[50]")
     private String name;
-    @ApiModelProperty(position = 12, value = "入场人手机号[11]")
+    @ApiModelProperty(position = 14, value = "手机号[11]")
     private String mobile;
-    @ApiModelProperty(position = 13, value = "证件类型:1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证")
-    private Integer type;
-    @ApiModelProperty(position = 14, value = "入场人证件号[11]")
+    @ApiModelProperty(position = 15, value = "证件号[11]")
     private String idCard;
-    @ApiModelProperty(position = 15, value = "是否为默认:0-否,1-是")
+    @ApiModelProperty(position = 16, value = "默认:0-否,1-是")
     private Boolean isDefault;
+    @ApiModelProperty(position = 17, value = "状态:0-INIT,1-NORMAL,2-INVALID")
+    private Integer state;
+    private String createdAt;
+    private String updatedAt;
+    private String deletedAt;
 
     private static final AdamEntersVo obj = new AdamEntersVo();
 
@@ -37,11 +45,16 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
     public AdamEntersVo copy(AdamEnters source) {
         if (null == source) return this;
         this.setEntersId(source.getEntersId());
+        this.setUid(source.getUid());
+        this.setType(source.getType());
         this.setName(SensitizeUtil.chineseName(source.getName()));
-        this.setIdCard(SensitizeUtil.custom(source.getIdCard(), 3, 2));
         this.setMobile(SensitizeUtil.custom(source.getMobile(), 3, 4));
-        this.setType(source.getType());
+        this.setIdCard(SensitizeUtil.custom(source.getIdCard(), 3, 2));
         this.setIsDefault(source.getIsDefault());
+        this.setState(source.getState());
+        this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getCreatedAt()));
+        this.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getUpdatedAt()));
+        this.setDeletedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getDeletedAt()));
         return this;
     }
 }

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

 package com.liquidnet.service.adam.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.adam.dto.AdamAddressesParam;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
-import com.liquidnet.service.adam.entity.AdamAddresses;
-
-import java.util.List;
 
 /**
  * <p>
@@ -14,17 +11,13 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-11
  */
-public interface IAdamAddressesService extends IService<AdamAddresses> {
-
-    void add(AdamAddresses adamAddresses);
-
-//    List<AdamAddresses> queryByUid(String uid);
+public interface IAdamAddressesService {
 
-//    AdamAddresses query(String uid, String addressesId);
+    String add(AdamAddressesParam parameter);
 
     void def(String uid, String addressesId);
 
-    void edit(AdamAddresses info);
+    void edit(AdamAddressesParam parameter);
 
     void remove(String uid, String addressesId);
 

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

 package com.liquidnet.service.adam.service;
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
-import com.liquidnet.service.adam.entity.AdamEnters;
-
-import java.util.List;
 
 /**
  * <p>
@@ -14,16 +11,12 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-04-28
  */
-public interface IAdamEntersService extends IService<AdamEnters> {
-//    List<AdamEnters> queryByUid(String uid);
-
-    void add(AdamEnters info);
-
-//    AdamEnters query(String uid, String entersId);
+public interface IAdamEntersService {
+    String add(AdamEntersParam parameter);
 
     void def(String uid, String entersId);
 
-    void edit(AdamEnters info);
+    void edit(AdamEntersParam parameter);
 
     void remove(String uid, String entersId);
 

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

 package com.liquidnet.service.adam.service;
 
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.entity.AdamEnters;
 
 import java.util.List;
@@ -39,21 +38,21 @@ public interface IAdamRdmService {
 
     void delThirdPartVoListByUid(String uid);
 
-    boolean setEntersByUid(String uid, List<AdamEnters> list);
+    boolean setEntersVoByUid(String uid, List<AdamEntersVo> list);
 
-    List<AdamEnters> getEntersByUid(String uid);
+    List<AdamEntersVo> getEntersVoByUid(String uid);
 
-    AdamEnters getEntersByUidEntersId(String uid, String entersId);
+    AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId);
 
-    void delEntersByUid(String uid);
+    void delEntersVoByUid(String uid);
 
-    boolean setAddressesByUid(String uid, List<AdamAddresses> list);
+    boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list);
 
-    List<AdamAddresses> getAddressesByUid(String uid);
+    List<AdamAddressesVo> getAddressesVoByUid(String uid);
 
-    AdamAddresses getAddressesByUidAddressesId(String uid, String addressesId);
+    AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId);
 
-    void delAddressesByUid(String uid);
+    void delAddressesVoByUid(String uid);
 
     boolean setUserMemberVoByUid(String uid, AdamUserMemberVo vo);
 

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

+package com.liquidnet.service.kylin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.entity.KylinLackRegisters;
+
+public interface IKylinLackRegistersService extends IService<KylinLackRegisters> {
+
+    ResponseDto<String> addLackRegister(String performanceId,String ticketId);
+
+}

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

@@ -102,7 +102,7 @@
 ////        String[] dbTableArray = new String[]{"kylin_buy_notice"};
 ////        String[] dbTableArray = new String[]{"kylin_order_tickets","kylin_order_ticket_relations","kylin_order_ticket_status","kylin_order_ticket_entities"};
 ////        String[] dbTableArray = new String[]{"kylin_check_user","kylin_check_user_performances"};
-//        String[] dbTableArray = new String[]{"express_batches","express_logs","express_timelines","expresses"};
+//        String[] dbTableArray = new String[]{"kylin_lack_registers"};
 //
 //        doGenerator(resourcePath, dsc, directory, dbTableArray);
 //    }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderScriptDto.java

@@ -17,5 +17,6 @@ public class OrderScriptDto {
     String orderCode;
     Integer status;
     String ticketId;
+    String userId;
     Integer number;
 }

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

+package com.liquidnet.service.kylin.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class KylinLackRegisters implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Integer mid;
+
+    /**
+     * lack_registers_id
+     */
+    private String lackRegistersId;
+
+    /**
+     * performance_id
+     */
+    private String performanceId;
+
+    /**
+     * ticket_id
+     */
+    private String ticketId;
+
+    /**
+     * user_id
+     */
+    private String userId;
+
+    /**
+     * user_name
+     */
+    private String userName;
+
+    /**
+     * user_mobile
+     */
+    private String userMobile;
+
+    /**
+     * send_status
+     */
+    private Integer sendStatus;
+
+    /**
+     * ip_address
+     */
+    private String ipAddress;
+
+    /**
+     * created_at
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * updated_at
+     */
+    private LocalDateTime updatedAt;
+
+    /**
+     * 获取 支付回调 数据库参数
+     *
+     * @return
+     */
+    public Object[] getInsertObj() {
+        return new Object[]{
+                lackRegistersId, performanceId, ticketId,userId,userName,userMobile,0,ipAddress,createdAt
+        };
+    }
+}

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

+package com.liquidnet.service.kylin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.kylin.entity.KylinLackRegisters;
+import com.liquidnet.service.kylin.entity.KylinOrderTicketRelations;
+
+/**
+ * <p>
+ * 订单关系 Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface KylinLackRegistersMapper extends BaseMapper<KylinLackRegisters> {
+
+}

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinLackRegistersMapper.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.KylinLackRegistersMapper">
+
+</mapper>

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

@@ -48,6 +48,7 @@
         <result column="status" property="status"/>
         <result column="ticket_id" property="ticketId"/>
         <result column="number" property="number"/>
+        <result column="user_id" property="userId"/>
     </resultMap>
 
 
@@ -199,7 +200,8 @@
         order_code,
         status,
         ticket_id,
-        number
+        number,
+        user_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

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

@@ -3,27 +3,22 @@ package com.liquidnet.service.adam.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.adam.entity.AdamAddresses;
+import com.liquidnet.service.adam.dto.AdamAddressesParam;
+import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.service.IAdamAddressesService;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.adam.dto.AdamAddressesParam;
-import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 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.NotBlank;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -49,33 +44,15 @@ public class AdamAddressesController {
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "添加收获地址")
     @PostMapping("add")
-    public ResponseDto<Object> add(@RequestBody @Valid AdamAddressesParam parameter) {
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        AdamAddresses adamAddresses = new AdamAddresses();
-        BeanUtils.copyProperties(parameter, adamAddresses);
-        adamAddresses.setUid(currentUid);
-        adamAddresses.setAddressesId(String.valueOf(IDGenerator.nextSnowId()));
-        adamAddresses.setCreatedAt(LocalDateTime.now());
-        adamAddresses.setState(1);
-
-        adamAddressesService.add(adamAddresses);
-
-        return ResponseDto.success(adamAddresses.getAddressesId());
+    public ResponseDto<Object> add(@Valid @RequestBody AdamAddressesParam parameter) {
+        return ResponseDto.success(adamAddressesService.add(parameter));
     }
 
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "收获地址列表")
     @GetMapping("list")
     public ResponseDto<List<AdamAddressesVo>> list() {
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        List<AdamAddressesVo> voList = new ArrayList<>();
-        adamRdmService.getAddressesByUid(currentUid).forEach(i -> {
-            voList.add(AdamAddressesVo.getNew().copy(i));
-        });
-
-        return ResponseDto.success(voList);
+        return ResponseDto.success(adamRdmService.getAddressesVoByUid(CurrentUtil.getCurrentUid()));
     }
 
     @ApiOperationSupport(order = 3)
@@ -84,10 +61,10 @@ public class AdamAddressesController {
     public ResponseDto<Object> def(@NotBlank @PathVariable String addrId) {
         String currentUid = CurrentUtil.getCurrentUid();
 
-        AdamAddresses addresses = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
-        if (null == addresses) return ResponseDto.failure(ErrorMapping.get("10106"));
+        AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(currentUid, addrId);
+        if (null == vo) return ResponseDto.failure(ErrorMapping.get("10106"));
 
-        if (!addresses.getIsDefault()) adamAddressesService.def(currentUid, addrId);
+        if (!vo.getIsDefault()) adamAddressesService.def(currentUid, addrId);
 
         return ResponseDto.success();
     }
@@ -99,15 +76,11 @@ public class AdamAddressesController {
         if (StringUtils.isBlank(parameter.getAddressesId())) {
             return ResponseDto.failure(ErrorMapping.get("10016"));
         }
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        AdamAddresses updateInfo = new AdamAddresses();
-        BeanUtils.copyProperties(parameter, updateInfo);
-        updateInfo.setUpdatedAt(LocalDateTime.now());
-        updateInfo.setUid(currentUid);
-        updateInfo.setState(1);
+        if (null == adamRdmService.getAddressesVoByUidAddressesId(CurrentUtil.getCurrentUid(), parameter.getAddressesId())) {
+            return ResponseDto.failure(ErrorMapping.get("10106"));
+        }
 
-        adamAddressesService.edit(updateInfo);
+        adamAddressesService.edit(parameter);
 
         return ResponseDto.success();
     }
@@ -116,13 +89,13 @@ public class AdamAddressesController {
     @ApiOperation(value = "删除收获地址")
     @PostMapping("del/{addrId}")
     public ResponseDto<Object> del(@NotBlank @PathVariable String addrId) {
-
         String currentUid = CurrentUtil.getCurrentUid();
 
-        AdamAddresses addresses = adamRdmService.getAddressesByUidAddressesId(currentUid, addrId);
-        if (null == addresses) return ResponseDto.failure(ErrorMapping.get("10106"));
+        AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(currentUid, addrId);
+        if (null == vo) return ResponseDto.failure(ErrorMapping.get("10106"));
 
         adamAddressesService.remove(currentUid, addrId);
+
         return ResponseDto.success();
     }
 
@@ -130,10 +103,9 @@ public class AdamAddressesController {
     @ApiOperation(value = "收货地址详情")
     @PostMapping("query/{id}")
     public ResponseDto<AdamAddressesVo> query(@NotBlank @PathVariable(name = "id") String addrId,
-                                              @NotBlank @RequestParam(required = false) String uid) {
-        AdamAddresses addresses = adamRdmService.getAddressesByUidAddressesId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, addrId);
-
-        return null == addresses ? ResponseDto.failure(ErrorMapping.get(10105)) : ResponseDto.success(AdamAddressesVo.getNew().copy(addresses));
+                                              @RequestParam(required = false) String uid) {
+        AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, addrId);
+        return null == vo ? ResponseDto.failure(ErrorMapping.get("10106")) : ResponseDto.success(vo);
     }
 
     @ApiOperationSupport(order = 7)

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

@@ -50,32 +50,14 @@ public class AdamEntersController {
     @ApiOperation(value = "添加入场人")
     @PostMapping("add")
     public ResponseDto<String> add(@RequestBody @Valid AdamEntersParam parameter) {
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        AdamEnters addInfo = new AdamEnters();
-        BeanUtils.copyProperties(parameter, addInfo);
-        addInfo.setUid(currentUid);
-        addInfo.setEntersId(String.valueOf(IDGenerator.nextSnowId()));
-        addInfo.setCreatedAt(LocalDateTime.now());
-        addInfo.setState(1);
-
-        adamEntersService.add(addInfo);
-
-        return ResponseDto.success(addInfo.getEntersId());
+        return ResponseDto.success(adamEntersService.add(parameter));
     }
 
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "入场人列表")
     @GetMapping("list")
     public ResponseDto<List<AdamEntersVo>> list() {
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        List<AdamEntersVo> voList = new ArrayList<>();
-        adamRdmService.getEntersByUid(currentUid).forEach(i -> {
-            voList.add(AdamEntersVo.getNew().copy(i));
-        });
-
-        return ResponseDto.success(voList);
+        return ResponseDto.success(adamRdmService.getEntersVoByUid(CurrentUtil.getCurrentUid()));
     }
 
     @ApiOperationSupport(order = 3)
@@ -83,10 +65,11 @@ public class AdamEntersController {
     @PostMapping("def/{entersId}")
     public ResponseDto<Object> def(@NotBlank @PathVariable String entersId) {
         String currentUid = CurrentUtil.getCurrentUid();
-        AdamEnters enters = adamRdmService.getEntersByUidEntersId(currentUid, entersId);
-        if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
 
-        if (!enters.getIsDefault()) {
+        AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(currentUid, entersId);
+        if (null == vo) return ResponseDto.failure(ErrorMapping.get("10105"));
+
+        if (!vo.getIsDefault()) {
             adamEntersService.def(currentUid, entersId);
         }
         return ResponseDto.success();
@@ -99,18 +82,11 @@ public class AdamEntersController {
         if (StringUtils.isBlank(parameter.getEntersId())) {
             return ResponseDto.failure(ErrorMapping.get("10015"));
         }
-        String currentUid = CurrentUtil.getCurrentUid();
-
-        AdamEnters enters = adamRdmService.getEntersByUidEntersId(currentUid, parameter.getEntersId());
-        if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
-
-        AdamEnters updateInfo = new AdamEnters();
-        BeanUtils.copyProperties(parameter, updateInfo);
-        updateInfo.setUpdatedAt(LocalDateTime.now());
-        updateInfo.setUid(currentUid);
-        updateInfo.setState(1);
+        if (null == adamRdmService.getEntersVoByUidEntersId(CurrentUtil.getCurrentUid(), parameter.getEntersId())) {
+            return ResponseDto.failure(ErrorMapping.get("10105"));
+        }
 
-        adamEntersService.edit(updateInfo);
+        adamEntersService.edit(parameter);
 
         return ResponseDto.success();
     }
@@ -121,10 +97,11 @@ public class AdamEntersController {
     public ResponseDto<Object> del(@NotBlank @PathVariable String entersId) {
         String currentUid = CurrentUtil.getCurrentUid();
 
-        AdamEnters enters = adamRdmService.getEntersByUidEntersId(currentUid, entersId);
+        AdamEntersVo enters = adamRdmService.getEntersVoByUidEntersId(currentUid, entersId);
         if (null == enters) return ResponseDto.failure(ErrorMapping.get("10105"));
 
         adamEntersService.remove(currentUid, entersId);
+
         return ResponseDto.success();
     }
 
@@ -132,10 +109,9 @@ public class AdamEntersController {
     @ApiOperation(value = "入场人详情")
     @PostMapping("query/{entersId}")
     public ResponseDto<AdamEntersVo> query(@NotBlank @PathVariable String entersId,
-                                           @NotBlank @RequestParam(required = false) String uid) {
-        AdamEnters info = adamRdmService.getEntersByUidEntersId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, entersId);
-
-        return null == info ? ResponseDto.failure(ErrorMapping.get(10105)) : ResponseDto.success(AdamEntersVo.getNew().copy(info));
+                                           @RequestParam(required = false) String uid) {
+        AdamEntersVo vo = adamRdmService.getEntersVoByUidEntersId(StringUtils.isBlank(uid) ? CurrentUtil.getCurrentUid() : uid, entersId);
+        return null == vo ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vo);
     }
 
     @ApiOperationSupport(order = 7)

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

@@ -3,7 +3,6 @@ package com.liquidnet.service.adam.service.impl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.service.IAdamRdmService;
 import lombok.extern.slf4j.Slf4j;
@@ -136,16 +135,18 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public boolean setEntersByUid(String uid, List<AdamEnters> list) {
+    public boolean setEntersVoByUid(String uid, List<AdamEntersVo> list) {
         return redisUtil.set(AdamRedisConst.INFO_ENTERS.concat(uid), list);
     }
 
     @Override
-    public List<AdamEnters> getEntersByUid(String uid) {
+    public List<AdamEntersVo> getEntersVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
-        List<AdamEnters> entersList = (List<AdamEnters>) redisUtil.get(rk);
+        List<AdamEntersVo> entersList = (List<AdamEntersVo>) redisUtil.get(rk);
         if (CollectionUtils.isEmpty(entersList)) {
-            entersList = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)), AdamEnters.class, AdamEnters.class.getSimpleName());
+            entersList = mongoTemplate.find(
+                    Query.query(Criteria.where("uid").is(uid).and("state").is(1)), AdamEntersVo.class, AdamEntersVo.class.getSimpleName()
+            );
 
             if (!CollectionUtils.isEmpty(entersList)) redisUtil.set(rk, entersList);
         }
@@ -153,31 +154,27 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public AdamEnters getEntersByUidEntersId(String uid, String entersId) {
-        List<AdamEnters> entersList = this.getEntersByUid(uid);
-        if (!CollectionUtils.isEmpty(entersList))
-            for (AdamEnters r : entersList)
-                if (entersId.equals(r.getEntersId())) return r;
-        return null;
+    public AdamEntersVo getEntersVoByUidEntersId(String uid, String entersId) {
+        return this.getEntersVoByUid(uid).stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 
     @Override
-    public void delEntersByUid(String uid) {
+    public void delEntersVoByUid(String uid) {
         redisUtil.del(AdamRedisConst.INFO_ENTERS.concat(uid));
     }
 
     @Override
-    public boolean setAddressesByUid(String uid, List<AdamAddresses> list) {
+    public boolean setAddressesVoByUid(String uid, List<AdamAddressesVo> list) {
         return redisUtil.set(AdamRedisConst.INFO_ADDRESSES.concat(uid), list);
     }
 
     @Override
-    public List<AdamAddresses> getAddressesByUid(String uid) {
+    public List<AdamAddressesVo> getAddressesVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
-        List<AdamAddresses> list = (List<AdamAddresses>) redisUtil.get(rk);
+        List<AdamAddressesVo> list = (List<AdamAddressesVo>) redisUtil.get(rk);
         if (CollectionUtils.isEmpty(list)) {
             list = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
-                    AdamAddresses.class, AdamAddresses.class.getSimpleName());
+                    AdamAddressesVo.class, AdamAddressesVo.class.getSimpleName());
 
             if (!CollectionUtils.isEmpty(list)) redisUtil.set(rk, list);
         }
@@ -185,16 +182,12 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
     }
 
     @Override
-    public AdamAddresses getAddressesByUidAddressesId(String uid, String addressesId) {
-        List<AdamAddresses> list = this.getAddressesByUid(uid);
-        if (!CollectionUtils.isEmpty(list))
-            for (AdamAddresses r : list)
-                if (addressesId.equals(r.getAddressesId())) return r;
-        return null;
+    public AdamAddressesVo getAddressesVoByUidAddressesId(String uid, String addressesId) {
+        return this.getAddressesVoByUid(uid).stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     @Override
-    public void delAddressesByUid(String uid) {
+    public void delAddressesVoByUid(String uid) {
         redisUtil.del(AdamRedisConst.INFO_ADDRESSES.concat(uid));
     }
 

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

@@ -283,7 +283,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
 
         /* ---------------------- 收货地址信息 */
-        adamRdmService.delAddressesByUid(uid);
+        adamRdmService.delAddressesVoByUid(uid);
 
         AdamAddresses closeAddresses = new AdamAddresses();
         closeAddresses.setUpdatedAt(now);
@@ -294,7 +294,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         // TODO: 2021/5/30 mdb + mq to sql
 
         /* ---------------------- 入场人信息 */
-        adamRdmService.delEntersByUid(uid);
+        adamRdmService.delEntersVoByUid(uid);
 
         AdamEnters closeEnters = new AdamEnters();
         closeEnters.setUpdatedAt(LocalDateTime.now());

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

@@ -13,13 +13,13 @@ adam_third_party.add=INSERT INTO adam_third_party (`uid`, open_id, avatar, nickn
 adam_third_party.unbind=UPDATE adam_third_party SET `state`=2, updated_at=? WHERE `uid`=? AND platform=? AND `state`=1
 
 # ----------------------------------------------------
-adam_addresses.add=
-adam_addresses.edit=
-adam_addresses.update.is_default=UPDATE adam_addresses set is_default=?, updated_at=? where addresses_id=? 
-adam_addresses.remove=UPDATE adam_addresses SET `state`=2, updated_at=?, deleted_at=? where addresses_id=? 
+adam_addresses.add=INSERT INTO adam_addresses (addresses_id, `uid`, `name`, phone, province, city, county, address, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?) 
+adam_addresses.edit=UPDATE adam_addresses SET `name`=?, phone=?, province=?, city=?, county=?, address=?, updated_at=? WHERE addresses_id=? 
+adam_addresses.update.is_default=UPDATE adam_addresses SET is_default=?, updated_at=? where addresses_id=? 
+adam_addresses.remove=UPDATE adam_addresses SET is_default=0, `state`=2, updated_at=?, deleted_at=? where addresses_id=? 
 
 # ----------------------------------------------------
-adam_enters.add=INSERT INTO adam_enters (enters_id, `uid`, `type`,`name`, mobile, id_card, is_default, `state`, created_at, updated_at, deleted_at, `comment`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?) 
+adam_enters.add=INSERT INTO adam_enters (enters_id, `uid`, `type`,`name`, mobile, id_card, is_default, `state`, created_at) VALUES (?,?,?,?,?,?,?,?,?) 
 adam_enters.edit=UPDATE adam_enters SET `type`=?, `name`=?, mobile=?, id_card=?, is_default=?, `state`=?, updated_at=? where enters_id=? 
 adam_enters.update.is_default=UPDATE adam_enters set is_default=?, updated_at=? where enters_id=? 
 adam_enters.remove=UPDATE adam_enters SET `state`=2, updated_at=?, deleted_at=? where enters_id=?

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -348,6 +348,7 @@ CREATE TABLE `kylin_lack_registers`
 (
     `mid`               int(11)      NOT NULL AUTO_INCREMENT,
     `lack_registers_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'lack_registers_id',
+    `performance_id`         varchar(255) NOT NULL DEFAULT '' COMMENT '票种id',
     `ticket_id`         varchar(255) NOT NULL DEFAULT '' COMMENT '票种id',
     `user_id`           varchar(255) NOT NULL DEFAULT '' COMMENT '用户id',
     `user_name`         varchar(255) NOT NULL DEFAULT '' COMMENT '用户昵称',

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

@@ -4,6 +4,7 @@ package com.liquidnet.service.kylin.controller;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
+import com.liquidnet.service.kylin.service.impl.KylinLackRegistersServiceImpl;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -31,6 +32,8 @@ public class KylinPerformancesController {
 
     @Autowired
     private KylinPerformancesServiceImpl kylinPerformancesService;
+    @Autowired
+    private KylinLackRegistersServiceImpl kylinLackRegistersService;
 
     @GetMapping("localList")
     @ApiOperation("本地演出列表")
@@ -218,4 +221,14 @@ public class KylinPerformancesController {
     public ResponseDto<String> checkPerformanceTime(){
         return ResponseDto.success(kylinPerformancesService.checkPerformanceTime());
     }
+
+    @PostMapping("lackRegister")
+    @ApiOperation("缺票登记")
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "query", dataType = "String", name = "performancesId", value = "演出id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "ticketsId", value = "票种id", required = true)
+    })
+    public ResponseDto<String> addLackRegister(@RequestParam("performancesId") String performancesId, @RequestParam("ticketsId") String ticketsId){
+        return kylinLackRegistersService.addLackRegister(performancesId,ticketsId);
+    }
 }

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

+package com.liquidnet.service.kylin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.mq.constant.MQConst;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.base.SqlMapping;
+import com.liquidnet.service.kylin.entity.KylinLackRegisters;
+import com.liquidnet.service.kylin.mapper.KylinLackRegistersMapper;
+import com.liquidnet.service.kylin.service.IKylinLackRegistersService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+
+@Service
+public class KylinLackRegistersServiceImpl extends ServiceImpl<KylinLackRegistersMapper, KylinLackRegisters> implements IKylinLackRegistersService {
+
+    @Autowired
+    private RabbitTemplate rabbitTemplate;
+
+    @Override
+    public ResponseDto<String> addLackRegister(String performanceId, String ticketId) {
+        try {
+            KylinLackRegisters lackRegisters = new KylinLackRegisters();
+            Map token = CurrentUtil.getTokenClaims();
+            lackRegisters.setLackRegistersId(IDGenerator.nextSnowId().toString());
+            lackRegisters.setPerformanceId(performanceId);
+            lackRegisters.setTicketId(ticketId);
+            lackRegisters.setUserId(CurrentUtil.getCurrentUid());
+            lackRegisters.setUserName(StringUtils.defaultString(((String) token.get("nickname")), ""));
+            lackRegisters.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
+            lackRegisters.setIpAddress(CurrentUtil.getCliIpAddr());
+            lackRegisters.setCreatedAt(LocalDateTime.now());
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+                    SqlMapping.get("kylin_order_ticket_status.close", lackRegisters.getInsertObj()));
+            return ResponseDto.success("登记成功");
+        }catch (Exception e){
+            return ResponseDto.success("登记失败");
+        }
+    }
+}

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

@@ -877,6 +877,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     );
                     dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
                     dataUtils.changeSurplusGeneral(item.getTicketId(), item.getNumber());
+                    mongoVoUtils.resetOrderListVo(item.getUserId(),2,item.getOrderTicketsId());
 
                     rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                             SqlMapping.get("kylin_order_ticket.close", orderTickets.getCloseOrderObject()));

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

@@ -17,3 +17,4 @@ kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_
 kylin_order_ticket.close=UPDATE  kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? 
 
 # ----------------------------------------------------
+kylin_lack_register.insert=INSERT INTO `kylin_lack_registers`(`lack_registers_id` ,`performance_id` ,`ticket_id` ,`user_id` ,`user_name` ,`user_mobile` ,`send_status` ,`ip_address` ,`created_at` ,)VALUES(? ,? ,? ,? ,? ,? ,? ,? ,?);