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

Commit 864faa2a authored by 胡佳晨's avatar 胡佳晨

merchant 修改为 slime

parent 0a84edfb
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.param.MerchantAuthorizationRecordParam;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationPerformanceVo;
import com.liquidnet.service.merchant.dto.vo.MerchantAuthorizationRecordsVo;
import java.util.List;
public interface IMerchantAuthorizationRecordsService {
MerchantAuthorizationPerformanceVo performanceAuthorization(String uid, String performanceId);
List<MerchantAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId);
String performanceRecordCheckerAdd(String cuid, MerchantAuthorizationRecordParam parameter);
void performanceRecordCheckerDel(String cuid, String authorizationRecordId);
}
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.param.MerchantFieldApplyParam;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
public interface IMerchantFieldAppliesService {
String apply(String uid, MerchantFieldApplyParam parameter);
void applyDel(String uid, String fieldApplyId);
MerchantFieldAppliesVo applyInfo(String uid, String fieldApplyId);
}
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.param.MerchantSponsorApplyParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
public interface IMerchantSponsorAppliesService {
String apply(String uid, MerchantSponsorApplyParam parameter);
void applyDel(String uid, String sponsorApplyId);
MerchantSponsorAppliesVo applyInfo(String uid, String sponsorApplyId);
}
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
public interface IMerchantSponsorsService {
PagedResult<MerchantSponsorsVo> search(String name, int page, int size);
MerchantSponsorsVo sponsorInfo(String uid, String sponsorId);
}
package com.liquidnet.service.merchant.service;
import com.liquidnet.service.merchant.dto.vo.MerchantStationsVo;
import java.util.List;
public interface IMerchantStationsService {
List<MerchantStationsVo> stationsList(String uid);
}
......@@ -9,11 +9,11 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-service-merchant-api</artifactId>
<artifactId>liquidnet-service-slime-api</artifactId>
<dependencies>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-merchant-do</artifactId>
<artifactId>liquidnet-service-slime-do</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
......
package com.liquidnet.service.merchant.constant;
package com.liquidnet.service.slime.constant;
public class MerchantAuthorizationConst {
public class SlimeAuthorizationConst {
// 某演出通过审核后,分配演出权限,场地方审核演出为'待审核的演出'与'演出'不同
public enum PerformancePermission {
......
package com.liquidnet.service.merchant.constant;
package com.liquidnet.service.slime.constant;
public class MerchantRedisConst {
public static final String PREFIX = "merchant:";
public class SlimeRedisConst {
public static final String PREFIX = "slime:";
// 【场地】详情
public static final String INFO_FIELD = PREFIX.concat("info:fields:");
......
package com.liquidnet.service.merchant.dto.param;
package com.liquidnet.service.slime.dto.param;
import com.liquidnet.commons.lang.constant.LnsRegex;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -9,9 +8,9 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
@ApiModel(value = "MerchantAuthorizationPermissionParam", description = "授权权限")
@ApiModel(value = "SlimeAuthorizationPermissionParam", description = "授权权限")
@Data
public class MerchantAuthorizationPermissionParam implements java.io.Serializable,Cloneable {
public class SlimeAuthorizationPermissionParam implements java.io.Serializable,Cloneable {
private static final long serialVersionUID = -8463419578205447151L;
@ApiModelProperty(position = 10, required = true, value = "权限ID")
......@@ -25,14 +24,14 @@ public class MerchantAuthorizationPermissionParam implements java.io.Serializabl
@Pattern(regexp = LnsRegex.Valid.DATETIME_FULL, message = "时间格式有误")
private String endTime;
private static final MerchantAuthorizationPermissionParam obj = new MerchantAuthorizationPermissionParam();
private static final SlimeAuthorizationPermissionParam obj = new SlimeAuthorizationPermissionParam();
public static MerchantAuthorizationPermissionParam getNew() {
public static SlimeAuthorizationPermissionParam getNew() {
try {
return (MerchantAuthorizationPermissionParam) obj.clone();
return (SlimeAuthorizationPermissionParam) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantAuthorizationPermissionParam();
return new SlimeAuthorizationPermissionParam();
}
}
package com.liquidnet.service.merchant.dto.param;
package com.liquidnet.service.slime.dto.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -8,9 +8,9 @@ import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.util.List;
@ApiModel(value = "MerchantAuthorizationRecordParam", description = "授权验票统计入参")
@ApiModel(value = "SlimeAuthorizationRecordParam", description = "授权验票统计入参")
@Data
public class MerchantAuthorizationRecordParam implements java.io.Serializable{
public class SlimeAuthorizationRecordParam implements java.io.Serializable{
private static final long serialVersionUID = -673681507332688410L;
@ApiModelProperty(position = 10, required = true, value = "演出ID")
......@@ -32,5 +32,5 @@ public class MerchantAuthorizationRecordParam implements java.io.Serializable{
@ApiModelProperty(position = 15, required = true, value = "授权权限")
@NotEmpty
private List<MerchantAuthorizationPermissionParam> permissions;
private List<SlimeAuthorizationPermissionParam> permissions;
}
package com.liquidnet.service.merchant.dto.param;
package com.liquidnet.service.slime.dto.param;
import com.liquidnet.commons.lang.constant.LnsRegex;
import io.swagger.annotations.ApiModel;
......@@ -10,9 +10,9 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
@ApiModel(value = "MerchantFieldApplyParam", description = "认领/创建场地入参")
@ApiModel(value = "SlimeFieldApplyParam", description = "认领/创建场地入参")
@Data
public class MerchantFieldApplyParam implements java.io.Serializable {
public class SlimeFieldApplyParam implements java.io.Serializable {
private static final long serialVersionUID = 7889390710531228185L;
@ApiModelProperty(position = 10, required = false, value = "场地ID,认领时必传[50]")
......
package com.liquidnet.service.merchant.dto.param;
package com.liquidnet.service.slime.dto.param;
import com.liquidnet.commons.lang.constant.LnsRegex;
......@@ -11,9 +11,9 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
@ApiModel(value = "MerchantSponsorApplyParam", description = "创建主办入参")
@ApiModel(value = "SlimeSponsorApplyParam", description = "创建主办入参")
@Data
public class MerchantSponsorApplyParam implements java.io.Serializable {
public class SlimeSponsorApplyParam implements java.io.Serializable {
private static final long serialVersionUID = 5869673418720222889L;
@ApiModelProperty(position = 10, required = true, value = "是否跳过企业信息 0不跳过 1跳过")
......
package com.liquidnet.service.merchant.dto.param.admin;
package com.liquidnet.service.slime.dto.param.admin;
public class MerchantFieldApplyListParam {
public class SlimeFieldApplyListParam {
/**
* 申请Id
......
package com.liquidnet.service.merchant.dto.param.admin;
package com.liquidnet.service.slime.dto.param.admin;
import com.liquidnet.commons.lang.constant.LnsRegex;
import io.swagger.annotations.ApiModel;
......@@ -10,9 +10,9 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
@ApiModel(value = "MerchantFieldEditParam", description = "编辑场地入参")
@ApiModel(value = "SlimeFieldEditParam", description = "编辑场地入参")
@Data
public class MerchantFieldEditParam implements java.io.Serializable {
public class SlimeFieldEditParam implements java.io.Serializable {
private static final long serialVersionUID = 7831800656130696525L;
@ApiModelProperty(position = 10, required = true, value = "场地ID")
......
package com.liquidnet.service.merchant.dto.param.admin;
package com.liquidnet.service.slime.dto.param.admin;
public class MerchantFieldListParam {
public class SlimeFieldListParam {
/**
* 场地Id
......
package com.liquidnet.service.merchant.dto.param.admin;
package com.liquidnet.service.slime.dto.param.admin;
public class MerchantSponsorApplyListParam {
public class SlimeSponsorApplyListParam {
/**
* 申请Id
......
package com.liquidnet.service.merchant.dto.param.admin;
package com.liquidnet.service.slime.dto.param.admin;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -10,7 +10,7 @@ import javax.validation.constraints.Size;
@ApiModel(value = "MerchantSponsorEditParam", description = "编辑主办入参")
@Data
public class MerchantSponsorEditParam implements java.io.Serializable {
public class SlimeSponsorEditParam implements java.io.Serializable {
private static final long serialVersionUID = -2088609830098635915L;
@ApiModelProperty(position = 10, required = true, value = "主办ID")
......
package com.liquidnet.service.merchant.dto.param.admin;
package com.liquidnet.service.slime.dto.param.admin;
public class MerchantSponsorListParam {
public class SlimeSponsorListParam {
/**
* sponsor_id
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -6,9 +6,9 @@ import lombok.Data;
import java.util.List;
@ApiModel(value = "MerchantAuthorizationPerformanceVo", description = "演出纬度权限聚合")
@ApiModel(value = "SlimeAuthorizationPerformanceVo", description = "演出纬度权限聚合")
@Data
public class MerchantAuthorizationPerformanceVo implements java.io.Serializable, Cloneable {
public class SlimeAuthorizationPerformanceVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -225012446820470899L;
@ApiModelProperty(value = "演出ID")
......@@ -23,14 +23,14 @@ public class MerchantAuthorizationPerformanceVo implements java.io.Serializable,
@ApiModelProperty(value = "权利人演出所有权限")
private List<String> permissionIds;
private static final MerchantAuthorizationPerformanceVo obj = new MerchantAuthorizationPerformanceVo();
private static final SlimeAuthorizationPerformanceVo obj = new SlimeAuthorizationPerformanceVo();
public static MerchantAuthorizationPerformanceVo getNew() {
public static SlimeAuthorizationPerformanceVo getNew() {
try {
return (MerchantAuthorizationPerformanceVo) obj.clone();
return (SlimeAuthorizationPerformanceVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantAuthorizationPerformanceVo();
return new SlimeAuthorizationPerformanceVo();
}
}
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantAuthorizationPermissions;
import com.liquidnet.service.slime.entity.SlimeAuthorizationPermissions;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
@ApiModel(value = "MerchantAuthorizationPermissionsVo", description = "授权记录关联")
@Data
public class MerchantAuthorizationPermissionsVo implements java.io.Serializable, Cloneable {
public class SlimeAuthorizationPermissionsVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -771282476240311975L;
@ApiModelProperty(value = "authorization_permission_id")
......@@ -35,18 +35,18 @@ public class MerchantAuthorizationPermissionsVo implements java.io.Serializable,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final MerchantAuthorizationPermissionsVo obj = new MerchantAuthorizationPermissionsVo();
private static final SlimeAuthorizationPermissionsVo obj = new SlimeAuthorizationPermissionsVo();
public static MerchantAuthorizationPermissionsVo getNew() {
public static SlimeAuthorizationPermissionsVo getNew() {
try {
return (MerchantAuthorizationPermissionsVo) obj.clone();
return (SlimeAuthorizationPermissionsVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantAuthorizationPermissionsVo();
return new SlimeAuthorizationPermissionsVo();
}
public MerchantAuthorizationPermissionsVo copy(MerchantAuthorizationPermissions source) {
public SlimeAuthorizationPermissionsVo copy(SlimeAuthorizationPermissions source) {
if (null == source) return this;
this.setAuthorizationPermissionId(source.getAuthorizationPermissionId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantAuthorizationRecords;
import com.liquidnet.service.slime.entity.SlimeAuthorizationRecords;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -10,9 +10,9 @@ import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@ApiModel(value = "MerchantAuthorizationRecordsVo", description = "授权记录")
@ApiModel(value = "SlimeAuthorizationRecordsVo", description = "授权记录")
@Data
public class MerchantAuthorizationRecordsVo implements java.io.Serializable, Cloneable{
public class SlimeAuthorizationRecordsVo implements java.io.Serializable, Cloneable{
private static final long serialVersionUID = 5851793907387626205L;
@ApiModelProperty(value = "authorization_record_id")
......@@ -40,7 +40,7 @@ public class MerchantAuthorizationRecordsVo implements java.io.Serializable, Clo
private String cuid;
@ApiModelProperty(value = "授权的权限")
private List<MerchantAuthorizationPermissionsVo> permissionsVos;
private List<SlimeAuthorizationPermissionsVo> permissionsVos;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime deletedAt;
......@@ -49,18 +49,18 @@ public class MerchantAuthorizationRecordsVo implements java.io.Serializable, Clo
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final MerchantAuthorizationRecordsVo obj = new MerchantAuthorizationRecordsVo();
private static final SlimeAuthorizationRecordsVo obj = new SlimeAuthorizationRecordsVo();
public static MerchantAuthorizationRecordsVo getNew() {
public static SlimeAuthorizationRecordsVo getNew() {
try {
return (MerchantAuthorizationRecordsVo) obj.clone();
return (SlimeAuthorizationRecordsVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantAuthorizationRecordsVo();
return new SlimeAuthorizationRecordsVo();
}
public MerchantAuthorizationRecordsVo copy(MerchantAuthorizationRecords source) {
public SlimeAuthorizationRecordsVo copy(SlimeAuthorizationRecords source) {
if (null == source) return this;
this.setAuthorizationRecordId(source.getAuthorizationRecordId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantCompanies;
import com.liquidnet.service.slime.entity.SlimeCompanies;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantCompaniesVo", description = "公司")
@ApiModel(value = "SlimeCompaniesVo", description = "公司")
@Data
public class MerchantCompaniesVo implements java.io.Serializable, Cloneable {
public class SlimeCompaniesVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -906817182104125502L;
@ApiModelProperty(position = 10, value = "公司ID")
......@@ -38,18 +38,18 @@ public class MerchantCompaniesVo implements java.io.Serializable, Cloneable {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final MerchantCompaniesVo obj = new MerchantCompaniesVo();
private static final SlimeCompaniesVo obj = new SlimeCompaniesVo();
public static MerchantCompaniesVo getNew() {
public static SlimeCompaniesVo getNew() {
try {
return (MerchantCompaniesVo) obj.clone();
return (SlimeCompaniesVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantCompaniesVo();
return new SlimeCompaniesVo();
}
public MerchantCompaniesVo copy(MerchantCompanies source) {
public SlimeCompaniesVo copy(SlimeCompanies source) {
if (null == source) return this;
this.setCompanyId(source.getCompanyId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
import com.liquidnet.service.slime.entity.SlimeFieldApplies;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -10,9 +10,9 @@ import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantFieldAppliesVo", description = "申请的场地")
@ApiModel(value = "SlimeFieldAppliesVo", description = "申请的场地")
@Data
public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
public class SlimeFieldAppliesVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -3241866244946476511L;
@ApiModelProperty(position = 10, value = "场地申请ID")
......@@ -29,7 +29,7 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
@ApiModelProperty(position = 15, value = "场地ID,认领时或通过后存在")
private String fieldId;
@ApiModelProperty(position = 16, value = "场地,认领时或通过后存在")
private MerchantFieldsVo fieldVo;
private SlimeFieldsVo fieldVo;
@ApiModelProperty(position = 17, value = "场地名称")
private String name;
......@@ -98,18 +98,18 @@ public class MerchantFieldAppliesVo implements java.io.Serializable, Cloneable {
private LocalDateTime deletedAt;
private static final MerchantFieldAppliesVo obj = new MerchantFieldAppliesVo();
private static final SlimeFieldAppliesVo obj = new SlimeFieldAppliesVo();
public static MerchantFieldAppliesVo getNew() {
public static SlimeFieldAppliesVo getNew() {
try {
return (MerchantFieldAppliesVo) obj.clone();
return (SlimeFieldAppliesVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantFieldAppliesVo();
return new SlimeFieldAppliesVo();
}
public MerchantFieldAppliesVo copy(MerchantFieldApplies source) {
public SlimeFieldAppliesVo copy(SlimeFieldApplies source) {
if (null == source) return this;
this.setFieldApplyId(source.getFieldApplyId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantFieldCheckers;
import com.liquidnet.service.slime.entity.SlimeFieldCheckers;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantFieldAppliesVo", description = "场地默认验票员")
@ApiModel(value = "SlimeFieldAppliesVo", description = "场地默认验票员")
@Data
public class MerchantFieldCheckersVo implements java.io.Serializable, Cloneable {
public class SlimeFieldCheckersVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = 5965779904967405763L;
@ApiModelProperty(position = 10, value = "验票授权ID")
......@@ -40,18 +40,18 @@ public class MerchantFieldCheckersVo implements java.io.Serializable, Cloneable
private LocalDateTime deletedAt;
private static final MerchantFieldCheckersVo obj = new MerchantFieldCheckersVo();
private static final SlimeFieldCheckersVo obj = new SlimeFieldCheckersVo();
public static MerchantFieldCheckersVo getNew() {
public static SlimeFieldCheckersVo getNew() {
try {
return (MerchantFieldCheckersVo) obj.clone();
return (SlimeFieldCheckersVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantFieldCheckersVo();
return new SlimeFieldCheckersVo();
}
public MerchantFieldCheckersVo copy(MerchantFieldCheckers source) {
public SlimeFieldCheckersVo copy(SlimeFieldCheckers source) {
if (null == source) return this;
this.setFieldCheckerId(source.getFieldCheckerId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantFields;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantFieldsVo", description = "App场地详情")
@ApiModel(value = "SlimeFieldsVo", description = "App场地详情")
@Data
public class MerchantFieldsDetailsVo implements java.io.Serializable, Cloneable {
public class SlimeFieldsDetailsVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = 2531062739435013044L;
@ApiModelProperty(position = 11, value = "场地ID")
......@@ -49,15 +47,15 @@ public class MerchantFieldsDetailsVo implements java.io.Serializable, Cloneable
private LocalDateTime updatedAt;
private static final MerchantFieldsDetailsVo obj = new MerchantFieldsDetailsVo();
private static final SlimeFieldsDetailsVo obj = new SlimeFieldsDetailsVo();
public static MerchantFieldsDetailsVo getNew() {
public static SlimeFieldsDetailsVo getNew() {
try {
return (MerchantFieldsDetailsVo) obj.clone();
return (SlimeFieldsDetailsVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantFieldsDetailsVo();
return new SlimeFieldsDetailsVo();
}
}
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantFields;
import com.liquidnet.service.slime.entity.SlimeFields;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -10,9 +10,9 @@ import lombok.Data;
import java.time.LocalDate;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantFieldsVo", description = "场地")
@ApiModel(value = "SlimeFieldsVo", description = "场地")
@Data
public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
public class SlimeFieldsVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = 2531062739435013044L;
@ApiModelProperty(position = 11, value = "场地ID")
......@@ -66,7 +66,7 @@ public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
@ApiModelProperty(position = 32, value = "企业ID")
private String companyId;
@ApiModelProperty(position = 33, value = "企业")
private MerchantCompaniesVo companiesVo;
private SlimeCompaniesVo companiesVo;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
......@@ -74,18 +74,18 @@ public class MerchantFieldsVo implements java.io.Serializable, Cloneable {
private LocalDateTime updatedAt;
private static final MerchantFieldsVo obj = new MerchantFieldsVo();
private static final SlimeFieldsVo obj = new SlimeFieldsVo();
public static MerchantFieldsVo getNew() {
public static SlimeFieldsVo getNew() {
try {
return (MerchantFieldsVo) obj.clone();
return (SlimeFieldsVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantFieldsVo();
return new SlimeFieldsVo();
}
public MerchantFieldsVo copy(MerchantFields source) {
public SlimeFieldsVo copy(SlimeFields source) {
if (null == source) return this;
this.setFieldId(source.getFieldId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
......@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime;
public class MerchantPermissionVo implements java.io.Serializable, Cloneable {
public class SlimePermissionVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -1693974333583118507L;
@ApiModelProperty(value = "permission_id", example = "1")
......@@ -21,14 +21,14 @@ public class MerchantPermissionVo implements java.io.Serializable, Cloneable {
private LocalDateTime updatedAt;
private static final MerchantPermissionVo obj = new MerchantPermissionVo();
private static final SlimePermissionVo obj = new SlimePermissionVo();
public static MerchantPermissionVo getNew() {
public static SlimePermissionVo getNew() {
try {
return (MerchantPermissionVo) obj.clone();
return (SlimePermissionVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantPermissionVo();
return new SlimePermissionVo();
}
}
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
import com.liquidnet.service.slime.entity.SlimeSponsorApplies;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantSponsorAppliesVo", description = "申请的主办")
@ApiModel(value = "SlimeSponsorAppliesVo", description = "申请的主办")
@Data
public class MerchantSponsorAppliesVo implements java.io.Serializable, Cloneable {
public class SlimeSponsorAppliesVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -4495918133684950796L;
@ApiModelProperty(position = 10, value = "主办申请ID")
......@@ -28,7 +28,7 @@ public class MerchantSponsorAppliesVo implements java.io.Serializable, Cloneable
@ApiModelProperty(position = 15, value = "主办ID,通过后存在")
private String sponsorId;
@ApiModelProperty(position = 16, value = "主办,通过后存在")
private MerchantSponsorsVo sponsorVo;
private SlimeSponsorsVo sponsorVo;
@ApiModelProperty(position = 17, value = "主办名称")
private String name;
......@@ -81,18 +81,18 @@ public class MerchantSponsorAppliesVo implements java.io.Serializable, Cloneable
private LocalDateTime updatedAt;
private static final MerchantSponsorAppliesVo obj = new MerchantSponsorAppliesVo();
private static final SlimeSponsorAppliesVo obj = new SlimeSponsorAppliesVo();
public static MerchantSponsorAppliesVo getNew() {
public static SlimeSponsorAppliesVo getNew() {
try {
return (MerchantSponsorAppliesVo) obj.clone();
return (SlimeSponsorAppliesVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantSponsorAppliesVo();
return new SlimeSponsorAppliesVo();
}
public MerchantSponsorAppliesVo copy(MerchantSponsorApplies source) {
public SlimeSponsorAppliesVo copy(SlimeSponsorApplies source) {
if (null == source) return this;
this.setSponsorApplyId(source.getSponsorApplyId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
import com.liquidnet.service.slime.entity.SlimeSponsors;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantSponsorsVo", description = "主办")
@ApiModel(value = "SlimeSponsorsVo", description = "主办")
@Data
public class MerchantSponsorsVo implements java.io.Serializable, Cloneable {
public class SlimeSponsorsVo implements java.io.Serializable, Cloneable {
private static final long serialVersionUID = -5422950992644764083L;
@ApiModelProperty(position = 11, value = "主办ID")
......@@ -44,7 +44,7 @@ public class MerchantSponsorsVo implements java.io.Serializable, Cloneable {
@ApiModelProperty(position = 23, value = "企业ID")
private String companyId;
@ApiModelProperty(position = 24, value = "企业")
private MerchantCompaniesVo companiesVo;
private SlimeCompaniesVo companiesVo;
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime createdAt;
......@@ -52,18 +52,18 @@ public class MerchantSponsorsVo implements java.io.Serializable, Cloneable {
private LocalDateTime updatedAt;
private static final MerchantSponsorsVo obj = new MerchantSponsorsVo();
private static final SlimeSponsorsVo obj = new SlimeSponsorsVo();
public static MerchantSponsorsVo getNew() {
public static SlimeSponsorsVo getNew() {
try {
return (MerchantSponsorsVo) obj.clone();
return (SlimeSponsorsVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantSponsorsVo();
return new SlimeSponsorsVo();
}
public MerchantSponsorsVo copy(MerchantSponsors source) {
public SlimeSponsorsVo copy(SlimeSponsors source) {
if (null == source) return this;
this.setSponsorId(source.getSponsorId());
......
package com.liquidnet.service.merchant.dto.vo;
package com.liquidnet.service.slime.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
......@@ -8,9 +8,9 @@ import lombok.Data;
import java.time.LocalDateTime;
@ApiModel(value = "MerchantStationsVo", description = "小站")
@ApiModel(value = "SlimeStationsVo", description = "小站")
@Data
public class MerchantStationsVo implements Cloneable {
public class SlimeStationsVo implements Cloneable {
@ApiModelProperty(position = 10, value = "类型 fieldApply-场地申请、field-场地、sponsorApply主办申请、sponsor-主办")
private String stationType;
......@@ -43,14 +43,14 @@ public class MerchantStationsVo implements Cloneable {
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private LocalDateTime updatedAt;
private static final MerchantStationsVo obj = new MerchantStationsVo();
private static final SlimeStationsVo obj = new SlimeStationsVo();
public static MerchantStationsVo getNew() {
public static SlimeStationsVo getNew() {
try {
return (MerchantStationsVo) obj.clone();
return (SlimeStationsVo) obj.clone();
} catch (CloneNotSupportedException e) {
e.printStackTrace();
}
return new MerchantStationsVo();
return new SlimeStationsVo();
}
}
package com.liquidnet.service.slime.service;
import com.liquidnet.service.slime.dto.param.SlimeAuthorizationRecordParam;
import com.liquidnet.service.slime.dto.vo.SlimeAuthorizationPerformanceVo;
import com.liquidnet.service.slime.dto.vo.SlimeAuthorizationRecordsVo;
import java.util.List;
public interface ISlimeAuthorizationRecordsService {
SlimeAuthorizationPerformanceVo performanceAuthorization(String uid, String performanceId);
List<SlimeAuthorizationRecordsVo> performanceRecordCheckers(String cuid, String performanceId);
String performanceRecordCheckerAdd(String cuid, SlimeAuthorizationRecordParam parameter);
void performanceRecordCheckerDel(String cuid, String authorizationRecordId);
}
package com.liquidnet.service.slime.service;
import com.liquidnet.service.slime.dto.param.SlimeFieldApplyParam;
import com.liquidnet.service.slime.dto.vo.SlimeFieldAppliesVo;
public interface ISlimeFieldAppliesService {
String apply(String uid, SlimeFieldApplyParam parameter);
void applyDel(String uid, String fieldApplyId);
SlimeFieldAppliesVo applyInfo(String uid, String fieldApplyId);
}
package com.liquidnet.service.merchant.service;
package com.liquidnet.service.slime.service;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldCheckersVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsDetailsVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldCheckersVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import java.util.List;
public interface IMerchantFieldsService {
PagedResult<MerchantFieldsVo> search(String name, int page, int size);
public interface ISlimeFieldsService {
PagedResult<SlimeFieldsVo> search(String name, int page, int size);
MerchantFieldsVo fieldInfo(String uid, String fieldId);
SlimeFieldsVo fieldInfo(String uid, String fieldId);
void editIsCheck(String uid, String fieldId, int isCheck);
List<MerchantFieldCheckersVo> checkers(String cuid, String fieldId);
List<SlimeFieldCheckersVo> checkers(String cuid, String fieldId);
String checkerAdd(String cuid, String fieldId, String uid, String mobile, String name);
void checkerDel(String cuid, String fieldId, String uid);
MerchantFieldsDetailsVo fieldDetails(String fieldId);
SlimeFieldsDetailsVo fieldDetails(String fieldId);
}
package com.liquidnet.service.slime.service;
import com.liquidnet.service.slime.dto.param.SlimeSponsorApplyParam;
import com.liquidnet.service.slime.dto.vo.SlimeSponsorAppliesVo;
public interface ISlimeSponsorAppliesService {
String apply(String uid, SlimeSponsorApplyParam parameter);
void applyDel(String uid, String sponsorApplyId);
SlimeSponsorAppliesVo applyInfo(String uid, String sponsorApplyId);
}
package com.liquidnet.service.slime.service;
import com.liquidnet.service.base.PagedResult;
import com.liquidnet.service.slime.dto.vo.SlimeSponsorsVo;
public interface ISlimeSponsorsService {
PagedResult<SlimeSponsorsVo> search(String name, int page, int size);
SlimeSponsorsVo sponsorInfo(String uid, String sponsorId);
}
package com.liquidnet.service.slime.service;
import com.liquidnet.service.slime.dto.vo.SlimeStationsVo;
import java.util.List;
public interface ISlimeStationsService {
List<SlimeStationsVo> stationsList(String uid);
}
......@@ -20,7 +20,7 @@
<module>liquidnet-service-sweet-api</module>
<module>liquidnet-service-chime-api</module>
<module>liquidnet-service-candy-api</module>
<module>liquidnet-service-merchant-api</module>
<module>liquidnet-service-slime-api</module>
<module>liquidnet-service-stone-api</module>
</modules>
<dependencies>
......
package com.liquidnet.client.admin.web.controller.zhengzai.merchant;
package com.liquidnet.client.admin.web.controller.zhengzai.slime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -8,13 +8,13 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.ShiroUtils;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldAppliesAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldApplyListParam;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldAppliesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
import com.liquidnet.service.merchant.entity.MerchantFields;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeFieldAppliesAdminService;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeFieldsAdminService;
import com.liquidnet.service.slime.dto.param.admin.SlimeFieldApplyListParam;
import com.liquidnet.service.slime.dto.vo.SlimeFieldAppliesVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import com.liquidnet.service.slime.entity.SlimeFieldApplies;
import com.liquidnet.service.slime.entity.SlimeFields;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
......@@ -26,19 +26,19 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "场地申请管理")
@Controller
@RequestMapping("merchant/field/apply")
public class MerchantFieldAppliesController extends BaseController {
@RequestMapping("slime/field/apply")
public class SlimeFieldAppliesController extends BaseController {
private final String prefix = "zhengzai/kylin/field";
@Autowired
IMerchantFieldsAdminService merchantFieldsAdminService;
ISlimeFieldsAdminService slimeFieldsAdminService;
@Autowired
IMerchantFieldAppliesAdminService merchantFieldAppliesAdminService;
ISlimeFieldAppliesAdminService slimeFieldAppliesAdminService;
@RequiresPermissions("merchant:field:apply:view")
@RequiresPermissions("slime:field:apply:view")
@GetMapping()
public String applyList() {
return prefix + "/applyList";
......@@ -46,41 +46,41 @@ public class MerchantFieldAppliesController extends BaseController {
@Log(title = "场地申请列表", businessType = BusinessType.LIST)
@RequiresPermissions("merchant:field:apply:list")
@RequiresPermissions("slime:field:apply:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(MerchantFieldApplyListParam param) {
public TableDataInfo list(SlimeFieldApplyListParam param) {
startPage();
return getDataTable(merchantFieldAppliesAdminService.list(
Wrappers.lambdaQuery(MerchantFieldApplies.class)
.eq(param.getFieldApplyId().length() > 0, MerchantFieldApplies::getFieldApplyId, param.getFieldApplyId())
.eq(param.getApplyStatus() >= 0, MerchantFieldApplies::getApplyStatus, param.getApplyStatus())
.eq(!param.getApplyType().equals("all"), MerchantFieldApplies::getApplyType, param.getApplyType())
return getDataTable(slimeFieldAppliesAdminService.list(
Wrappers.lambdaQuery(SlimeFieldApplies.class)
.eq(param.getFieldApplyId().length() > 0, SlimeFieldApplies::getFieldApplyId, param.getFieldApplyId())
.eq(param.getApplyStatus() >= 0, SlimeFieldApplies::getApplyStatus, param.getApplyStatus())
.eq(!param.getApplyType().equals("all"), SlimeFieldApplies::getApplyType, param.getApplyType())
.select(
MerchantFieldApplies::getFieldApplyId, MerchantFieldApplies::getApplyStatus, MerchantFieldApplies::getApplyType, MerchantFieldApplies::getReject, MerchantFieldApplies::getUid, MerchantFieldApplies::getFieldId,
MerchantFieldApplies::getName, MerchantFieldApplies::getLogo,
MerchantFieldApplies::getCreatedAt
SlimeFieldApplies::getFieldApplyId, SlimeFieldApplies::getApplyStatus, SlimeFieldApplies::getApplyType, SlimeFieldApplies::getReject, SlimeFieldApplies::getUid, SlimeFieldApplies::getFieldId,
SlimeFieldApplies::getName, SlimeFieldApplies::getLogo,
SlimeFieldApplies::getCreatedAt
)
));
}
@Log(title = "场地申请详情", businessType = BusinessType.DETAIL)
@RequiresPermissions("merchant:field:apply:detail")
@RequiresPermissions("slime:field:apply:detail")
@GetMapping("/details/{fieldApplyId}")
public String detail(@PathVariable("fieldApplyId") String fieldApplyId, ModelMap mmap) {
LambdaQueryWrapper<MerchantFieldApplies> fieldAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFieldApplies.class);
fieldAppliesLambdaQueryWrapper.eq(MerchantFieldApplies::getFieldApplyId, fieldApplyId);
MerchantFieldApplies fieldApplies = merchantFieldAppliesAdminService.getOne(fieldAppliesLambdaQueryWrapper);
LambdaQueryWrapper<SlimeFieldApplies> fieldAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeFieldApplies.class);
fieldAppliesLambdaQueryWrapper.eq(SlimeFieldApplies::getFieldApplyId, fieldApplyId);
SlimeFieldApplies fieldApplies = slimeFieldAppliesAdminService.getOne(fieldAppliesLambdaQueryWrapper);
MerchantFieldAppliesVo fieldAppliesVo = MerchantFieldAppliesVo.getNew();
SlimeFieldAppliesVo fieldAppliesVo = SlimeFieldAppliesVo.getNew();
fieldAppliesVo.copy(fieldApplies);
if (fieldAppliesVo.getApplyType().equals("claim")) {
LambdaQueryWrapper<MerchantFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFields.class);
fieldsLambdaQueryWrapper.eq(MerchantFields::getFieldId, fieldAppliesVo.getFieldId());
MerchantFields fields = merchantFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
LambdaQueryWrapper<SlimeFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeFields.class);
fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, fieldAppliesVo.getFieldId());
SlimeFields fields = slimeFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
MerchantFieldsVo fieldsVo = MerchantFieldsVo.getNew();
SlimeFieldsVo fieldsVo = SlimeFieldsVo.getNew();
fieldsVo.copy(fields);
fieldAppliesVo.setFieldVo(fieldsVo);
}
......@@ -92,19 +92,19 @@ public class MerchantFieldAppliesController extends BaseController {
@ApiOperation(value = "审核通过")
@Log(title = "场地申请审核通过", businessType = BusinessType.INSERT)
@RequiresPermissions("merchant:field:apply:approve")
@RequiresPermissions("slime:field:apply:approve")
@PostMapping("/approve")
@ResponseBody
public AjaxResult approve(@RequestParam(required = true) String fieldApplyId) {
String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName();
return toAjax(merchantFieldAppliesAdminService.applyApprove(fieldApplyId, authUid, authName));
return toAjax(slimeFieldAppliesAdminService.applyApprove(fieldApplyId, authUid, authName));
}
@ApiOperation(value = "审核驳回")
@Log(title = "场地申请审核驳回", businessType = BusinessType.INSERT)
@RequiresPermissions("merchant:field:apply:reject")
@RequiresPermissions("slime:field:apply:reject")
@PostMapping("/reject")
@ResponseBody
public AjaxResult reject(@RequestParam(required = true) String fieldApplyId,
......@@ -112,6 +112,6 @@ public class MerchantFieldAppliesController extends BaseController {
String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName();
return toAjax(merchantFieldAppliesAdminService.applyReject(fieldApplyId, authUid, authName, reject));
return toAjax(slimeFieldAppliesAdminService.applyReject(fieldApplyId, authUid, authName, reject));
}
}
package com.liquidnet.client.admin.web.controller.zhengzai.merchant;
package com.liquidnet.client.admin.web.controller.zhengzai.slime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -7,14 +7,14 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldEditParam;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldListParam;
import com.liquidnet.service.merchant.dto.vo.MerchantCompaniesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.entity.MerchantCompanies;
import com.liquidnet.service.merchant.entity.MerchantFields;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeCompaniesAdminService;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeFieldsAdminService;
import com.liquidnet.service.slime.dto.param.admin.SlimeFieldEditParam;
import com.liquidnet.service.slime.dto.param.admin.SlimeFieldListParam;
import com.liquidnet.service.slime.dto.vo.SlimeCompaniesVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import com.liquidnet.service.slime.entity.SlimeCompanies;
import com.liquidnet.service.slime.entity.SlimeFields;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
......@@ -24,23 +24,21 @@ import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@Api(tags = "场地管理")
@Controller
@RequestMapping("merchant/field")
public class MerchantFieldsController extends BaseController {
@RequestMapping("slime/field")
public class SlimeFieldsController extends BaseController {
private final String prefix = "zhengzai/kylin/field";
@Autowired
IMerchantFieldsAdminService merchantFieldsAdminService;
ISlimeFieldsAdminService slimeFieldsAdminService;
@Autowired
IMerchantCompaniesAdminService merchantCompaniesAdminService;
ISlimeCompaniesAdminService slimeCompaniesAdminService;
@RequiresPermissions("merchant:field:view")
@RequiresPermissions("slime:field:view")
@GetMapping()
public String list() {
return prefix + "/list";
......@@ -48,41 +46,41 @@ public class MerchantFieldsController extends BaseController {
@Log(title = "场地列表", businessType = BusinessType.LIST)
@RequiresPermissions("merchant:field:list")
@RequiresPermissions("slime:field:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(MerchantFieldListParam param) {
public TableDataInfo list(SlimeFieldListParam param) {
startPage();
return getDataTable(merchantFieldsAdminService.list(
Wrappers.lambdaQuery(MerchantFields.class)
.eq(param.getFieldId().length() > 0, MerchantFields::getFieldId, param.getFieldId())
.eq(param.getIsOnline() >= 0, MerchantFields::getIsOnline, param.getIsOnline())
.eq(param.getClaimStatus() >= 0, MerchantFields::getClaimStatus, param.getClaimStatus())
return getDataTable(slimeFieldsAdminService.list(
Wrappers.lambdaQuery(SlimeFields.class)
.eq(param.getFieldId().length() > 0, SlimeFields::getFieldId, param.getFieldId())
.eq(param.getIsOnline() >= 0, SlimeFields::getIsOnline, param.getIsOnline())
.eq(param.getClaimStatus() >= 0, SlimeFields::getClaimStatus, param.getClaimStatus())
.select(
MerchantFields::getFieldId, MerchantFields::getIsOnline, MerchantFields::getClaimStatus, MerchantFields::getUid,
MerchantFields::getName, MerchantFields::getLogo,
MerchantFields::getCreatedAt
SlimeFields::getFieldId, SlimeFields::getIsOnline, SlimeFields::getClaimStatus, SlimeFields::getUid,
SlimeFields::getName, SlimeFields::getLogo,
SlimeFields::getCreatedAt
)
));
}
@Log(title = "场地详情", businessType = BusinessType.DETAIL)
@RequiresPermissions("merchant:field:detail")
@RequiresPermissions("slime:field:detail")
@GetMapping("/details/{fieldId}")
public String detail(@PathVariable("fieldId") String fieldId, ModelMap mmap) {
LambdaQueryWrapper<MerchantFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFields.class);
fieldsLambdaQueryWrapper.eq(MerchantFields::getFieldId, fieldId);
MerchantFields fields = merchantFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
LambdaQueryWrapper<SlimeFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeFields.class);
fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, fieldId);
SlimeFields fields = slimeFieldsAdminService.getOne(fieldsLambdaQueryWrapper);
MerchantFieldsVo fieldsVo = MerchantFieldsVo.getNew();
SlimeFieldsVo fieldsVo = SlimeFieldsVo.getNew();
fieldsVo.copy(fields);
if (null != fieldsVo.getCompanyId() && !fieldsVo.getCompanyId().isEmpty()) {
LambdaQueryWrapper<MerchantCompanies> companiesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantCompanies.class);
companiesLambdaQueryWrapper.eq(MerchantCompanies::getCompanyId, fieldsVo.getCompanyId());
MerchantCompanies companies = merchantCompaniesAdminService.getOne(companiesLambdaQueryWrapper);
LambdaQueryWrapper<SlimeCompanies> companiesLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeCompanies.class);
companiesLambdaQueryWrapper.eq(SlimeCompanies::getCompanyId, fieldsVo.getCompanyId());
SlimeCompanies companies = slimeCompaniesAdminService.getOne(companiesLambdaQueryWrapper);
MerchantCompaniesVo companiesVo = MerchantCompaniesVo.getNew();
SlimeCompaniesVo companiesVo = SlimeCompaniesVo.getNew();
companiesVo.copy(companies);
fieldsVo.setCompaniesVo(companiesVo);
}
......@@ -94,10 +92,10 @@ public class MerchantFieldsController extends BaseController {
@ApiOperation(value = "场地编辑")
@Log(title = "场地编辑", businessType = BusinessType.UPDATE)
@RequiresPermissions("merchant:field:edit")
@RequiresPermissions("slime:field:edit")
@PostMapping("edit")
@ResponseBody
public AjaxResult edit(@RequestBody @Validated MerchantFieldEditParam parameter) {
return toAjax(merchantFieldsAdminService.fieldEdit(parameter));
public AjaxResult edit(@RequestBody @Validated SlimeFieldEditParam parameter) {
return toAjax(slimeFieldsAdminService.fieldEdit(parameter));
}
}
package com.liquidnet.client.admin.web.controller.zhengzai.merchant;
package com.liquidnet.client.admin.web.controller.zhengzai.slime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -8,10 +8,10 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.common.utils.ShiroUtils;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorAppliesAdminService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorApplyListParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorAppliesVo;
import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeSponsorAppliesAdminService;
import com.liquidnet.service.slime.dto.param.admin.SlimeSponsorApplyListParam;
import com.liquidnet.service.slime.dto.vo.SlimeSponsorAppliesVo;
import com.liquidnet.service.slime.entity.SlimeSponsorApplies;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
......@@ -22,48 +22,48 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "主办申请管理")
@Controller
@RequestMapping("merchant/sponsor/apply")
public class MerchantSponsorAppliesController extends BaseController {
@RequestMapping("slime/sponsor/apply")
public class SlimeSponsorAppliesController extends BaseController {
private final String prefix = "zhengzai/kylin/sponsor";
@Autowired
IMerchantSponsorAppliesAdminService merchantSponsorAppliesAdminService;
ISlimeSponsorAppliesAdminService slimeSponsorAppliesAdminService;
@RequiresPermissions("merchant:sponsor:apply:view")
@RequiresPermissions("slime:sponsor:apply:view")
@GetMapping()
public String applyList() {
return prefix + "/applyList";
}
@Log(title = "主办申请管理", businessType = BusinessType.LIST)
@RequiresPermissions("merchant:sponsor:apply:list")
@RequiresPermissions("slime:sponsor:apply:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(MerchantSponsorApplyListParam param) {
public TableDataInfo list(SlimeSponsorApplyListParam param) {
startPage();
return getDataTable(merchantSponsorAppliesAdminService.list(
Wrappers.lambdaQuery(MerchantSponsorApplies.class)
.eq(param.getSponsorApplyId().length() > 0, MerchantSponsorApplies::getSponsorApplyId, param.getSponsorApplyId())
.eq(param.getApplyStatus() >= 0, MerchantSponsorApplies::getApplyStatus, param.getApplyStatus())
return getDataTable(slimeSponsorAppliesAdminService.list(
Wrappers.lambdaQuery(SlimeSponsorApplies.class)
.eq(param.getSponsorApplyId().length() > 0, SlimeSponsorApplies::getSponsorApplyId, param.getSponsorApplyId())
.eq(param.getApplyStatus() >= 0, SlimeSponsorApplies::getApplyStatus, param.getApplyStatus())
.select(
MerchantSponsorApplies::getSponsorApplyId, MerchantSponsorApplies::getApplyStatus, MerchantSponsorApplies::getApplyType, MerchantSponsorApplies::getReject, MerchantSponsorApplies::getUid,
MerchantSponsorApplies::getName, MerchantSponsorApplies::getLogo,
MerchantSponsorApplies::getCreatedAt
SlimeSponsorApplies::getSponsorApplyId, SlimeSponsorApplies::getApplyStatus, SlimeSponsorApplies::getApplyType, SlimeSponsorApplies::getReject, SlimeSponsorApplies::getUid,
SlimeSponsorApplies::getName, SlimeSponsorApplies::getLogo,
SlimeSponsorApplies::getCreatedAt
)
));
}
@Log(title = "主办申请管理", businessType = BusinessType.DETAIL)
@RequiresPermissions("merchant:sponsor:apply:detail")
@RequiresPermissions("slime:sponsor:apply:detail")
@GetMapping(value = "/details/{sponsorApplyId}")
public String detail(@PathVariable("sponsorApplyId") String sponsorApplyId, ModelMap mmap) {
LambdaQueryWrapper<MerchantSponsorApplies> sponsorAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantSponsorApplies.class);
sponsorAppliesLambdaQueryWrapper.eq(MerchantSponsorApplies::getSponsorApplyId, sponsorApplyId);
MerchantSponsorApplies sponsorApplies = merchantSponsorAppliesAdminService.getOne(sponsorAppliesLambdaQueryWrapper);
LambdaQueryWrapper<SlimeSponsorApplies> sponsorAppliesLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeSponsorApplies.class);
sponsorAppliesLambdaQueryWrapper.eq(SlimeSponsorApplies::getSponsorApplyId, sponsorApplyId);
SlimeSponsorApplies sponsorApplies = slimeSponsorAppliesAdminService.getOne(sponsorAppliesLambdaQueryWrapper);
MerchantSponsorAppliesVo sponsorAppliesVo = MerchantSponsorAppliesVo.getNew();
SlimeSponsorAppliesVo sponsorAppliesVo = SlimeSponsorAppliesVo.getNew();
sponsorAppliesVo.copy(sponsorApplies);
mmap.put("sponsorApplyInfo", sponsorAppliesVo);
......@@ -73,19 +73,19 @@ public class MerchantSponsorAppliesController extends BaseController {
@ApiOperation(value = "审核通过")
@Log(title = "主办申请审核通过", businessType = BusinessType.INSERT)
@RequiresPermissions("merchant:sponsor:apply:approve")
@RequiresPermissions("slime:sponsor:apply:approve")
@PostMapping("/approve")
@ResponseBody
public AjaxResult approve(@RequestParam(required = true) String sponsorApplyId) {
String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName();
return toAjax(merchantSponsorAppliesAdminService.applyApprove(sponsorApplyId, authUid, authName));
return toAjax(slimeSponsorAppliesAdminService.applyApprove(sponsorApplyId, authUid, authName));
}
@ApiOperation(value = "审核驳回")
@Log(title = "主办申请审核驳回", businessType = BusinessType.INSERT)
@RequiresPermissions("merchant:sponsor:apply:reject")
@RequiresPermissions("slime:sponsor:apply:reject")
@PostMapping("/reject")
@ResponseBody
public AjaxResult reject(@RequestParam(required = true) String sponsorApplyId,
......@@ -93,6 +93,6 @@ public class MerchantSponsorAppliesController extends BaseController {
String authUid = ShiroUtils.getUserId().toString();
String authName = ShiroUtils.getLoginName();
return toAjax(merchantSponsorAppliesAdminService.applyReject(sponsorApplyId, authUid, authName, reject));
return toAjax(slimeSponsorAppliesAdminService.applyReject(sponsorApplyId, authUid, authName, reject));
}
}
package com.liquidnet.client.admin.web.controller.zhengzai.merchant;
package com.liquidnet.client.admin.web.controller.zhengzai.slime;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
......@@ -7,11 +7,11 @@ import com.liquidnet.client.admin.common.core.controller.BaseController;
import com.liquidnet.client.admin.common.core.domain.AjaxResult;
import com.liquidnet.client.admin.common.core.page.TableDataInfo;
import com.liquidnet.client.admin.common.enums.BusinessType;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorsAdminService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorListParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeSponsorsAdminService;
import com.liquidnet.service.slime.dto.param.admin.SlimeSponsorEditParam;
import com.liquidnet.service.slime.dto.param.admin.SlimeSponsorListParam;
import com.liquidnet.service.slime.dto.vo.SlimeSponsorsVo;
import com.liquidnet.service.slime.entity.SlimeSponsors;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
......@@ -23,16 +23,16 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "主办管理")
@Controller
@RequestMapping("merchant/sponsor")
public class MerchantSponsorsController extends BaseController {
@RequestMapping("slime/sponsor")
public class SlimeSponsorsController extends BaseController {
private final String prefix = "zhengzai/kylin/sponsor";
@Autowired
IMerchantSponsorsAdminService merchantSponsorsAdminService;
ISlimeSponsorsAdminService slimeSponsorsAdminService;
@RequiresPermissions("merchant:sponsor:view")
@RequiresPermissions("slime:sponsor:view")
@GetMapping()
public String list() {
return prefix + "/list";
......@@ -40,33 +40,33 @@ public class MerchantSponsorsController extends BaseController {
@Log(title = "主办列表", businessType = BusinessType.LIST)
@RequiresPermissions("merchant:sponsor:list")
@RequiresPermissions("slime:sponsor:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(MerchantSponsorListParam param) {
public TableDataInfo list(SlimeSponsorListParam param) {
startPage();
return getDataTable(merchantSponsorsAdminService.list(
Wrappers.lambdaQuery(MerchantSponsors.class)
.eq(param.getSponsorId().length() > 0, MerchantSponsors::getSponsorId, param.getSponsorId())
.eq(param.getIsOnline() >= 0, MerchantSponsors::getIsOnline, param.getIsOnline())
return getDataTable(slimeSponsorsAdminService.list(
Wrappers.lambdaQuery(SlimeSponsors.class)
.eq(param.getSponsorId().length() > 0, SlimeSponsors::getSponsorId, param.getSponsorId())
.eq(param.getIsOnline() >= 0, SlimeSponsors::getIsOnline, param.getIsOnline())
.select(
MerchantSponsors::getSponsorId, MerchantSponsors::getIsOnline, MerchantSponsors::getUid,
MerchantSponsors::getName, MerchantSponsors::getLogo,
MerchantSponsors::getCreatedAt
SlimeSponsors::getSponsorId, SlimeSponsors::getIsOnline, SlimeSponsors::getUid,
SlimeSponsors::getName, SlimeSponsors::getLogo,
SlimeSponsors::getCreatedAt
)
));
}
@Log(title = "主办详情", businessType = BusinessType.DETAIL)
@RequiresPermissions("merchant:sponsor:detail")
@RequiresPermissions("slime:sponsor:detail")
@GetMapping(value = "/details/{sponsorId}")
public String detail(@PathVariable("sponsorId") String sponsorId, ModelMap mmap) {
LambdaQueryWrapper<MerchantSponsors> sponsorsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantSponsors.class);
sponsorsLambdaQueryWrapper.eq(MerchantSponsors::getSponsorId, sponsorId);
MerchantSponsors sponsors = merchantSponsorsAdminService.getOne(sponsorsLambdaQueryWrapper);
LambdaQueryWrapper<SlimeSponsors> sponsorsLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeSponsors.class);
sponsorsLambdaQueryWrapper.eq(SlimeSponsors::getSponsorId, sponsorId);
SlimeSponsors sponsors = slimeSponsorsAdminService.getOne(sponsorsLambdaQueryWrapper);
MerchantSponsorsVo sponsorsVo = MerchantSponsorsVo.getNew();
SlimeSponsorsVo sponsorsVo = SlimeSponsorsVo.getNew();
sponsorsVo.copy(sponsors);
mmap.put("sponsorInfo", sponsorsVo);
......@@ -76,10 +76,10 @@ public class MerchantSponsorsController extends BaseController {
@ApiOperation(value = "主办编辑")
@Log(title = "主办编辑", businessType = BusinessType.UPDATE)
@RequiresPermissions("merchant:sponsor:edit")
@RequiresPermissions("slime:sponsor:edit")
@PostMapping("edit")
@ResponseBody
public AjaxResult edit(@RequestBody @Validated MerchantSponsorEditParam parameter) {
return toAjax(merchantSponsorsAdminService.sponsorEdit(parameter));
public AjaxResult edit(@RequestBody @Validated SlimeSponsorEditParam parameter) {
return toAjax(slimeSponsorsAdminService.sponsorEdit(parameter));
}
}
......@@ -138,7 +138,7 @@
</body>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "merchant/field/apply";
var prefix = ctx + "slime/field/apply";
var fieldInfo = [[${fieldApplyInfo}]]
var param = {
fieldApplyId:fieldInfo.fieldApplyId
......
......@@ -47,9 +47,9 @@
var dicFieldApplyType = [[${@dict.getType('zhengzai_field_apply_type')}]];
var dicFieldApplyStatus = [[${@dict.getType('zhengzai_field_apply_status')}]];
var detailFlag = [[${@permission.hasPermi('merchant:field:apply:detail')}]];
var detailFlag = [[${@permission.hasPermi('slime:field:apply:detail')}]];
var prefix = ctx + "merchant/field/apply";
var prefix = ctx + "slime/field/apply";
$(function () {
var options = {
......
......@@ -47,9 +47,9 @@
var dicFieldIsOnline = [[${@dict.getType('zhengzai_field_is_online')}]];
var dicFieldClaimStatus = [[${@dict.getType('zhengzai_field_claim_status')}]];
var detailFlag = [[${@permission.hasPermi('merchant:field:detail')}]];
var detailFlag = [[${@permission.hasPermi('slime:field:detail')}]];
var prefix = ctx + "merchant/field";
var prefix = ctx + "slime/field";
$(function () {
var options = {
......
......@@ -82,7 +82,7 @@
</body>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var prefix = ctx + "merchant/sponsor/apply";
var prefix = ctx + "slime/sponsor/apply";
var sponsorInfo = [[${sponsorApplyInfo}]]
var param = {
sponsorApplyId:sponsorInfo.sponsorApplyId
......
......@@ -39,9 +39,9 @@
<script th:inline="javascript">
var dicSponsorApplyStatus = [[${@dict.getType('zhengzai_sponsor_apply_status')}]];
var detailFlag = [[${@permission.hasPermi('merchant:sponsor:apply:detail')}]];
var detailFlag = [[${@permission.hasPermi('slime:sponsor:apply:detail')}]];
var prefix = ctx + "merchant/sponsor/apply";
var prefix = ctx + "slime/sponsor/apply";
$(function () {
var options = {
......
......@@ -40,9 +40,9 @@
<script th:inline="javascript">
var dicSponsorIsOnline = [[${@dict.getType('zhengzai_sponsor_is_online')}]];
var detailFlag = [[${@permission.hasPermi('merchant:sponsor:detail')}]];
var detailFlag = [[${@permission.hasPermi('slime:sponsor:detail')}]];
var prefix = ctx + "merchant/sponsor";
var prefix = ctx + "slime/sponsor";
$(function () {
var options = {
......
......@@ -40,7 +40,7 @@
</dependency>
<dependency>
<groupId>com.liquidnet</groupId>
<artifactId>liquidnet-service-merchant-api</artifactId>
<artifactId>liquidnet-service-slime-api</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
......
......@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
import com.liquidnet.commons.lang.util.JsonUtils;
......@@ -14,13 +13,10 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.param.ticketSystem.*;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.ticketSystem.*;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.MultiValueMap;
......@@ -175,7 +171,7 @@ public class InnerService {
}
//上报场地
public boolean reportField(MerchantFieldsVo vo) {
public boolean reportField(SlimeFieldsVo vo) {
try {
......
......@@ -10,7 +10,7 @@ import com.liquidnet.service.kylin.dao.OrderPushDamaiDto;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.kylin.service.other.DamaiService;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import com.taobao.api.TaobaoClient;
import com.taobao.api.internal.util.StringUtils;
import com.taobao.api.request.*;
......@@ -140,7 +140,7 @@ public class KylinDamaiServiceImpl extends ServiceImpl<KylinRoadShowsMapper, Kyl
// } else {
// return 0L;
// }
MerchantFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(fieldId);
SlimeFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(fieldId);
obj1.setVenueId(Long.parseLong(fieldsVo.getFieldId()));
obj1.setVenueName(fieldsVo.getName());
obj1.setVenueAddress(fieldsVo.getAddress());
......
......@@ -9,7 +9,7 @@ import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.service.InnerService;
import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantAuthorizationRecordsAdminService;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationRecordsAdminService;
import com.liquidnet.commons.lang.util.BeanUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
......@@ -81,7 +81,7 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
@Autowired
private KylinOrderImportMapper orderImportMapper;
@Autowired
IMerchantAuthorizationRecordsAdminService merchantAuthorizationRecordsAdminService;
ISlimeAuthorizationRecordsAdminService merchantAuthorizationRecordsAdminService;
@Autowired
InnerService innerService;
......
......@@ -2,7 +2,6 @@ package com.liquidnet.client.admin.zhengzai.kylin.utils;
import com.liquidnet.service.kylin.dto.vo.KylinExpressModuleVo;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundAddress;
import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
import com.github.pagehelper.PageInfo;
import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderOutLineVo;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
......@@ -13,8 +12,8 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.merchant.constant.MerchantRedisConst;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.slime.constant.SlimeRedisConst;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
......@@ -47,13 +46,13 @@ public class DataUtils {
}
// 【场地】获取详情
public MerchantFieldsVo getFieldsVoByFieldId(String fieldId) {
String key = MerchantRedisConst.INFO_FIELD.concat(fieldId);
public SlimeFieldsVo getFieldsVoByFieldId(String fieldId) {
String key = SlimeRedisConst.INFO_FIELD.concat(fieldId);
long s = System.currentTimeMillis();
MerchantFieldsVo vo = (MerchantFieldsVo) redisDataSourceUtil.getRedisKylinUtil().get(key);
SlimeFieldsVo vo = (SlimeFieldsVo) redisDataSourceUtil.getRedisKylinUtil().get(key);
if (null == vo) {
vo = mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), MerchantFieldsVo.class, MerchantFieldsVo.class.getSimpleName());
redisDataSourceUtil.getRedisKylinUtil().set(MerchantRedisConst.INFO_FIELD.concat(fieldId), vo);
vo = mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), SlimeFieldsVo.class, SlimeFieldsVo.class.getSimpleName());
redisDataSourceUtil.getRedisKylinUtil().set(SlimeRedisConst.INFO_FIELD.concat(fieldId), vo);
}
return vo;
}
......
......@@ -11,7 +11,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
......@@ -60,7 +60,7 @@ public class MongoVoUtils {
KylinPerformanceRelations p3 = performanceRelationsMapper.selectOne(new UpdateWrapper<KylinPerformanceRelations>().eq("performance_id", performancesId));
//场地相关数据
KylinFields fields = new KylinFields();
MerchantFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(p3.getFieldId());
SlimeFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(p3.getFieldId());
String cityName =fieldsVo.getCityName();
fields.setCityId(null);
fields.setLatitude(fieldsVo.getLatitude());
......
......@@ -7,7 +7,6 @@ import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.commons.lang.util.JsonUtils;
import com.liquidnet.service.kylin.constant.KylinRedisConst;
import com.liquidnet.service.kylin.dto.param.PerformancePartnerVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinBuyNoticeVo;
import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
......@@ -19,7 +18,7 @@ import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketTimesPartnerVo;
import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartnerVo;
import com.liquidnet.service.kylin.entity.*;
import com.liquidnet.service.kylin.mapper.*;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import com.mongodb.BasicDBObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
......@@ -246,7 +245,7 @@ public class PerformanceVoUtils {
KylinPerformances performances = performancesMapper.selectOne(Wrappers.lambdaQuery(KylinPerformances.class).eq(KylinPerformances::getPerformancesId, performancesId));
KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
KylinPerformanceRelations performanceRelations = performanceRelationsMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceRelations.class).eq(KylinPerformanceRelations::getPerformanceId, performancesId));
MerchantFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
SlimeFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
PerformancePartnerVo performanceData = PerformancePartnerVo.getNew().copy(performances, performanceStatus, performanceRelations,
fieldsVo.getName());
......@@ -316,7 +315,7 @@ public class PerformanceVoUtils {
KylinPerformanceRelations performanceRelations = new KylinPerformanceRelations();
BeanUtils.copyProperties(performanceUpdateMisVo, performanceRelations);
MerchantFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
SlimeFieldsVo fieldsVo = dataUtils.getFieldsVoByFieldId(performanceRelations.getFieldId());
performances.setDetails(performanceUpdateMisVo.getDetails());
performances.setCityName(fieldsVo.getCityName());
performances.setCityId(Integer.parseInt(fieldsVo.getCityId()));
......
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantAuthorizationPermissions;
public interface IMerchantAuthorizationPermissionsAdminService extends IService<MerchantAuthorizationPermissions> {
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantCompanies;
public interface IMerchantCompaniesAdminService extends IService<MerchantCompanies> {
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantFieldCheckers;
public interface IMerchantFieldCheckersAdminService extends IService<MerchantFieldCheckers> {
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldEditParam;
import com.liquidnet.service.merchant.entity.MerchantFields;
public interface IMerchantFieldsAdminService extends IService<MerchantFields> {
boolean fieldEdit(MerchantFieldEditParam parameter);
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
public interface IMerchantSponsorsAdminService extends IService<MerchantSponsors> {
boolean sponsorEdit(MerchantSponsorEditParam parameter);
}
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantAuthorizationPermissionsAdminService;
import com.liquidnet.service.merchant.entity.MerchantAuthorizationPermissions;
import com.liquidnet.service.merchant.mapper.MerchantAuthorizationPermissionsMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class MerchantAuthorizationPermissionsAdminServiceImpl extends ServiceImpl<MerchantAuthorizationPermissionsMapper, MerchantAuthorizationPermissions> implements IMerchantAuthorizationPermissionsAdminService {
}
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService;
import com.liquidnet.service.merchant.entity.MerchantCompanies;
import com.liquidnet.service.merchant.mapper.MerchantCompaniesMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class MerchantCompaniesAdminServiceImpl extends ServiceImpl<MerchantCompaniesMapper, MerchantCompanies> implements IMerchantCompaniesAdminService {
}
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldCheckersAdminService;
import com.liquidnet.service.merchant.entity.MerchantFieldCheckers;
import com.liquidnet.service.merchant.mapper.MerchantFieldCheckersMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class MerchantFieldCheckersAdminServiceImpl extends ServiceImpl<MerchantFieldCheckersMapper, MerchantFieldCheckers> implements IMerchantFieldCheckersAdminService {
}
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.slime.entity.SlimeAuthorizationPermissions;
public interface ISlimeAuthorizationPermissionsAdminService extends IService<SlimeAuthorizationPermissions> {
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantAuthorizationRecords;
import com.liquidnet.service.slime.entity.SlimeAuthorizationRecords;
public interface IMerchantAuthorizationRecordsAdminService extends IService<MerchantAuthorizationRecords> {
public interface ISlimeAuthorizationRecordsAdminService extends IService<SlimeAuthorizationRecords> {
void authorizationAudit(String performanceId, String cuid, String fieldId);
......
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.slime.entity.SlimeCompanies;
public interface ISlimeCompaniesAdminService extends IService<SlimeCompanies> {
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantFieldApplies;
import com.liquidnet.service.slime.entity.SlimeFieldApplies;
public interface IMerchantFieldAppliesAdminService extends IService<MerchantFieldApplies> {
public interface ISlimeFieldAppliesAdminService extends IService<SlimeFieldApplies> {
boolean applyApprove(String fieldApplyId, String auditUid, String auditName);
boolean applyReject(String fieldApplyId, String auditUid, String auditName, String reject);
......
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.slime.entity.SlimeFieldCheckers;
public interface ISlimeFieldCheckersAdminService extends IService<SlimeFieldCheckers> {
}
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.slime.dto.param.admin.SlimeFieldEditParam;
import com.liquidnet.service.slime.entity.SlimeFields;
public interface ISlimeFieldsAdminService extends IService<SlimeFields> {
boolean fieldEdit(SlimeFieldEditParam parameter);
}
package com.liquidnet.client.admin.zhengzai.merchant.service;
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.merchant.entity.MerchantSponsorApplies;
import com.liquidnet.service.slime.entity.SlimeSponsorApplies;
public interface IMerchantSponsorAppliesAdminService extends IService<MerchantSponsorApplies> {
public interface ISlimeSponsorAppliesAdminService extends IService<SlimeSponsorApplies> {
boolean applyApprove(String sponsorApplyId, String auditUid, String auditName);
boolean applyReject(String sponsorApplyId, String auditUid, String auditName, String reject);
......
package com.liquidnet.client.admin.zhengzai.slime.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.slime.dto.param.admin.SlimeSponsorEditParam;
import com.liquidnet.service.slime.entity.SlimeSponsors;
public interface ISlimeSponsorsAdminService extends IService<SlimeSponsors> {
boolean sponsorEdit(SlimeSponsorEditParam parameter);
}
package com.liquidnet.client.admin.zhengzai.slime.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationPermissionsAdminService;
import com.liquidnet.service.slime.entity.SlimeAuthorizationPermissions;
import com.liquidnet.service.slime.mapper.SlimeAuthorizationPermissionsMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class SlimeAuthorizationPermissionsAdminServiceImpl extends ServiceImpl<SlimeAuthorizationPermissionsMapper, SlimeAuthorizationPermissions> implements ISlimeAuthorizationPermissionsAdminService {
}
package com.liquidnet.client.admin.zhengzai.slime.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeCompaniesAdminService;
import com.liquidnet.service.slime.entity.SlimeCompanies;
import com.liquidnet.service.slime.mapper.SlimeCompaniesMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class SlimeCompaniesAdminServiceImpl extends ServiceImpl<SlimeCompaniesMapper, SlimeCompanies> implements ISlimeCompaniesAdminService {
}
package com.liquidnet.client.admin.zhengzai.slime.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeFieldCheckersAdminService;
import com.liquidnet.service.slime.entity.SlimeFieldCheckers;
import com.liquidnet.service.slime.mapper.SlimeFieldCheckersMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class SlimeFieldCheckersAdminServiceImpl extends ServiceImpl<SlimeFieldCheckersMapper, SlimeFieldCheckers> implements ISlimeFieldCheckersAdminService {
}
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
package com.liquidnet.client.admin.zhengzai.slime.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantCompaniesAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantFieldsAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantMongoUtil;
import com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantRedisUtil;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeCompaniesAdminService;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeFieldsAdminService;
import com.liquidnet.client.admin.zhengzai.slime.utils.SlimeMongoUtil;
import com.liquidnet.client.admin.zhengzai.slime.utils.SlimeRedisUtil;
import com.liquidnet.common.exception.LiquidnetServiceException;
import com.liquidnet.service.merchant.dto.param.admin.MerchantFieldEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantCompaniesVo;
import com.liquidnet.service.merchant.dto.vo.MerchantFieldsVo;
import com.liquidnet.service.merchant.entity.MerchantCompanies;
import com.liquidnet.service.merchant.entity.MerchantFields;
import com.liquidnet.service.merchant.mapper.MerchantFieldsMapper;
import com.liquidnet.service.slime.dto.param.admin.SlimeFieldEditParam;
import com.liquidnet.service.slime.dto.vo.SlimeCompaniesVo;
import com.liquidnet.service.slime.dto.vo.SlimeFieldsVo;
import com.liquidnet.service.slime.entity.SlimeCompanies;
import com.liquidnet.service.slime.entity.SlimeFields;
import com.liquidnet.service.slime.mapper.SlimeFieldsMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -23,25 +23,25 @@ import java.time.LocalDateTime;
@Slf4j
@Service
public class MerchantFieldsAdminServiceImpl extends ServiceImpl<MerchantFieldsMapper, MerchantFields> implements IMerchantFieldsAdminService {
public class SlimeFieldsAdminServiceImpl extends ServiceImpl<SlimeFieldsMapper, SlimeFields> implements ISlimeFieldsAdminService {
@Autowired
MerchantRedisUtil merchantRedisUtil;
SlimeRedisUtil slimeRedisUtil;
@Autowired
MerchantMongoUtil merchantMongoUtil;
SlimeMongoUtil slimeMongoUtil;
@Autowired
IMerchantCompaniesAdminService merchantCompaniesAdminService;
ISlimeCompaniesAdminService slimeCompaniesAdminService;
@Override
public boolean fieldEdit(MerchantFieldEditParam parameter) {
public boolean fieldEdit(SlimeFieldEditParam parameter) {
LocalDateTime now = LocalDateTime.now();
// 查询场地 entity
LambdaQueryWrapper<MerchantFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantFields.class);
fieldsLambdaQueryWrapper.eq(MerchantFields::getFieldId, parameter.getFieldId());
MerchantFields fieldsEntity = getOne(fieldsLambdaQueryWrapper);
LambdaQueryWrapper<SlimeFields> fieldsLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeFields.class);
fieldsLambdaQueryWrapper.eq(SlimeFields::getFieldId, parameter.getFieldId());
SlimeFields fieldsEntity = getOne(fieldsLambdaQueryWrapper);
if (null == fieldsEntity) {
// todo error
throw new LiquidnetServiceException();
......@@ -55,23 +55,23 @@ public class MerchantFieldsAdminServiceImpl extends ServiceImpl<MerchantFieldsMa
updateById(fieldsEntity);
// 场地 vo
MerchantFieldsVo fieldsVo = MerchantFieldsVo.getNew();
SlimeFieldsVo fieldsVo = SlimeFieldsVo.getNew();
fieldsVo.copy(fieldsEntity);
if (null != fieldsVo.getCompanyId() && !fieldsVo.getCompanyId().isEmpty()) {
LambdaQueryWrapper<MerchantCompanies> companiesLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantCompanies.class);
companiesLambdaQueryWrapper.eq(MerchantCompanies::getCompanyId, fieldsVo.getCompanyId());
MerchantCompanies companies = merchantCompaniesAdminService.getOne(companiesLambdaQueryWrapper);
LambdaQueryWrapper<SlimeCompanies> companiesLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeCompanies.class);
companiesLambdaQueryWrapper.eq(SlimeCompanies::getCompanyId, fieldsVo.getCompanyId());
SlimeCompanies companies = slimeCompaniesAdminService.getOne(companiesLambdaQueryWrapper);
MerchantCompaniesVo companiesVo = MerchantCompaniesVo.getNew();
SlimeCompaniesVo companiesVo = SlimeCompaniesVo.getNew();
companiesVo.copy(companies);
fieldsVo.setCompaniesVo(companiesVo);
}
// 场地 mongo
merchantMongoUtil.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
slimeMongoUtil.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
// 场地 redis
merchantRedisUtil.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
slimeRedisUtil.setFieldsVoByFieldId(fieldsVo.getFieldId(), fieldsVo);
return true;
}
......
package com.liquidnet.client.admin.zhengzai.merchant.service.impl;
package com.liquidnet.client.admin.zhengzai.slime.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
import com.liquidnet.client.admin.zhengzai.merchant.service.IMerchantSponsorsAdminService;
import com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantMongoUtil;
import com.liquidnet.client.admin.zhengzai.merchant.utils.MerchantRedisUtil;
import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeSponsorsAdminService;
import com.liquidnet.client.admin.zhengzai.slime.utils.SlimeMongoUtil;
import com.liquidnet.client.admin.zhengzai.slime.utils.SlimeRedisUtil;
import com.liquidnet.common.exception.LiquidnetServiceException;
import com.liquidnet.service.merchant.dto.param.admin.MerchantSponsorEditParam;
import com.liquidnet.service.merchant.dto.vo.MerchantSponsorsVo;
import com.liquidnet.service.merchant.entity.MerchantSponsors;
import com.liquidnet.service.merchant.mapper.MerchantSponsorsMapper;
import com.liquidnet.service.slime.dto.param.admin.SlimeSponsorEditParam;
import com.liquidnet.service.slime.dto.vo.SlimeSponsorsVo;
import com.liquidnet.service.slime.entity.SlimeSponsors;
import com.liquidnet.service.slime.mapper.SlimeSponsorsMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -20,22 +20,22 @@ import java.time.LocalDateTime;
@Slf4j
@Service
public class MerchantSponsorsAdminServiceImpl extends ServiceImpl<MerchantSponsorsMapper, MerchantSponsors> implements IMerchantSponsorsAdminService {
public class SlimeSponsorsAdminServiceImpl extends ServiceImpl<SlimeSponsorsMapper, SlimeSponsors> implements ISlimeSponsorsAdminService {
@Autowired
MerchantRedisUtil merchantRedisUtil;
SlimeRedisUtil slimeRedisUtil;
@Autowired
MerchantMongoUtil merchantMongoUtil;
SlimeMongoUtil slimeMongoUtil;
@Override
public boolean sponsorEdit(MerchantSponsorEditParam parameter) {
public boolean sponsorEdit(SlimeSponsorEditParam parameter) {
LocalDateTime now = LocalDateTime.now();
// 查询主办 entity
LambdaQueryWrapper<MerchantSponsors> sponsorsLambdaQueryWrapper = Wrappers.lambdaQuery(MerchantSponsors.class);
sponsorsLambdaQueryWrapper.eq(MerchantSponsors::getSponsorId, parameter.getSponsorId());
MerchantSponsors sponsorsEntity = getOne(sponsorsLambdaQueryWrapper);
LambdaQueryWrapper<SlimeSponsors> sponsorsLambdaQueryWrapper = Wrappers.lambdaQuery(SlimeSponsors.class);
sponsorsLambdaQueryWrapper.eq(SlimeSponsors::getSponsorId, parameter.getSponsorId());
SlimeSponsors sponsorsEntity = getOne(sponsorsLambdaQueryWrapper);
if (null == sponsorsEntity) {
// todo error
throw new LiquidnetServiceException();
......@@ -49,14 +49,14 @@ public class MerchantSponsorsAdminServiceImpl extends ServiceImpl<MerchantSponso
updateById(sponsorsEntity);
// 主办 vo
MerchantSponsorsVo sponsorsVo = MerchantSponsorsVo.getNew();
SlimeSponsorsVo sponsorsVo = SlimeSponsorsVo.getNew();
sponsorsVo.copy(sponsorsEntity);
// 主办 mongo
merchantMongoUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
slimeMongoUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
// 主办 redis
merchantRedisUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
slimeRedisUtil.setSponsorsVoBySponsorId(sponsorsVo.getSponsorId(), sponsorsVo);
return true;
}
......
......@@ -144,23 +144,23 @@ public class MQConst {
}
}
public enum MerchantQueue {
SQL_MERCHANT_FIELD("merchant:stream:rk.sql.field", "group.sql.field", "场地相关"),
SQL_MERCHANT_SPONSOR("merchant:stream:rk.sql.sponsor", "group.sql.sponsor", "主办相关"),
public enum SlimeQueue {
SQL_SLIME_FIELD("slime:stream:rk.sql.field", "group.sql.field", "场地相关"),
SQL_SLIME_SPONSOR("slime:stream:rk.sql.sponsor", "group.sql.sponsor", "主办相关"),
SQL_MERCHANT_TICKET_UPDATE("merchant:stream:rk.ticket", "group.ticket", "票种相关"),
SQL_MERCHANT_PERFORMANCE_UPDATE("merchant:stream:rk.performance", "group.performance", "演出相关"),
SQL_MERCHANT_STEP2("merchant:stream:rk.performance.step2", "group.performance.step2", "修改演出第二部"),
SQL_MERCHANT_LINE("merchant:stream:rk.any.line", "group.any.line", "上下线相关"),
SQL_MERCHANT_PERFORMANCE_INSERT("merchant:stream:rk.performance.insert", "group.performance.insert", "创建演出"),
SQL_SLIME_TICKET_UPDATE("slime:stream:rk.ticket", "group.ticket", "票种相关"),
SQL_SLIME_PERFORMANCE_UPDATE("slime:stream:rk.performance", "group.performance", "演出相关"),
SQL_SLIME_STEP2("slime:stream:rk.performance.step2", "group.performance.step2", "修改演出第二部"),
SQL_SLIME_LINE("slime:stream:rk.any.line", "group.any.line", "上下线相关"),
SQL_SLIME_PERFORMANCE_INSERT("slime:stream:rk.performance.insert", "group.performance.insert", "创建演出"),
;
private final String key;
private final String group;
private final String desc;
MerchantQueue(String key, String group, String desc) {
SlimeQueue(String key, String group, String desc) {
this.key = key;
this.group = group;
this.desc = desc;
......
......@@ -37,6 +37,12 @@ liquidnet:
host: 39.107.71.112
port: 6379
password: 3Xa%8p
slime:
dbs: 0,16
database: 15
host: 39.107.71.112
port: 6379
password: 3Xa%8p
dragon:
dbs: 0,16
database: 15
......
......@@ -37,6 +37,12 @@ liquidnet:
host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380
password: PO@B!Iud32
slime:
database: 255
dbs: 0,256
host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
port: 6380
password: PO@B!Iud32
dragon:
database: 255
dbs: 0,256
......
......@@ -4,11 +4,11 @@ liquidnet:
switch: false
info:
port: 9013
context: /merchant
name: liquidnet-service-merchant
context: /slime
name: liquidnet-service-slime
logfile:
path: /data/logs
name: service-merchant
name: service-slime
config: classpath:logback-spring.xml
file-max-size: 200MB
pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
......
......@@ -4,11 +4,11 @@ liquidnet:
switch: false
info:
port: 9013
context: /merchant
name: liquidnet-service-merchant
context: /slime
name: liquidnet-service-slime
logfile:
path: /data/logs
name: service-merchant
name: service-slime
config: classpath:logback-spring.xml
file-max-size: 200MB
level: debug
......
......@@ -75,10 +75,10 @@ spring:
- org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
redis:
database: 15
dbs: ${liquidnet.redis.kylin.dbs}
port: ${liquidnet.redis.kylin.port}
host: ${liquidnet.redis.kylin.host}
password: ${liquidnet.redis.kylin.password}
dbs: ${liquidnet.redis.slime.dbs}
port: ${liquidnet.redis.slime.port}
host: ${liquidnet.redis.slime.host}
password: ${liquidnet.redis.slime.password}
lettuce:
pool:
max-active: 8
......
<?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.merchant.mapper.MerchantAuthorizationPermissionsMapper">
</mapper>
<?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.merchant.mapper.MerchantAuthorizationRecordsMapper">
</mapper>
<?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.merchant.mapper.MerchantFieldAppliesMapper">
</mapper>
<?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.merchant.mapper.MerchantSponsorAppliesMapper">
</mapper>
......@@ -9,7 +9,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>liquidnet-service-merchant-do</artifactId>
<artifactId>liquidnet-service-slime-do</artifactId>
</project>
\ No newline at end of file
package com.liquidnet.service.merchant.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 演出授权关联权限表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class MerchantAuthorizationPermissions implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* authorization_permission_id
*/
private String authorizationPermissionId;
/**
* authorization_record_id
*/
private String authorizationRecordId;
/**
* permission_id
*/
private String permissionId;
/**
* 授权开始时间
*/
private LocalDateTime startTime;
/**
* 授权结束时间
*/
private LocalDateTime endTime;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.slime.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 演出授权关联权限表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SlimeAuthorizationPermissions implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* authorization_permission_id
*/
private String authorizationPermissionId;
/**
* authorization_record_id
*/
private String authorizationRecordId;
/**
* permission_id
*/
private String permissionId;
/**
* 授权开始时间
*/
private LocalDateTime startTime;
/**
* 授权结束时间
*/
private LocalDateTime endTime;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.merchant.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 演出授权记录表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class MerchantAuthorizationRecords implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* authorization_record_id
*/
private String authorizationRecordId;
/**
* 演出ID
*/
private String performanceId;
/**
* 权利人演出角色[creator|sponsor|fielder|checker]
*/
private String uidRole;
/**
* 权利人
*/
private String uid;
/**
* 手机号
*/
private String mobile;
/**
* 姓名
*/
private String name;
/**
* 授权人演出角色[creator|sponsor|fielder]
*/
private String cuidRole;
/**
* 授权人
*/
private String cuid;
private LocalDateTime deletedAt;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.slime.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 演出授权记录表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SlimeAuthorizationRecords implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* authorization_record_id
*/
private String authorizationRecordId;
/**
* 演出ID
*/
private String performanceId;
/**
* 权利人演出角色[creator|sponsor|fielder|checker]
*/
private String uidRole;
/**
* 权利人
*/
private String uid;
/**
* 手机号
*/
private String mobile;
/**
* 姓名
*/
private String name;
/**
* 授权人演出角色[creator|sponsor|fielder]
*/
private String cuidRole;
/**
* 授权人
*/
private String cuid;
private LocalDateTime deletedAt;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.merchant.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 公司表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class MerchantCompanies implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* company_id
*/
private String companyId;
/**
* 企业名称
*/
private String name;
/**
* 营业执照编号
*/
private String licenseCode;
/**
* 营业执照图片地址
*/
private String licenseImg;
/**
* 法人姓名
*/
private String legalName;
/**
* 法人身份证号码
*/
private String legalIdentity;
/**
* 法人身份证正面照
*/
private String legalIdentityObverse;
/**
* 法人身份证反面照
*/
private String legalIdentityReverse;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.slime.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 公司表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SlimeCompanies implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* company_id
*/
private String companyId;
/**
* 企业名称
*/
private String name;
/**
* 营业执照编号
*/
private String licenseCode;
/**
* 营业执照图片地址
*/
private String licenseImg;
/**
* 法人姓名
*/
private String legalName;
/**
* 法人身份证号码
*/
private String legalIdentity;
/**
* 法人身份证正面照
*/
private String legalIdentityObverse;
/**
* 法人身份证反面照
*/
private String legalIdentityReverse;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.merchant.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 场地申请表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class MerchantFieldApplies implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* field_apply_id
*/
private String fieldApplyId;
/**
* 申请状态 0待审核 1通过 2驳回
*/
private Integer applyStatus;
/**
* 类型 claim认领、create创建
*/
private String applyType;
/**
* 驳回原因
*/
private String reject;
/**
* 申请者账号
*/
private String uid;
/**
* 要认领的或创建的场地ID
*/
private String fieldId;
/**
* 名称
*/
private String name;
/**
* logo图片地址
*/
private String logo;
/**
* 背景图片地址
*/
private String background;
/**
* 介绍
*/
private String description;
/**
* 建立日期
*/
private LocalDate builtDate;
/**
* 省份ID
*/
private String provinceId;
/**
* 省份名称
*/
private String provinceName;
/**
* 城市ID
*/
private String cityId;
/**
* 城市名称
*/
private String cityName;
/**
* 区县ID
*/
private String districtId;
/**
* 区县名称
*/
private String districtName;
/**
* 详细地址
*/
private String address;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
/**
* 联系人姓名
*/
private String contactName;
/**
* 联系人邮箱
*/
private String contactEmail;
/**
* 企业名称
*/
private String companyName;
/**
* 营业执照编号
*/
private String licenseCode;
/**
* 营业执照图片地址
*/
private String licenseImg;
/**
* 法人姓名
*/
private String legalName;
/**
* 法人身份证号码
*/
private String legalIdentity;
/**
* 法人身份证正面照
*/
private String legalIdentityObverse;
/**
* 法人身份证反面照
*/
private String legalIdentityReverse;
/**
* 审核人ID
*/
private String auditUid;
/**
* 审核人姓名
*/
private String auditName;
private LocalDateTime auditedAt;
private LocalDateTime deletedAt;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.slime.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 场地申请表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SlimeFieldApplies implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* field_apply_id
*/
private String fieldApplyId;
/**
* 申请状态 0待审核 1通过 2驳回
*/
private Integer applyStatus;
/**
* 类型 claim认领、create创建
*/
private String applyType;
/**
* 驳回原因
*/
private String reject;
/**
* 申请者账号
*/
private String uid;
/**
* 要认领的或创建的场地ID
*/
private String fieldId;
/**
* 名称
*/
private String name;
/**
* logo图片地址
*/
private String logo;
/**
* 背景图片地址
*/
private String background;
/**
* 介绍
*/
private String description;
/**
* 建立日期
*/
private LocalDate builtDate;
/**
* 省份ID
*/
private String provinceId;
/**
* 省份名称
*/
private String provinceName;
/**
* 城市ID
*/
private String cityId;
/**
* 城市名称
*/
private String cityName;
/**
* 区县ID
*/
private String districtId;
/**
* 区县名称
*/
private String districtName;
/**
* 详细地址
*/
private String address;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
/**
* 联系人姓名
*/
private String contactName;
/**
* 联系人邮箱
*/
private String contactEmail;
/**
* 企业名称
*/
private String companyName;
/**
* 营业执照编号
*/
private String licenseCode;
/**
* 营业执照图片地址
*/
private String licenseImg;
/**
* 法人姓名
*/
private String legalName;
/**
* 法人身份证号码
*/
private String legalIdentity;
/**
* 法人身份证正面照
*/
private String legalIdentityObverse;
/**
* 法人身份证反面照
*/
private String legalIdentityReverse;
/**
* 审核人ID
*/
private String auditUid;
/**
* 审核人姓名
*/
private String auditName;
private LocalDateTime auditedAt;
private LocalDateTime deletedAt;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.merchant.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 场地默认验票员表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class MerchantFieldCheckers implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* field_apply_id
*/
private String fieldCheckerId;
/**
* 场地ID
*/
private String fieldId;
/**
* 验票员账号
*/
private String uid;
/**
* 手机号
*/
private String mobile;
/**
* 姓名
*/
private String name;
/**
* 授权人账号
*/
private String cuid;
private LocalDateTime deletedAt;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
package com.liquidnet.service.slime.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>
* 场地默认验票员表
* </p>
*
* @author liquidnet
* @since 2021-11-02
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SlimeFieldCheckers implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "mid", type = IdType.AUTO)
private Long mid;
/**
* field_apply_id
*/
private String fieldCheckerId;
/**
* 场地ID
*/
private String fieldId;
/**
* 验票员账号
*/
private String uid;
/**
* 手机号
*/
private String mobile;
/**
* 姓名
*/
private String name;
/**
* 授权人账号
*/
private String cuid;
private LocalDateTime deletedAt;
private LocalDateTime createdAt;
private LocalDateTime updatedAt;
}
This diff is collapsed.
This diff is collapsed.
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