记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 593827fa authored by 张国柄's avatar 张国柄
Browse files
Options

fix:mdb.date.format;

parent 622affa2
Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 364 deletions
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamAddressesVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.entity.AdamAddresses;
......@@ -7,6 +8,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "AdamAddressesVo", description = "收获地址")
@Data
public class AdamAddressesVo implements java.io.Serializable, Cloneable {
......@@ -31,9 +34,12 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
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;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime deletedAt;
private static final AdamAddressesVo obj = new AdamAddressesVo();
......@@ -58,9 +64,13 @@ public class AdamAddressesVo implements java.io.Serializable, Cloneable {
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()));
this.setCreatedAt(source.getCreatedAt());
this.setUpdatedAt(source.getUpdatedAt());
this.setDeletedAt(source.getDeletedAt());
return this;
}
public String getPhone() {
return SensitizeUtil.custom(phone, 3, 4);
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectBaseVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@ApiModel(value = "AdamCollectBaseVo", description = "收藏基础数据")
@Data
......@@ -24,10 +27,10 @@ public class AdamCollectBaseVo implements Serializable, Cloneable {
private String type;
@ApiModelProperty(position = 16, value = "内容类型")
private Integer state;
@ApiModelProperty(position = 17, value = "收藏时间")
private String createdAt;
@ApiModelProperty(position = 18, value = "更新时间")
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final AdamCollectBaseVo obj = new AdamCollectBaseVo();
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamCollectVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@ApiModel(value = "AdamCollectVo", description = "收藏信息")
@Data
......@@ -14,8 +17,8 @@ public class AdamCollectVo implements Serializable, Cloneable {
private String contentId;
@ApiModelProperty(position = 12, required = true, value = "内容类型")
private String type;
@ApiModelProperty(position = 13, required = true, value = "收藏时间")
private String createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@ApiModelProperty(position = 14, required = true, value = "展示信息")
private AdamCollectInfoVo contentInfo;
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamDisposedBaseVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@ApiModel(value = "AdamDisposedBaseVo", description = "想去基础数据")
@Data
......@@ -24,10 +27,10 @@ public class AdamDisposedBaseVo implements Serializable, Cloneable {
private String type;
@ApiModelProperty(position = 16, value = "内容类型")
private Integer state;
@ApiModelProperty(position = 17, value = "收藏时间")
private String createdAt;
@ApiModelProperty(position = 18, value = "更新时间")
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final AdamDisposedBaseVo obj = new AdamDisposedBaseVo();
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamDisposedVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
@ApiModel(value = "AdamDisposedVo", description = "想去信息")
......@@ -16,7 +19,8 @@ public class AdamDisposedVo implements Serializable, Cloneable {
@ApiModelProperty(position = 12, value = "内容类型")
private String type;
@ApiModelProperty(position = 13, value = "标记时间")
private String createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@ApiModelProperty(position = 14, value = "展示信息")
private AdamCollectInfoVo contentInfo;
@ApiModelProperty(position = 15, value = "想去的用户信息列表，默认三个")
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamEntersVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.SensitizeUtil;
import com.liquidnet.service.adam.entity.AdamEnters;
......@@ -7,6 +8,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "AdamEntersVo", description = "入场人")
@Data
public class AdamEntersVo implements java.io.Serializable, Cloneable {
......@@ -27,9 +30,12 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
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;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern=DateUtil.DATE_FULL_STR)
private LocalDateTime deletedAt;
private static final AdamEntersVo obj = new AdamEntersVo();
......@@ -52,9 +58,17 @@ public class AdamEntersVo implements java.io.Serializable, Cloneable {
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()));
this.setCreatedAt(source.getCreatedAt());
this.setUpdatedAt(source.getUpdatedAt());
this.setDeletedAt(source.getDeletedAt());
return this;
}
public String getMobile() {
return SensitizeUtil.custom(mobile, 3, 4);
}
public String getIdCard() {
return SensitizeUtil.custom(idCard, 3, 2);
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberCodeVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.entity.AdamMemberCode;
import io.swagger.annotations.ApiModel;
......@@ -7,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
@ApiModel(value = "AdamMemberCodeAdminVo", description = "会员码兑换")
@Data
......@@ -29,16 +31,19 @@ public class AdamMemberCodeVo implements Serializable, Cloneable {
@ApiModelProperty(position = 7, value = "购买会员码的用户id")
private String buyUid;
@ApiModelProperty(position = 8, value = "购买时间")
private String buyAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime buyAt;
@ApiModelProperty(position = 9, value = "使用会员码的订单编号")
private String useOrderNo;
@ApiModelProperty(position = 10, value = "使用会员码的用户id")
private String useUid;
@ApiModelProperty(position = 11, value = "使用时间")
private String useAt;
private String createdAt;
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime useAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final AdamMemberCodeVo obj = new AdamMemberCodeVo();
......@@ -59,12 +64,12 @@ public class AdamMemberCodeVo implements Serializable, Cloneable {
this.setState(source.getState());
this.setBuyOrderNo(source.getBuyOrderNo());
this.setBuyUid(source.getBuyUid());
this.setBuyAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getBuyAt()));
this.setBuyAt(source.getBuyAt());
this.setUseOrderNo(source.getUseOrderNo());
this.setUseUid(source.getUseUid());
this.setUseAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getUseAt()));
this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getCreatedAt()));
this.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getUpdatedAt()));
this.setUseAt(source.getUseAt());
this.setCreatedAt(source.getCreatedAt());
this.setUpdatedAt(source.getUpdatedAt());
return this;
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderSimpleVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ApiModel(value = "AdamMemberOrderSimpleVo", description = "会员订单列表信息")
@Data
......@@ -16,7 +19,8 @@ public class AdamMemberOrderSimpleVo implements Serializable {
@ApiModelProperty(position = 11, value = "订单状态:0-未支付,1-已支付,2-已关闭,3-超时付,4-退款中,5-已退款")
private Integer state;
@ApiModelProperty(position = 12, value = "创建时间")
private String createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@ApiModelProperty(position = 13, value = "会员类型名称")
private String memberName;
@ApiModelProperty(position = 14, value = "购买方式:0-购买会员,1-购买会员码,2-会员码兑换,3-礼包码兑换")
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ApiModel(value = "AdamMemberOrderVo", description = "订单详情展示")
@Data
......@@ -38,11 +41,14 @@ public class AdamMemberOrderVo implements Serializable, Cloneable {
@ApiModelProperty(position = 12, value = "支付单号")
private String payNo;
@ApiModelProperty(position = 13, value = "支付时间")
private String paymentAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime paymentAt;
@ApiModelProperty(position = 14, value = "创建时间")
private String createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@ApiModelProperty(position = 15, value = "创建时间")
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
@ApiModelProperty(position = 16, value = "价格")
private BigDecimal price;
@ApiModelProperty(position = 17, value = "实付价格")
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberPriceVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.entity.AdamAddresses;
import com.liquidnet.service.adam.entity.AdamMemberPrice;
......@@ -9,6 +10,7 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@ApiModel(value = "AdamMemberPriceVo", description = "会员价格")
@Data
......@@ -30,10 +32,10 @@ public class AdamMemberPriceVo implements Serializable {
private Integer days;
@ApiModelProperty(position = 8, value = "会员包须知")
private String detail;
@ApiModelProperty(position = 9, value = "创建时间")
private String createdAt;
@ApiModelProperty(position = 10, value = "更新时间")
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final AdamMemberPriceVo obj = new AdamMemberPriceVo();
......@@ -54,8 +56,8 @@ public class AdamMemberPriceVo implements Serializable {
this.setPriceFixed(source.getPriceFixed());
this.setDays(source.getDays());
this.setDetail(source.getDetail());
this.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getCreatedAt()));
this.setUpdatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(source.getUpdatedAt()));
this.setCreatedAt(source.getCreatedAt());
this.setUpdatedAt(source.getUpdatedAt());
return this;
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRealInfoVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.liquidnet.commons.lang.util.SensitizeUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -27,4 +28,12 @@ public class AdamRealInfoVo implements Serializable, Cloneable {
}
return new AdamRealInfoVo();
}
public String getName() {
return SensitizeUtil.chineseName(name);
}
public String getIdCard() {
return SensitizeUtil.custom(idCard, 3, 2);
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamThirdPartInfoVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "ThirdPartInfoVo", description = "用户第三方信息")
@Data
public class AdamThirdPartInfoVo implements java.io.Serializable, Cloneable {
......@@ -20,10 +24,10 @@ public class AdamThirdPartInfoVo implements java.io.Serializable, Cloneable {
private String platform;
@ApiModelProperty(position = 16, value = "状态[1-绑定,2-解绑]")
private Integer state;
@ApiModelProperty(position = 17, value = "创建时间")
private String createdAt;
@ApiModelProperty(position = 18, value = "更新时间")
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final AdamThirdPartInfoVo obj = new AdamThirdPartInfoVo();
......
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserInfoVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.SensitizeUtil;
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 = "用户详情")
......@@ -33,11 +37,14 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
@ApiModelProperty(position = 20, value = "标签")
private List<AdamTagParentVo> tagMe;
@ApiModelProperty(position = 21, value = "注册时间")
private String createAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createAt;
@ApiModelProperty(position = 22, value = "最近一次更新时间")
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
@ApiModelProperty(position = 23, value = "注销时间")
private String closedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime closedAt;
@ApiModelProperty(position = 24, value = "是否完善信息[0-未完善,1-已完善]")
private Integer isComplete;
@ApiModelProperty(position = 25, value = "")
......@@ -55,4 +62,8 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
}
return new AdamUserInfoVo();
}
public String getMobile() {
return SensitizeUtil.custom(mobile, 3, 4);
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserMemberVo.java
View file @ 593827fa
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@ApiModel(value = "AdamUserMemberVo", description = "会员用户信息")
@Data
......@@ -24,11 +23,14 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
@ApiModelProperty(position = 14, value = "用户会员状态[1-NORMAL,2-INVALID]")
private Integer state;
@ApiModelProperty(position = 15, value = "过期时间")
private String expiryAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime expiryAt;
@ApiModelProperty(position = 16, value = "创建时间")
private String createdAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
@ApiModelProperty(position = 17, value = "更新时间")
private String updatedAt;
@JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final AdamUserMemberVo obj = new AdamUserMemberVo();
......@@ -47,8 +49,7 @@ public class AdamUserMemberVo implements Serializable, Cloneable {
*/
@JsonIgnore
public boolean isActive() {
LocalDateTime expiryAt = DateUtil.Formatter.yyyyMMddHHmmss.parse(this.getExpiryAt());
LocalDateTime expiryAt = this.getExpiryAt();
return this.getState() == 1 && null != expiryAt && expiryAt.isAfter(LocalDateTime.now());
}
}
liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamThirdPartyService.java deleted 100644 → 0
View file @ 622affa2
package com.liquidnet.service.adam.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
import com.liquidnet.service.adam.entity.AdamThirdParty;
import java.util.List;
/**
* <p>
* 用户第三方账号信息 服务类
* </p>
*
* @author liquidnet
* @since 2021-05-10
*/
public interface IAdamThirdPartyService extends IService<AdamThirdParty> {
// List<AdamThirdPartInfoVo> queryByUid(String uid);
// AdamThirdPartInfoVo queryByUidAndPlatform(String uid, String platform);
}
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/BsonUtil.java
View file @ 593827fa
......@@ -13,7 +13,8 @@ public class BsonUtil {
private static final JsonWriterSettings build = JsonWriterSettings.builder().dateTimeConverter(new Converter<Long>() {
@Override
public void convert(Long aLong, StrictJsonWriter strictJsonWriter) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
if (aLong >= -59014396800000L && aLong <= 253399536000000L) {
strictJsonWriter.writeRaw(String.format("\"%s\"", dateFormat.format(new Date(aLong))));
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java
View file @ 593827fa
......@@ -56,17 +56,9 @@ public class AdamLoginController {
@Autowired
DefaultAcsClient defaultAcsClient;
@Autowired
IAdamUserService adamUserService;
@Autowired
IAdamRealNameService adamRealNameService;
@Autowired
IAdamThirdPartyService adamThirdPartyService;
@Autowired
IAdamUserMemberService adamUserMemberService;
@Autowired
IAdamMemberService adamMemberService;
@Autowired
IAdamRdmService adamRdmService;
@Autowired
IAdamUserService adamUserService;
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamUserController.java
View file @ 593827fa
......@@ -28,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import javax.validation.constraints.Pattern;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
......@@ -41,15 +42,11 @@ public class AdamUserController {
@Autowired
Environment environment;
@Autowired
IAdamRdmService adamRdmService;
@Autowired
IAdamUserService adamUserService;
@Autowired
IAdamUserInfoService adamUserInfoService;
@Autowired
IAdamThirdPartyService adamThirdPartyService;
@Autowired
IAdamRealNameService adamRealNameService;
@Autowired
IAdamRdmService adamRdmService;
@ApiOperationSupport(order = 1)
@ApiOperation(value = "个人资料编辑")
......@@ -120,7 +117,7 @@ public class AdamUserController {
editUserInfoVo.setArea(parameter.getArea());
editUserInfoVo.setSignature(parameter.getSignature());
editUserInfoVo.setTagMe(tagMeVoList);
editUserInfoVo.setUpdatedAt(DateUtil.getNowTime());
editUserInfoVo.setUpdatedAt(LocalDateTime.now());
editUserInfoVo.setIsComplete(1);
adamUserInfoService.edit(editUserInfoVo);
......@@ -294,6 +291,7 @@ public class AdamUserController {
map.put("realNameInfo", adamRdmService.getRealInfoVoByUid(currentUid));
map.put("thirdPartInfo", adamRdmService.getThirdPartVoListByUid(currentUid));
map.put("userMemberVo", adamRdmService.getUserMemberVoByUid(currentUid));
map.put("memberVo", adamRdmService.getMemberSimpleVo());
return ResponseDto.success(map);
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java
View file @ 593827fa
......@@ -49,11 +49,10 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
IAdamRdmService adamRdmService;
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public String add(AdamAddressesParam parameter) {
String currentUid = CurrentUtil.getCurrentUid();
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
......@@ -63,129 +62,118 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
vo.setUid(currentUid);
vo.setIsDefault(CollectionUtils.isEmpty(vos));
vo.setState(1);
vo.setCreatedAt(nowStr);
vo.setCreatedAt(now);
mongoTemplate.insert(vo, AdamAddressesVo.class.getSimpleName());
adamRdmService.delAddressesVoByUid(currentUid);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.add",
vo.getAddressesId(), vo.getUid(), vo.getName(), vo.getPhone(), vo.getProvince(), vo.getCity(), vo.getCounty(), vo.getAddress(), vo.getIsDefault(), vo.getState(), now
)
);
adamRdmService.delAddressesVoByUid(currentUid);
return vo.getAddressesId();
}
@Override
public void def(String uid, String addressesId) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
LinkedList<Object[]> toMqObjs = new LinkedList<>();
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
if (vos.size() > 1) {// 取消原默认
AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();
unDeaultVo.setIsDefault(false);
unDeaultVo.setUpdatedAt(nowStr);
// AdamAddressesVo unDeaultVo = AdamAddressesVo.getNew();
// unDeaultVo.setIsDefault(false);
// unDeaultVo.setUpdatedAt(now);
Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid).and("state").is(1).and("isDefault").is(true)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(unDeaultVo))),
new Document("$set", new Document("isDefault", false).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
AdamAddressesVo unDefaultVoAfter = BsonUtil.toBean(doc, AdamAddressesVo.class);
toMqObjs.add(new Object[]{unDeaultVo.getIsDefault(), now, unDefaultVoAfter.getAddressesId()});
toMqObjs.add(new Object[]{false, now, unDefaultVoAfter.getAddressesId()});
// vos.removeIf(r -> r.getAddressesId().equals(unDefaultVoAfter.getAddressesId()));
// vos.add(unDefaultVoAfter);
vos = this.collectionProcess(vos, unDefaultVoAfter.getAddressesId(), unDefaultVoAfter);
}
}
{// 设置新默认
AdamAddressesVo defaultVo = AdamAddressesVo.getNew();
defaultVo.setIsDefault(true);
defaultVo.setUpdatedAt(nowStr);
// AdamAddressesVo defaultVo = AdamAddressesVo.getNew();
// defaultVo.setIsDefault(true);
// defaultVo.setUpdatedAt(now);
Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid).and("addressesId").is(addressesId)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(defaultVo))),
new Document("$set", new Document("isDefault", true).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
AdamAddressesVo defaultVoAfter = BsonUtil.toBean(doc, AdamAddressesVo.class);
toMqObjs.add(new Object[]{defaultVo.getIsDefault(), now, addressesId});
toMqObjs.add(new Object[]{true, now, addressesId});
// vos.removeIf(r -> r.getAddressesId().equals(defaultVoAfter.getAddressesId()));
// vos.add(defaultVoAfter);
vos = this.collectionProcess(vos, defaultVoAfter.getAddressesId(), defaultVoAfter);
}
}
if (!CollectionUtils.isEmpty(toMqObjs)) {
adamRdmService.setAddressesVoByUid(uid, vos);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.update.is_default", toMqObjs));
adamRdmService.setAddressesVoByUid(uid, vos);
}
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void edit(AdamAddressesParam parameter) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
AdamAddressesVo updateVo = AdamAddressesVo.getNew();
BeanUtils.copyProperties(parameter, updateVo);
updateVo.setUpdatedAt(nowStr);
Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("addressesId").is(parameter.getAddressesId())).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(updateVo))),
new Document("$set", Document.parse(JsonUtils.toJson(updateVo)).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
updateVo = BsonUtil.toBean(doc, AdamAddressesVo.class);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
adamRdmService.setAddressesVoByUid(updateVo.getUid(), this.collectionProcess(vos, parameter.getAddressesId(), updateVo));
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.edit",
updateVo.getName(), updateVo.getPhone(), updateVo.getProvince(), updateVo.getCity(), updateVo.getCounty(), updateVo.getAddress(), now, updateVo.getAddressesId()
)
);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(currentUid);
// vos.removeIf(r -> r.getAddressesId().equals(parameter.getAddressesId()));
// vos.add(updateVo);
adamRdmService.setAddressesVoByUid(updateVo.getUid(), this.collectionProcess(vos, parameter.getAddressesId(), updateVo));
}
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void remove(String uid, String addressesId) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
AdamAddressesVo removeVo = AdamAddressesVo.getNew();
removeVo.setState(2);
removeVo.setIsDefault(false);
removeVo.setUpdatedAt(nowStr);
removeVo.setDeletedAt(nowStr);
// AdamAddressesVo removeVo = AdamAddressesVo.getNew();
// removeVo.setState(2);
// removeVo.setIsDefault(false);
// removeVo.setUpdatedAt(now);
// removeVo.setDeletedAt(now);
Document doc = mongoTemplate.getCollection(AdamAddressesVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("addressesId").is(addressesId)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(removeVo))),
new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.remove", now, now, addressesId)
);
List<AdamAddressesVo> vos = adamRdmService.getAddressesVoByUid(uid);
vos.removeIf(r -> r.getAddressesId().equals(addressesId));
adamRdmService.setAddressesVoByUid(uid, vos);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_addresses.remove", now, now, addressesId)
);
}
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java
View file @ 593827fa
package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageInfo;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
import com.liquidnet.service.adam.entity.AdamCollection;
import com.liquidnet.service.adam.mapper.AdamCollectionMapper;
import com.liquidnet.service.adam.service.IAdamCollectionService;
import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.base.ResponseDto;
......@@ -26,7 +21,6 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
......@@ -62,7 +56,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
LocalDateTime now = LocalDateTime.now();
vo.setState(1);
vo.setCreatedAt(DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss));
vo.setCreatedAt(now);
mongoTemplate.insert(vo, AdamCollectBaseVo.class.getSimpleName());
......@@ -83,16 +77,15 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
@Override
public void del(String uid, String type, String... contentIds) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
delVo.setState(2);
delVo.setUpdatedAt(nowStr);
// AdamCollectBaseVo delVo = AdamCollectBaseVo.getNew();
// delVo.setState(2);
// delVo.setUpdatedAt(now);
UpdateResult updateResult = mongoTemplate.getCollection(AdamCollectBaseVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(delVo))));
new Document("$set", new Document("state", 2).append("updatedAt", now)));
if (updateResult.getModifiedCount() > 0) {
LinkedList<Object[]> toMqObjs = new LinkedList<>();
for (String c : contentIds) {
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java
View file @ 593827fa
......@@ -3,7 +3,6 @@ package com.liquidnet.service.adam.service.impl;
import com.github.pagehelper.PageInfo;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
......@@ -60,7 +59,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
LocalDateTime now = LocalDateTime.now();
vo.setState(1);
vo.setCreatedAt(DateUtil.Formatter.yyyyMMddHHmmss.format(now));
vo.setCreatedAt(now);
mongoTemplate.insert(vo, AdamDisposedBaseVo.class.getSimpleName());
......@@ -83,13 +82,14 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
AdamDisposedBaseVo delVo = AdamDisposedBaseVo.getNew();
delVo.setState(2);
delVo.setUpdatedAt(nowStr);
// AdamDisposedBaseVo delVo = AdamDisposedBaseVo.getNew();
// delVo.setState(2);
// delVo.setUpdatedAt(now);
UpdateResult updateResult = mongoTemplate.getCollection(AdamDisposedBaseVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("uid").is(uid).and("type").is(type)
.and("contentId").in(contentIds).and("state").is(1)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(delVo))));
new Document("$set", new Document("state", 2).append("updatedAt", now)));
if (updateResult.getModifiedCount() > 0) {
LinkedList<Object[]> toMqObjs = new LinkedList<>();
for (String c : contentIds) {
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java
View file @ 593827fa
......@@ -51,7 +51,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
IAdamRdmService adamRdmService;
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public String add(AdamEntersParam parameter) {
String currentUid = CurrentUtil.getCurrentUid();
LocalDateTime now = LocalDateTime.now();
......@@ -65,23 +65,22 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
vo.setUid(currentUid);
vo.setIsDefault(CollectionUtils.isEmpty(vos));
vo.setState(1);
vo.setCreatedAt(nowStr);
vo.setCreatedAt(now);
mongoTemplate.insert(vo, AdamEntersVo.class.getSimpleName());
adamRdmService.delEntersVoByUid(currentUid);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.add",
vo.getEntersId(), vo.getUid(), vo.getType(), vo.getName(), vo.getMobile(), vo.getIdCard(), vo.getIsDefault(), vo.getState(), now
)
);
adamRdmService.delEntersVoByUid(currentUid);
return vo.getEntersId();
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void def(String uid, String entersId) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
......@@ -89,47 +88,43 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
LinkedList<Object[]> toMqObjs = new LinkedList<>();
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
if (vos.size() > 1) {// 取消原默认
AdamEntersVo unDeaultVo = AdamEntersVo.getNew();
unDeaultVo.setIsDefault(false);
unDeaultVo.setUpdatedAt(nowStr);
// AdamEntersVo unDeaultVo = AdamEntersVo.getNew();
// unDeaultVo.setIsDefault(false);
// unDeaultVo.setUpdatedAt(now);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid).and("state").is(1).and("isDefault").is(true)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(unDeaultVo))),
new Document("$set", new Document("isDefault", false).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
AdamEntersVo unDeaultVoAfter = BsonUtil.toBean(doc, AdamEntersVo.class);
toMqObjs.add(new Object[]{unDeaultVo.getIsDefault(), now, unDeaultVoAfter.getEntersId()});
toMqObjs.add(new Object[]{false, now, unDeaultVoAfter.getEntersId()});
// vos.removeIf(r -> r.getEntersId().equals(unDeaultVoAfter.getEntersId()));
// vos.add(unDeaultVoAfter);
vos = this.collectionProcess(vos, unDeaultVoAfter.getEntersId(), unDeaultVoAfter);
}
}
{// 设置新默认
AdamEntersVo defaultVo = AdamEntersVo.getNew();
defaultVo.setIsDefault(true);
defaultVo.setUpdatedAt(nowStr);
// AdamEntersVo defaultVo = AdamEntersVo.getNew();
// defaultVo.setIsDefault(true);
// defaultVo.setUpdatedAt(now);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid).and("entersId").is(entersId)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(defaultVo))),
new Document("$set", new Document("isDefault", true).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
AdamEntersVo defaultVoAfter = BsonUtil.toBean(doc, AdamEntersVo.class);
toMqObjs.add(new Object[]{defaultVo.getIsDefault(), now, entersId});
toMqObjs.add(new Object[]{true, now, entersId});
// vos.removeIf(r -> r.getEntersId().equals(defaultVoAfter.getEntersId()));
// vos.add(defaultVoAfter);
vos = this.collectionProcess(vos, defaultVoAfter.getEntersId(), defaultVoAfter);
}
}
if (!CollectionUtils.isEmpty(toMqObjs)) {
adamRdmService.setEntersVoByUid(uid, vos);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.update.is_default", toMqObjs));
adamRdmService.setEntersVoByUid(uid, vos);
}
}
......@@ -137,30 +132,26 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void edit(AdamEntersParam parameter) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
AdamEntersVo updateVo = AdamEntersVo.getNew();
BeanUtils.copyProperties(parameter, updateVo);
updateVo.setUpdatedAt(nowStr);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("entersId").is(parameter.getEntersId())).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(updateVo))),
new Document("$set", Document.parse(JsonUtils.toJson(updateVo)).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
updateVo = BsonUtil.toBean(doc, AdamEntersVo.class);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
adamRdmService.setEntersVoByUid(currentUid, this.collectionProcess(vos, parameter.getEntersId(), updateVo));
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.edit",
updateVo.getType(), updateVo.getName(), updateVo.getMobile(), updateVo.getIdCard(), updateVo.getIsDefault(), updateVo.getState(), now, updateVo.getEntersId()
)
);
String currentUid = CurrentUtil.getCurrentUid();
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
// vos.removeIf(r -> r.getEntersId().equals(parameter.getEntersId()));
// vos.add(updateVo);
adamRdmService.setEntersVoByUid(currentUid, this.collectionProcess(vos, parameter.getEntersId(), updateVo));
}
}
......@@ -168,28 +159,26 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void remove(String uid, String entersId) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
AdamEntersVo removeVo = AdamEntersVo.getNew();
removeVo.setState(2);
removeVo.setIsDefault(false);
removeVo.setUpdatedAt(nowStr);
removeVo.setDeletedAt(nowStr);
// AdamEntersVo removeVo = AdamEntersVo.getNew();
// removeVo.setState(2);
// removeVo.setIsDefault(false);
// removeVo.setUpdatedAt(now);
// removeVo.setDeletedAt(now);
Document doc = mongoTemplate.getCollection(AdamEntersVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("entersId").is(entersId)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(removeVo))),
new Document("$set", new Document("state", 2).append("isDefault", false).append("updatedAt", now).append("deletedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
if (null != doc) {
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.remove", now, now, entersId)
);
List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(uid);
vos.removeIf(r -> r.getEntersId().equals(entersId));
adamRdmService.setEntersVoByUid(uid, vos);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.get("adam_enters.remove", now, now, entersId)
);
}
}
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberCodeServiceImpl.java
View file @ 593827fa
......@@ -2,7 +2,6 @@ package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
......@@ -18,7 +17,6 @@ import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
......@@ -54,8 +52,8 @@ public class AdamMemberCodeServiceImpl extends ServiceImpl<AdamMemberCodeMapper,
// mongo
AdamMemberCodeVo vo = new AdamMemberCodeVo();
BeanUtils.copyProperties(adamMemberCode, vo);
vo.setCreatedAt(DateUtil.format(adamMemberCode.getCreatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
vo.setUpdatedAt(DateUtil.format(adamMemberCode.getUpdatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
vo.setCreatedAt(adamMemberCode.getCreatedAt());
vo.setUpdatedAt(adamMemberCode.getUpdatedAt());
mongoTemplate.insert(vo, AdamMemberCodeVo.class.getSimpleName());
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java
View file @ 593827fa
......@@ -12,10 +12,8 @@ import com.liquidnet.service.adam.dto.vo.*;
import com.liquidnet.service.adam.entity.AdamMemberOrder;
import com.liquidnet.service.adam.mapper.AdamMemberOrderMapper;
import com.liquidnet.service.adam.service.IAdamMemberOrderService;
import com.liquidnet.service.adam.service.IAdamMemberService;
import com.liquidnet.service.adam.service.IAdamRdmService;
import com.liquidnet.service.adam.service.IAdamUserMemberService;
import com.liquidnet.service.adam.service.admin.IAdamMemberPriceAdminService;
import com.liquidnet.service.adam.util.MemberUtil;
import com.liquidnet.service.base.ErrorMapping;
import com.liquidnet.service.base.ResponseDto;
......@@ -28,12 +26,9 @@ import org.springframework.core.env.Environment;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.convert.MongoConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.StringUtils;
......@@ -56,7 +51,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
IAdamUserMemberService adamUserMemberService;
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public ResponseDto<AdamMemberOrderResult> buyMemberOrMemberCode(AdamMemberOrderParam param) {
AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(param.getMemberId());
if (null == memberVo) {
......@@ -67,7 +62,8 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
return ResponseDto.failure(ErrorMapping.get("10202"));
}
String createdAt = DateUtil.format(LocalDateTime.now(), DateUtil.Formatter.yyyyMMddHHmmss);
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
String orderNo = IDGenerator.nextSnowId().toString().concat("V");
String clientIp = CurrentUtil.getCliIpAddr();
......@@ -114,7 +110,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
payParam.add("product_id", param.getProductId());
break;
}
payParam.add("create_date", createdAt);
payParam.add("create_date", nowStr);
payParam.add("expire_time", "5");// 过期时间，单位分钟，默认5
// 生成订单信息
......@@ -123,7 +119,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
memberOrderVo.setMemberId(param.getMemberId());
memberOrderVo.setDays(memberPriceVo.getDays());
memberOrderVo.setMemberPriceId(param.getMemberPriceId());
memberOrderVo.setCreatedAt(createdAt);
memberOrderVo.setCreatedAt(now);
memberOrderVo.setMemberName(memberVo.getName());
memberOrderVo.setMode(param.getMode());
memberOrderVo.setBirthday(param.getBirthday());
......@@ -191,7 +187,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> operationObjs = new LinkedList<>(), updateMemberOrderObjs = new LinkedList<>();
// AdamMemberOrderVo updateMemberOrderVo = AdamMemberOrderVo.getNew();
String currentDateTime = DateUtil.getNowTime();
LocalDateTime now = LocalDateTime.now();
if (0 == handleMemberOrderVo.getMode()) {// 购买会员回调
AdamUserMemberVo existUserMemberVo = adamRdmService.getUserMemberVoByUid(handleMemberOrderVo.getUid());
if (null == existUserMemberVo) {// 创建会员
......@@ -203,8 +199,8 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initUserMemberVo.setMemberNo(memberNo);
initUserMemberVo.setState(1);// 1-正常,2-失效
Date expiryAt = DateUtil.getBeforeDayEnd(Calendar.getInstance(), memberPriceVo.getDays());
initUserMemberVo.setExpiryAt(DateUtil.format(expiryAt, DateUtil.Formatter.yyyyMMddHHmmss));
initUserMemberVo.setCreatedAt(currentDateTime);
initUserMemberVo.setExpiryAt(DateUtil.asLocalDateTime(expiryAt));
initUserMemberVo.setCreatedAt(now);
// 订单写入MongoDB和Redis中
mongoTemplate.insert(initUserMemberVo, AdamUserMemberVo.class.getSimpleName());
......@@ -218,28 +214,28 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initUserMemberVo.getState(), initUserMemberVo.getExpiryAt(), initUserMemberVo.getCreatedAt()
});
} else { // 续费
String currentExpiryAt = existUserMemberVo.getExpiryAt();
Date now = DateUtil.parse(currentDateTime, DateUtil.DATE_SMALL_STR),
currentExpiryAtDate = DateUtil.parse(currentExpiryAt, DateUtil.DATE_FULL_STR);
currentExpiryAtDate = currentExpiryAtDate.before(now) ? now : currentExpiryAtDate;
LocalDateTime currentExpiryAt = existUserMemberVo.getExpiryAt();
Calendar calendar = Calendar.getInstance();
calendar.setTime(currentExpiryAtDate);
Date expiryAt = DateUtil.getBeforeDayEnd(calendar, memberPriceVo.getDays());
existUserMemberVo.setExpiryAt(DateUtil.format(expiryAt, DateUtil.Formatter.yyyyMMddHHmmss));
existUserMemberVo.setState(1);// 1-正常,2-失效
mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName())
.updateOne(Query.query(Criteria.where("uid").is(existUserMemberVo.getUid())).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(existUserMemberVo))));
Date nowDt = DateUtil.asDate(now), currentExpiryAtDate = DateUtil.asDate(currentExpiryAt);
calendar.setTime(currentExpiryAtDate.before(nowDt) ? nowDt : currentExpiryAtDate);
LocalDateTime expiryAt = DateUtil.asLocalDateTime(DateUtil.getBeforeDayEnd(calendar, memberPriceVo.getDays()));
// existUserMemberVo.setExpiryAt(expiryAt);
// existUserMemberVo.setState(1);// 1-正常,2-失效
mongoTemplate.getCollection(AdamUserMemberVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("uid").is(existUserMemberVo.getUid())).getQueryObject(),
// new Document("$set", Document.parse(JsonUtils.toJson(existUserMemberVo))));
new Document("$set", new Document("expiryAt", expiryAt).append("state", 1))
);
adamRdmService.setUserMemberVoByUid(handleMemberOrderVo.getUid(), existUserMemberVo);
handleMemberOrderVo.setMemberNo(existUserMemberVo.getMemberNo());
toMqSqls.add(SqlMapping.get("adam_user_member.update"));
operationObjs.add(new Object[]{
existUserMemberVo.getState(), existUserMemberVo.getExpiryAt(), currentDateTime, existUserMemberVo.getUid()
existUserMemberVo.getState(), existUserMemberVo.getExpiryAt(), now, existUserMemberVo.getUid()
});
}
}
......@@ -255,8 +251,8 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initMemberCodeVo.setState(0);
initMemberCodeVo.setBuyOrderNo(parameter.getCode());
initMemberCodeVo.setBuyUid(handleMemberOrderVo.getUid());
initMemberCodeVo.setBuyAt(currentDateTime);
initMemberCodeVo.setCreatedAt(currentDateTime);
initMemberCodeVo.setBuyAt(now);
initMemberCodeVo.setCreatedAt(now);
mongoTemplate.insert(initMemberCodeVo, AdamMemberCodeVo.class.getSimpleName());
adamRdmService.setMemberCodeVoByCode(initMemberCodeVo.getCode(), initMemberCodeVo);
......@@ -271,11 +267,12 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initMemberCodeVo.getBuyOrderNo(), initMemberCodeVo.getBuyUid(), initMemberCodeVo.getBuyAt()
});
}
handleMemberOrderVo.setPaymentAt(parameter.getPaymentAt());
handleMemberOrderVo.setUpdatedAt(currentDateTime);
handleMemberOrderVo.setPaymentAt(DateUtil.Formatter.yyyyMMddHHmmss.parse(parameter.getPaymentAt()));
handleMemberOrderVo.setUpdatedAt(now);
handleMemberOrderVo.setState(1);// 1-已支付
mongoTemplate.insert(handleMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
toMqSqls.add(SqlMapping.get("adam_member_order.add"));
updateMemberOrderObjs.add(new Object[]{
handleMemberOrderVo.getOrderNo(), handleMemberOrderVo.getUid(), handleMemberOrderVo.getMode(), handleMemberOrderVo.getPrice(),
......@@ -284,10 +281,11 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(), handleMemberOrderVo.getPaymentAt(),
handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
});
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs));
adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getUid(), handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs));
return ResponseDto.success();
}
......@@ -306,7 +304,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
}
AdamMemberVo memberVo = adamRdmService.getMemberVoByMemberId(memberCodeVo.getMemberId());
String currentDateTime = DateUtil.getNowTime();
LocalDateTime currentDateTime = LocalDateTime.now();
// 创建会员订单
AdamMemberOrderVo initMemberOrderVo = AdamMemberOrderVo.getNew();
initMemberOrderVo.setOrderNo(IDGenerator.nextSnowId().toString().concat("V"));
......@@ -338,9 +336,8 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
initUserMemberVo.setMemberNo(memberCodeVo.getMemberNo());
initUserMemberVo.setState(1);
initUserMemberVo.setExpiryAt(
DateUtil.format(
DateUtil.getBeforeDayEnd(Calendar.getInstance(), initMemberOrderVo.getDays()),
DateUtil.Formatter.yyyyMMddHHmmss
DateUtil.asLocalDateTime(
DateUtil.getBeforeDayEnd(Calendar.getInstance(), initMemberOrderVo.getDays())
));
initUserMemberVo.setCreatedAt(currentDateTime);
......@@ -348,20 +345,27 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
LinkedList<Object[]> updateMemberCodeObjs = new LinkedList<>(),
initMemberOrderObjs = new LinkedList<>(), initUserMemberObjs = new LinkedList<>();
AdamMemberCodeVo updateMemberCodeVo = AdamMemberCodeVo.getNew();
updateMemberCodeVo.setState(1);
updateMemberCodeVo.setUpdatedAt(currentDateTime);
updateMemberCodeVo.setUseOrderNo(initMemberOrderVo.getOrderNo());
updateMemberCodeVo.setUseUid(initUserMemberVo.getUid());
updateMemberCodeVo.setUseAt(currentDateTime);
// AdamMemberCodeVo updateMemberCodeVo = AdamMemberCodeVo.getNew();
// updateMemberCodeVo.setState(1);
// updateMemberCodeVo.setUpdatedAt(currentDateTime);
// updateMemberCodeVo.setUseOrderNo(initMemberOrderVo.getOrderNo());
// updateMemberCodeVo.setUseUid(initUserMemberVo.getUid());
// updateMemberCodeVo.setUseAt(currentDateTime);
Document updateMemberCodeVo = new Document("state", 1)
.append("updatedAt", currentDateTime)
.append("useOrderNo", initMemberOrderVo.getOrderNo())
.append("useUid", initUserMemberVo.getUid())
.append("useAt", currentDateTime);
mongoTemplate.getCollection(AdamMemberCodeVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("code").is(memberCodeVo.getCode())).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(updateMemberCodeVo)))
// new Document("$set", Document.parse(JsonUtils.toJson(updateMemberCodeVo)))
new Document("$set", updateMemberCodeVo)
);
toMqSqls.add(SqlMapping.get("adam_member_code.exchange"));
updateMemberCodeObjs.add(new Object[]{
updateMemberCodeVo.getState(), updateMemberCodeVo.getUpdatedAt(), updateMemberCodeVo.getUseOrderNo(),
updateMemberCodeVo.getUseUid(), updateMemberCodeVo.getUseAt(), memberCodeVo.getCode()
// updateMemberCodeVo.getState(), updateMemberCodeVo.getUpdatedAt(), updateMemberCodeVo.getUseOrderNo(),
// updateMemberCodeVo.getUseUid(), updateMemberCodeVo.getUseAt(), memberCodeVo.getCode()
1, currentDateTime, initMemberOrderVo.getOrderNo(), initUserMemberVo.getUid(), currentDateTime, memberCodeVo.getCode()
});
mongoTemplate.insert(initMemberOrderVo, AdamMemberOrderVo.class.getSimpleName());
toMqSqls.add(SqlMapping.get("adam_member_order.add"));
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRealNameServiceImpl.java
View file @ 593827fa
......@@ -36,7 +36,7 @@ public class AdamRealNameServiceImpl extends ServiceImpl<AdamRealNameMapper, Ada
RabbitTemplate rabbitTemplate;
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void add(AdamRealName realName) {
mongoTemplate.insert(realName, AdamRealInfoVo.class.getSimpleName());
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamThirdPartyServiceImpl.java deleted 100644 → 0
View file @ 622affa2
package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.service.adam.constant.AdamRedisConst;
import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
import com.liquidnet.service.adam.entity.AdamThirdParty;
import com.liquidnet.service.adam.mapper.AdamThirdPartyMapper;
import com.liquidnet.service.adam.service.IAdamThirdPartyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
/**
* <p>
* 用户第三方账号信息 服务实现类
* </p>
*
* @author liquidnet
* @since 2021-05-10
*/
@Service
public class AdamThirdPartyServiceImpl extends ServiceImpl<AdamThirdPartyMapper, AdamThirdParty> implements IAdamThirdPartyService {
@Autowired
MongoTemplate mongoTemplate;
@Autowired
RedisUtil redisUtil;
// @Override
// public List<AdamThirdPartInfoVo> queryByUid(String uid) {
// List<AdamThirdPartInfoVo> thirdPartInfoVos = (List<AdamThirdPartInfoVo>) redisUtil.hget(AdamRedisConst.INFO_THIRD_PARTY, uid);
// if (CollectionUtils.isEmpty(thirdPartInfoVos)) {
// thirdPartInfoVos = mongoTemplate.find(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
// AdamThirdPartInfoVo.class);
//
// if (!CollectionUtils.isEmpty(thirdPartInfoVos)) redisUtil.hset(AdamRedisConst.INFO_THIRD_PARTY, uid, thirdPartInfoVos);
// }
// return thirdPartInfoVos;
// }
// public AdamThirdPartInfoVo queryByUidAndPlatform(String uid, String platform) {
// List<AdamThirdPartInfoVo> voList = this.queryByUid(uid);
// if (!CollectionUtils.isEmpty(voList)) {
// for (AdamThirdPartInfoVo vo : voList) {
// if (platform.equals(vo.getPlatform())) {
// return vo;
// }
// }
// }
// return null;
// }
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java
View file @ 593827fa
......@@ -3,7 +3,6 @@ package com.liquidnet.service.adam.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.common.mq.constant.MQConst;
import com.liquidnet.commons.lang.util.BsonUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
import com.liquidnet.service.adam.entity.AdamUserInfo;
......@@ -78,13 +77,12 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void editMobile(String uid, String mobile) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.Formatter.yyyyMMddHHmmss.format(now);
AdamUserInfoVo updateInfoVo = AdamUserInfoVo.getNew();
updateInfoVo.setUpdatedAt(nowStr);
updateInfoVo.setMobile(mobile);
// AdamUserInfoVo updateInfoVo = AdamUserInfoVo.getNew();
// updateInfoVo.setUpdatedAt(now);
// updateInfoVo.setMobile(mobile);
Document doc = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(updateInfoVo))),
new Document("$set", new Document("mobile", mobile).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
);
AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java
View file @ 593827fa
......@@ -58,8 +58,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
@Autowired
IAdamEntersService adamEntersService;
@Autowired
IAdamThirdPartyService adamThirdPartyService;
@Autowired
IAdamRealNameService adamRealNameService;
@Autowired
IAdamRdmService adamRdmService;
......@@ -68,33 +66,10 @@ public class AdamUserServiceImpl implements IAdamUserService {
private static final String PHP_API_REAL_NAME = "/IdCardCheckVerification";
// @Override
// public AdamUserInfoVo queryByUid(String uid) {
// AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisUtil.hget(AdamRedisConst.INFO_USER, uid);
// if (null == userInfoVo) {
// userInfoVo = mongoTemplate.findOne(Query.query(Criteria.where("uid").is(uid).and("state").is(1)),
// AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
//
// if (null != userInfoVo) redisUtil.hset(AdamRedisConst.INFO_USER, uid, userInfoVo);
// }
// return userInfoVo;
// }
// @Override
// public String queryUidByRedis(String mobile) {
// return (String) redisUtil.hget(AdamRedisConst.INFO_IDENTITY_MOBILE, mobile);
// }
//
// @Override
// public String queryUidByRedis(String openId, String platform) {
// return (String) redisUtil.hget(AdamRedisConst.INFO_IDENTITY_THIRD_PARTY, platform.concat(openId));
// }
@Override
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public AdamUserInfoVo register(String mobile) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
AdamUserInfoVo userInfoVo = AdamUserInfoVo.getNew();
userInfoVo.setUid(IDGenerator.nextSnowId() + "");
......@@ -102,7 +77,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
userInfoVo.setIsComplete(0);
userInfoVo.setState(1);
userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
userInfoVo.setCreateAt(nowStr);
userInfoVo.setCreateAt(now);
mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
......@@ -119,7 +94,6 @@ public class AdamUserServiceImpl implements IAdamUserService {
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public AdamUserInfoVo register(AdamThirdPartParam param) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
String uid = adamRdmService.getUidByMobile(param.getMobile());
LinkedList<String> toMqSqls = new LinkedList<>();
......@@ -133,7 +107,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
userInfoVo.setIsComplete(0);
userInfoVo.setState(1);
userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
userInfoVo.setCreateAt(nowStr);
userInfoVo.setCreateAt(now);
mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
......@@ -145,7 +119,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
AdamThirdPartInfoVo thirdPartInfoVo = AdamThirdPartInfoVo.getNew();
BeanUtils.copyProperties(param, thirdPartInfoVo);
thirdPartInfoVo.setCreatedAt(nowStr);
thirdPartInfoVo.setCreatedAt(now);
thirdPartInfoVo.setUid(userInfoVo.getUid());
thirdPartInfoVo.setState(1);// 1-绑定
......@@ -154,12 +128,11 @@ public class AdamUserServiceImpl implements IAdamUserService {
toMqSqls.add(SqlMapping.get("adam_third_party.add"));
initThirdPartObjs.add(new Object[]{thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()});
adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), uid);
rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
SqlMapping.gets(toMqSqls, initUserObjs, initThirdPartObjs)
);
adamRdmService.setUidByPlatformOpenId(param.getPlatform(), param.getOpenId(), uid);
return userInfoVo;
}
......@@ -167,11 +140,10 @@ public class AdamUserServiceImpl implements IAdamUserService {
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void bindTpa(String uid, AdamThirdPartParam param) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
AdamThirdPartInfoVo thirdPartInfoVo = AdamThirdPartInfoVo.getNew();
BeanUtils.copyProperties(param, thirdPartInfoVo);
thirdPartInfoVo.setCreatedAt(nowStr);
thirdPartInfoVo.setCreatedAt(now);
thirdPartInfoVo.setUid(uid);
thirdPartInfoVo.setState(1);// 1-绑定
......@@ -199,7 +171,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
AdamThirdPartInfoVo thirdPartInfoVo = AdamThirdPartInfoVo.getNew();
BeanUtils.copyProperties(param, thirdPartInfoVo);
thirdPartInfoVo.setCreatedAt(nowStr);
thirdPartInfoVo.setCreatedAt(now);
thirdPartInfoVo.setUid(bindUid);
thirdPartInfoVo.setState(1);// 1-绑定
......@@ -227,13 +199,13 @@ public class AdamUserServiceImpl implements IAdamUserService {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
AdamThirdPartInfoVo unBindThirdPartInfoVo = AdamThirdPartInfoVo.getNew();
unBindThirdPartInfoVo.setUpdatedAt(nowStr);
unBindThirdPartInfoVo.setState(2);// 2-解绑
// AdamThirdPartInfoVo unBindThirdPartInfoVo = AdamThirdPartInfoVo.getNew();
// unBindThirdPartInfoVo.setUpdatedAt(now);
// unBindThirdPartInfoVo.setState(2);// 2-解绑
Document doc = mongoTemplate.getCollection(AdamThirdPartInfoVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("uid").is(uid).and("platform").is(platform).and("state").is(1)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(unBindThirdPartInfoVo))),
new Document("$set", new Document("state", 2).append("updatedAt", now)),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
......@@ -247,16 +219,15 @@ public class AdamUserServiceImpl implements IAdamUserService {
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void unBindTpa(String uid, String platform) {
this.unBindTpaProcess(uid, platform);
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public void close(String uid) {
LocalDateTime now = LocalDateTime.now();
String nowStr = DateUtil.format(now, DateUtil.Formatter.yyyyMMddHHmmss);
LinkedList<String> toMqSqls = new LinkedList<>();
LinkedList<Object[]> objsUser = new LinkedList<>(),
objsThirdPart = new LinkedList<>(),
......@@ -349,8 +320,8 @@ public class AdamUserServiceImpl implements IAdamUserService {
adamRealNameService.add(realName);
AdamRealInfoVo realInfoVo = AdamRealInfoVo.getNew();
realInfoVo.setName(StringUtils.rightPad(StringUtils.left(name, 1), name.length(), "*"));
realInfoVo.setIdCard(StringUtils.rightPad(StringUtils.left(idCard, 3), idCard.length(), "*").concat(StringUtils.right(idCard, 2)));
realInfoVo.setName(name);
realInfoVo.setIdCard(idCard);
realInfoVo.setState(1);
adamRdmService.setRealInfoVoByUid(uid, realInfoVo);
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/admin/AdamMemberPriceAdminServiceImpl.java
View file @ 593827fa
......@@ -39,7 +39,7 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
RedisUtil redisUtil;
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public AdamMemberPriceVo add(AdamMemberPrice info) {
List<AdamMemberPrice> existList = adamMemberPriceMapper.selectList(
Wrappers.lambdaQuery(AdamMemberPrice.class).eq(AdamMemberPrice::getMemberId, info.getMemberId()));
......@@ -56,7 +56,7 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
}
@Override
@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
// @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
public AdamMemberPriceVo edit(AdamMemberPriceParam param) {
AdamMemberPrice updateInfo = new AdamMemberPrice();
updateInfo.setState(param.getState());
......@@ -70,13 +70,15 @@ public class AdamMemberPriceAdminServiceImpl extends ServiceImpl<AdamMemberPrice
String memberPriceId = param.getMemberPriceId();
adamMemberPriceMapper.update(
updateInfo, Wrappers.lambdaQuery(AdamMemberPrice.class).eq(AdamMemberPrice::getMemberPriceId, memberPriceId));
updateInfo, Wrappers.lambdaQuery(AdamMemberPrice.class).eq(AdamMemberPrice::getMemberPriceId, memberPriceId)
);
Document doc = mongoTemplate.getCollection(AdamMemberPriceVo.class.getSimpleName()).findOneAndUpdate(
Query.query(Criteria.where("memberPriceId").is(memberPriceId)).getQueryObject(),
new Document("$set", Document.parse(JsonUtils.toJson(updateInfo))),
new Document("$set", Document.parse(JsonUtils.toJson(updateInfo)).replace("updatedAt", updateInfo.getUpdatedAt())),
new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
);
redisUtil.del(AdamRedisConst.INFO_MEMBER_PRICE.concat(memberPriceId));
return BsonUtil.toBean(doc, AdamMemberPriceVo.class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment