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

Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
苏竹红
2024-04-08 19:28:21 +08:00
parent 3abec41269 313326a5a0
commit e2ce15f05d
22 changed files with 334 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,72 @@
package com.cool.store.entity;
import lombok.Data;
@Data
public class FranchiseeDO {
/**
* 开户行
*/
private String bank;
/**
* 开户行支行
*/
private String bankSub;
/**
* 生日
*/
private String birthday;
/**
* 城市代码
*/
private String cityCode;
/**
* 加盟商手机号码
*/
private String frMobile;
/**
* 加盟商姓名
*/
private String frName;
/**
* 个人身份证号/企业统一社会信用代码
*/
private String idCard;
/**
* 身份证地址/公司地址
*/
private String idCardAddress;
/**
* 身份证原件国徽面/食品经营许可证上传
*/
private String idCardBackUrl;
/**
* 身份证原件正面地址/营业执照拍照上传
*/
private String idCardFrontUrl;
/**
* 操作人工号
*/
private String operator;
/**
* 缴款时间
*/
private String payDateStr;
/**
* 省份代码
*/
private String provinceCode;
/**
* 收款账户
*/
private String retAccount;
/**
* 性别：0-女，1-男
*/
private Integer sex;
/**
* 签约类型：0-个人签约；1-企业签约
*/
private long signType;
}

4
coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java
View File

@@ -163,7 +163,9 @@ public class LineInfoDO {
* 是否删除：0.否 1.是
*/
private Boolean deleted;
/**
* 加盟商编码
*/
private String partnerNum;
}

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

@@ -27,7 +27,7 @@ public class LinePayDO implements Serializable {
@ApiModelProperty("line_info.id")
private Long lineId;
@ApiModelProperty("支付状态 0:待付款 1:已付款")
@ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
private Integer payStatus;
@ApiModelProperty("支付方式 1微信 2银行转账")

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

@@ -0,0 +1,54 @@
package com.cool.store.request;
import com.cool.store.entity.FranchiseeDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class FranchiseeSaveRequest {
private String partnerId;
private Long lineId;
@ApiModelProperty("加盟商姓名")
private String frName;
@ApiModelProperty("加盟商手机号码")
private String frMobile;
@ApiModelProperty("个人身份证号/企业统一社会信用代码")
private String idCard;
@ApiModelProperty("身份证地址/公司地址")
private String idCardAddress;
@ApiModelProperty("性别：0-女，1-男")
private Integer sex;
@ApiModelProperty("身份证原件正面地址/营业执照拍照上传")
private String idCardFrontUrl;
@ApiModelProperty("身份证原件国徽面/食品经营许可证上传")
private String idCardBackUrl;
@ApiModelProperty("0-个人签约；1-企业签约")
private Integer signType;
@ApiModelProperty("生日，企业不用传")
private String birthday;
public FranchiseeDO toFranchiseeDO() {
FranchiseeDO franchiseeDO = new FranchiseeDO();
franchiseeDO.setBirthday(this.birthday);
franchiseeDO.setFrMobile(this.frMobile);
franchiseeDO.setFrName(this.frName);
franchiseeDO.setIdCard(this.idCard);
franchiseeDO.setIdCardAddress(this.idCardAddress);
franchiseeDO.setIdCardBackUrl(this.idCardBackUrl);
franchiseeDO.setIdCardFrontUrl(this.idCardFrontUrl);
franchiseeDO.setSex(this.sex);
franchiseeDO.setSignType(this.signType);
return franchiseeDO;
}
}

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

@@ -19,7 +19,7 @@ public class LinePaySubmitRequest {
@NotNull(message = "线索id不能为空")
private Long lineId;
@ApiModelProperty("支付状态 0:待付款 1:已付款")
@ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
private Integer payStatus;
@ApiModelProperty("支付方式 1微信 2银行转账")

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

@@ -19,10 +19,19 @@ public class LinePayVO {
@ApiModelProperty("xfsg_user_info.partner_id")
private String partnerId;
@ApiModelProperty("加盟商姓名")
private String partnerName;
/**
* 手机号
*/
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("line_info.id")
private Long lineId;
@ApiModelProperty("支付状态 0:待付款 1:已付款")
@ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
private Byte payStatus;
@ApiModelProperty("支付方式 1微信 2银行转账")