suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

区域配置、提交意向金、银行接口

Browse Source
This commit is contained in:
wangxiaopeng
2024-03-28 16:38:27 +08:00
parent 1530840b45
commit 0ae1df7bbd
41 changed files with 2116 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
coolstore-partner-model/src/main/java/com/cool/store/entity/BankdocDO.java Normal file
View File

@@ -0,0 +1,38 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author wxp
* @date 2024-03-27 09:25
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BankdocDO implements Serializable {
@ApiModelProperty("")
private String code;
@ApiModelProperty("")
private String combinenum;
@ApiModelProperty("")
private BigDecimal enablestate;
@ApiModelProperty("")
private String iscustbank;
@ApiModelProperty("")
private String name;
@ApiModelProperty("")
private String pkBanktype;
}

31
coolstore-partner-model/src/main/java/com/cool/store/entity/BanktypeDO.java Normal file
View File

@@ -0,0 +1,31 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author wxp
* @date 2024-03-27 09:25
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BanktypeDO implements Serializable {
@ApiModelProperty("")
private String pkBanktype;
@ApiModelProperty("")
private String code;
@ApiModelProperty("")
private String combinecode;
@ApiModelProperty("")
private String name;
}

77
coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java Normal file
View File

@@ -0,0 +1,77 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author wxp
* @date 2024-03-27 09:25
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class LinePayDO implements Serializable {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("xfsg_user_info.partner_id")
private String partnerId;
@ApiModelProperty("line_info.id")
private Long lineId;
@ApiModelProperty("支付状态 0:待付款 1:已付款")
private Integer payStatus;
@ApiModelProperty("支付方式 1微信 2银行转账")
private Integer payType;
@ApiModelProperty("付款人姓名")
private String payUserName;
@ApiModelProperty("付款账号")
private String payAccount;
@ApiModelProperty("开户行code")
private String bankCode;
@ApiModelProperty("开户行名称")
private String bankName;
@ApiModelProperty("支行code")
private String branchBankCode;
@ApiModelProperty("支行名称")
private String branchBankName;
@ApiModelProperty("缴纳时间")
private Date payTime;
@ApiModelProperty("付款截图")
private String payPic;
@ApiModelProperty("承诺书图片")
private String promisePic;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("创建人")
private String createUserId;
@ApiModelProperty("更新人")
private String updateUserId;
@ApiModelProperty("是否删除：0.否 1.是")
private Boolean deleted;
}

44
coolstore-partner-model/src/main/java/com/cool/store/entity/RegionAreaConfigDO.java Normal file
View File

@@ -0,0 +1,44 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author wxp
* @date 2024-03-27 09:25
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RegionAreaConfigDO implements Serializable {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("区域ID 战区id")
private Long regionId;
@ApiModelProperty("意向开店区域 省市code")
private Long wantShopAreaId;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("创建人")
private String createUserId;
@ApiModelProperty("更新人")
private String updateUserId;
@ApiModelProperty("是否删除：0.否 1.是")
private Boolean deleted;
}

47
coolstore-partner-model/src/main/java/com/cool/store/entity/RegionQrcodeConfigDO.java Normal file
View File

@@ -0,0 +1,47 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @author wxp
* @date 2024-03-27 09:25
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class RegionQrcodeConfigDO implements Serializable {
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("区域ID 大区id")
private Long regionId;
@ApiModelProperty("大区名称")
private String regionName;
@ApiModelProperty("支付二维码图片url")
private String payPic;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("创建人")
private String createUserId;
@ApiModelProperty("更新人")
private String updateUserId;
@ApiModelProperty("是否删除：0.否 1.是")
private Boolean deleted;
}

24
coolstore-partner-model/src/main/java/com/cool/store/request/BranchBankPageRequest.java Normal file
View File

@@ -0,0 +1,24 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author wxp
* @FileName: BranchBankPageRequest
* @Description:支行列表
* @date 2024-03-28 15:51
*/
@Data
public class BranchBankPageRequest extends PageBasicInfo {
@ApiModelProperty("银行code")
@NotNull(message = "银行code不能为空")
private String bankCode;
@ApiModelProperty("支行名字或code")
private String keyword;
}

55
coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java Normal file
View File

@@ -0,0 +1,55 @@
package com.cool.store.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date;
@Data
@ApiModel("缴纳意向金Request")
public class LinePaySubmitRequest {
@ApiModelProperty("xfsg_user_info.partner_id")
private String partnerId;
@ApiModelProperty("line_info.id")
@NotNull(message = "线索id不能为空")
private Long lineId;
@ApiModelProperty("支付状态 0:待付款 1:已付款")
private Integer payStatus;
@ApiModelProperty("支付方式 1微信 2银行转账")
private Integer payType;
@ApiModelProperty("付款人姓名")
private String payUserName;
@ApiModelProperty("付款账号")
private String payAccount;
@ApiModelProperty("开户行code")
private String bankCode;
@ApiModelProperty("开户行名称")
private String bankName;
@ApiModelProperty("支行code")
private String branchBankCode;
@ApiModelProperty("支行名称")
private String branchBankName;
@ApiModelProperty("缴纳时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
@ApiModelProperty("付款截图")
private String payPic;
@ApiModelProperty("承诺书图片")
private String promisePic;
}

27
coolstore-partner-model/src/main/java/com/cool/store/request/RegionAreaConfigAddRequest.java Normal file
View File

@@ -0,0 +1,27 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* @author wxp
*/
@ApiModel(value = "区域配置")
@Data
public class RegionAreaConfigAddRequest {
@ApiModelProperty("区域id")
@NotNull(message = "区域id不能为空")
private Long regionId;
@ApiModelProperty("省市集合")
@NotEmpty(message = "省市不能为空")
private List<Long> areaIdList;
}

70
coolstore-partner-model/src/main/java/com/cool/store/vo/LinePayVO.java Normal file
View File

@@ -0,0 +1,70 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author wxp
* @Date 2024/3/25 13:46
* @Version 1.0
*/
@Data
public class LinePayVO {
@ApiModelProperty("")
private Long id;
@ApiModelProperty("xfsg_user_info.partner_id")
private String partnerId;
@ApiModelProperty("line_info.id")
private Long lineId;
@ApiModelProperty("支付状态 0:待付款 1:已付款")
private Byte payStatus;
@ApiModelProperty("支付方式 1微信 2银行转账")
private Byte payType;
@ApiModelProperty("付款人姓名")
private String payUserName;
@ApiModelProperty("付款账号")
private String payAccount;
@ApiModelProperty("开户行code")
private String bankCode;
@ApiModelProperty("开户行名称")
private String bankName;
@ApiModelProperty("支行code")
private String branchBankCode;
@ApiModelProperty("支行名称")
private String branchBankName;
@ApiModelProperty("缴纳时间")
private Date payTime;
@ApiModelProperty("付款截图")
private String payPic;
@ApiModelProperty("承诺书图片")
private String promisePic;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("创建人")
private String createUserId;
@ApiModelProperty("更新人")
private String updateUserId;
}

40
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerUserInfoVO.java
View File

@@ -1,12 +1,8 @@
package com.cool.store.vo;
import com.cool.store.enums.LineStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.util.Objects;
/**
* @Author suzhuhong
@@ -29,33 +25,21 @@ public class PartnerUserInfoVO {
@ApiModelProperty("申请人姓名")
private String username;
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("居住地址")
private String liveAddress;
@ApiModelProperty("意向开店区域ID")
private String wantShopArea;
private Long wantShopAreaId;
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("邀请码")
private String inviteCode;
@ApiModelProperty("是否填写加盟需知")
private Integer isWritePartnerKnow;
@ApiModelProperty("openid")
private String openid;
@ApiModelProperty("unionid")
private String unionId;
@ApiModelProperty("是否需要提交意向信息")
private Boolean needSubmitWantInfo;
@ApiModelProperty("线索id")
private Long lineId;
@@ -71,20 +55,8 @@ public class PartnerUserInfoVO {
@ApiModelProperty("0.公海 1.私海 2黑名单")
private Integer lineStatus;
public Boolean getNeedSubmitWantInfo() {
//如果是私海 且liveArea与acceptAdjustType是空 说明通过会销进入 返回false
if (LineStatusEnum.PRIVATE_SEAS.getCode().equals(lineStatus)&&StringUtils.isBlank(liveArea)
&& Objects.isNull(acceptAdjustType)){
return false;
}
if((StringUtils.isBlank(username)
|| StringUtils.isBlank(mobile)
|| StringUtils.isBlank(liveArea)
|| StringUtils.isBlank(wantShopArea)
|| Objects.isNull(acceptAdjustType))){
return true;
}
return false;
}
@ApiModelProperty("线索来源")
private Integer lineSource;
}

34
coolstore-partner-model/src/main/java/com/cool/store/vo/RegionPathNameVO.java Normal file
View File

@@ -0,0 +1,34 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @author byd
* @ClassName RegionDO
* @Description 区域
*/
@ApiModel("区域全路径返回实体")
@Builder
@Data
@NoArgsConstructor
@AllArgsConstructor
public class RegionPathNameVO implements Serializable {
/**
* 区域全路径名称
*/
@ApiModelProperty("区域全路径名称")
private String allRegionName;
private List<String> regionNameList;
private static final long serialVersionUID = 1L;
}