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

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

Browse Source
This commit is contained in:
zhangchenbiao
2024-03-27 11:13:53 +08:00
parent 3bd0091e7d 7be6eeae78
commit 1bb98a0f64
23 changed files with 452 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java
View File

@@ -30,23 +30,6 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("申请人姓名")
private String username;
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@ApiModelProperty("邀请码")
private String inviteCode;
@ApiModelProperty("是否填写加盟需知")
private Integer isWritePartnerKnow;
@ApiModelProperty("创建时间")
private Date createTime;
@@ -54,28 +37,9 @@ public class HyPartnerUserInfoDO implements Serializable {
@ApiModelProperty("更新时间")
private Date updateTime;
@ApiModelProperty("店铺编码")
private String shopCode;
@ApiModelProperty("店铺名称")
private String shopName;
@ApiModelProperty("店铺ID")
private String shopId;
@ApiModelProperty("推荐加盟商id")
private String recommendPartnerId;
@ApiModelProperty("推荐加盟商姓名")
private String recommendPartnerName;
@ApiModelProperty("推荐加盟商手机号")
private String recommendPartnerMobile;
@ApiModelProperty("hy_partner_user_channel.channel_id")
private Integer userChannelId;
@ApiModelProperty("ec意向区域")
private String ecWantShopArea;

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

@@ -0,0 +1,34 @@
package com.cool.store.entity;
import lombok.Data;
import java.util.Date;
@Data
public class LeaseBaseInfoDO {
private Long id;
private String partnerId;
private Long lineId;
private String storeName;
private String storeId;
private Date experienceStartTime;
private Date experienceEndTime;
private Integer experienceStatus;
private String abandonCause;
private Date createTime;
private Date updateTime;
private Integer deleted;
}

3
coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
View File

@@ -10,8 +10,9 @@ import javax.validation.constraints.NotBlank;
@ApiModel("加盟意向Request")
public class JoinIntentionRequest {
private Long id;
@ApiModelProperty("线索信息表-线索id")
@NotBlank(message = "线索id不能为空")
private Long lineId;
@ApiModelProperty("用户信息表partnerId")

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

@@ -0,0 +1,37 @@
package com.cool.store.request;
import com.cool.store.entity.LeaseBaseInfoDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Date;
@Data
public class TrainingExperienceDistributionRequest {
@ApiModelProperty("线索信息表-线索id")
private Long lineId;
@ApiModelProperty("用户信息表partnerId")
private String partnerId;
@ApiModelProperty("体验门店id")
private String storeId;
@ApiModelProperty("门店名")
private String storeName;
@ApiModelProperty("开始体验时间")
private Date experienceStartTime;
@ApiModelProperty("结束体验时间")
private Date experienceEndTime;
public LeaseBaseInfoDO toLeaseBaseInfoDO() {
LeaseBaseInfoDO leaseBaseInfoDO = new LeaseBaseInfoDO();
leaseBaseInfoDO.setLineId(this.lineId);
leaseBaseInfoDO.setStoreName(this.storeName);
leaseBaseInfoDO.setStoreId(this.storeId);
leaseBaseInfoDO.setExperienceStartTime(this.experienceStartTime);
leaseBaseInfoDO.setExperienceEndTime(this.experienceEndTime);
leaseBaseInfoDO.setPartnerId(this.partnerId);
return leaseBaseInfoDO;
}
}

71
coolstore-partner-model/src/main/java/com/cool/store/response/SigningBaseInfoResponse.java Normal file
View File

@@ -0,0 +1,71 @@
package com.cool.store.response;
import com.cool.store.entity.SigningBaseInfoDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class SigningBaseInfoResponse {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("加盟商id")
private String partnerId;
@ApiModelProperty("线索id")
private Long lineId;
@ApiModelProperty("签名")
private String signName;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("性别 1男 2女")
private Integer sex;
@ApiModelProperty("身份证正面url")
private String idCardFront;
@ApiModelProperty("身份证反面url")
private String idCardReverse;
@ApiModelProperty("身份证号")
private String idCardNo;
@ApiModelProperty("身份证地址")
private String idCardAddress;
@ApiModelProperty("当前地址")
private String currentResidence;
@ApiModelProperty("地址详情")
private String addressDetail;
@ApiModelProperty("证照url")
private String businessLicense;
@ApiModelProperty("证照码")
private String businessLicenseCode;
@ApiModelProperty("证照地址")
private String businessLicenseAddress;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
public static SigningBaseInfoResponse from(SigningBaseInfoDO signingBaseInfoDO) {
if (signingBaseInfoDO == null) {
return null;
}
SigningBaseInfoResponse signingBaseInfoResponse = new SigningBaseInfoResponse();
signingBaseInfoResponse.setId(signingBaseInfoDO.getId());
signingBaseInfoResponse.setPartnerId(signingBaseInfoDO.getPartnerId());
signingBaseInfoResponse.setLineId(signingBaseInfoDO.getLineId());
signingBaseInfoResponse.setSignName(signingBaseInfoDO.getSignName());
signingBaseInfoResponse.setMobile(signingBaseInfoDO.getMobile());
signingBaseInfoResponse.setSex(signingBaseInfoDO.getSex());
signingBaseInfoResponse.setIdCardFront(signingBaseInfoDO.getIdCardFront());
signingBaseInfoResponse.setIdCardReverse(signingBaseInfoDO.getIdCardReverse());
signingBaseInfoResponse.setIdCardNo(signingBaseInfoDO.getIdCardNo());
signingBaseInfoResponse.setIdCardAddress(signingBaseInfoDO.getIdCardAddress());
signingBaseInfoResponse.setCurrentResidence(signingBaseInfoDO.getCurrentResidence());
signingBaseInfoResponse.setAddressDetail(signingBaseInfoDO.getAddressDetail());
signingBaseInfoResponse.setBusinessLicense(signingBaseInfoDO.getBusinessLicense());
signingBaseInfoResponse.setBusinessLicenseCode(signingBaseInfoDO.getBusinessLicenseCode());
signingBaseInfoResponse.setBusinessLicenseAddress(signingBaseInfoDO.getBusinessLicenseAddress());
signingBaseInfoResponse.setCreateTime(signingBaseInfoDO.getCreateTime());
signingBaseInfoResponse.setUpdateTime(signingBaseInfoDO.getUpdateTime());
return signingBaseInfoResponse;
}
}