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-04-29 14:16:51 +08:00
parent 1928d44fee 3b888eef40
commit 8c9afa3017
47 changed files with 1415 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DecorationModelDTO.java Normal file
View File

@@ -0,0 +1,15 @@
package com.cool.store.dto.decoration;
import lombok.Data;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午9:33
* @Version 1.0
* @注释:
*/
@Data
public class DecorationModelDTO {
private String totalAmount;
private String payUrl;
}

16
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/DesignRowsDTO.java Normal file
View File

@@ -0,0 +1,16 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午8:41
* @Version 1.0
* @注释:
*/
@Data
public class DesignRowsDTO {
private List<ProjectDTO> rows;
}

17
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/RowsDTO.java Normal file
View File

@@ -0,0 +1,17 @@
package com.cool.store.dto.decoration;
import lombok.Data;
import java.util.List;
/**
* @Author suzhuhong
* @Date 2024/4/28 19:19
* @Version 1.0
*/
@Data
public class RowsDTO{
private List<DecorationDTO> rows;
}

159
coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/FranchiseeInfoDTO.java Normal file
View File

@@ -0,0 +1,159 @@
package com.cool.store.dto.ehr;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
* 加盟商信息查询
*/
@NoArgsConstructor
@Data
public class FranchiseeInfoDTO {
@ApiModelProperty("自增主键")
private int keyId;
@ApiModelProperty("加盟商编号")
private String frId;
@ApiModelProperty("加盟商姓名")
private String frName;
@ApiModelProperty("加盟商手机号码")
private String frMobile;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("身份证地址")
private String idCardAddress;
@ApiModelProperty("性别：0-女，1-男")
private int sex;
@ApiModelProperty("状态：0-蓄水池，1-查看，2-正式，3-解约")
private int stat;
@ApiModelProperty("缴款时间")
private String payDateStr;
@ApiModelProperty("生效日期")
private String eftDate;
@ApiModelProperty("结束日期")
private String endDateStr;
@ApiModelProperty("收款账户")
private String retAccount;
@ApiModelProperty("开户行")
private String bank;
@ApiModelProperty("开户行名称")
private String bankName;
@ApiModelProperty("开户行支行")
private String bankSub;
@ApiModelProperty("开户行支行名称")
private String bankSubName;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("省份代码")
private String provinceCode;
@ApiModelProperty("省份名称")
private String provinceName;
@ApiModelProperty("城市代码")
private String cityCode;
@ApiModelProperty("城市名称")
private String cityName;
@ApiModelProperty("生日")
private Date birthday;
@ApiModelProperty("微信号")
private String wechat;
@ApiModelProperty("投资方式")
private String investType;
@ApiModelProperty("其它业务/生意")
private String otherBusinesses;
@ApiModelProperty("合伙人")
private List<FranchiseePartnerDTO> partners;
@ApiModelProperty("资金来源")
private String capitalSource;
@ApiModelProperty("投资金额，单位：万")
private String capitalAmount;
@ApiModelProperty("水果行业从业经验")
private String experience;
@ApiModelProperty("是否有亲属在鲜丰工作")
private int workAtXf;
@ApiModelProperty("亲属工号（有亲属在鲜丰工作）")
private String jobNo;
@ApiModelProperty("行业类型")
private String industryType;
@ApiModelProperty("文化程度")
private String education;
@ApiModelProperty("紧急联系人姓名")
private String contactName;
@ApiModelProperty("紧急联系人电话")
private String contactPhone;
@ApiModelProperty("面试信息id")
private String interviewId;
@ApiModelProperty("面试视频地址")
private String videoUrl;
@ApiModelProperty("面试得分表地址")
private String tableUrl;
@ApiModelProperty("身份证原件正面地址")
private String idCardFrontUrl;
@ApiModelProperty("身份证原件背面地址")
private String idCardBackUrl;
@ApiModelProperty("面试状态")
private String state;
@ApiModelProperty("开户银行编码")
private String bankCode;
@ApiModelProperty("支行编码")
private String bankSubCode;
@ApiModelProperty("加盟费")
private int franchiseFee;
@ApiModelProperty("保证金")
private int deposit;
@ApiModelProperty("合同开始时间")
private Date contractStartDate;
@ApiModelProperty("合同结束时间")
private Date contractEndDate;
@ApiModelProperty("合同附件")
private String attachmentUrl;
@ApiModelProperty("签约类型：0-个人签约；1-企业签约")
private int signType;
@ApiModelProperty("法人")
private String legalPerson;
@ApiModelProperty("营业期限")
private String businessTerm;
@ApiModelProperty("OA流程编号")
private String processNum;
@ApiModelProperty("")
private int bind;
@ApiModelProperty("")
private int sign;
@ApiModelProperty("")
private int business;
@ApiModelProperty("门店信息")
private List<FranchiseeStoreInfoDTO> storeInfoVOS;
@Data
public static class FranchiseePartnerDTO{
@ApiModelProperty("合伙人姓名")
private String name;
@ApiModelProperty("合伙人电话")
private String phone;
}
@Data
public static class FranchiseeStoreInfoDTO{
@ApiModelProperty("门店代码")
private String storeCode;
@ApiModelProperty("门店名称")
private String storeName;
@ApiModelProperty("开店/关店")
private String status;
@ApiModelProperty("正常营业/关店")
private String businessStatus;
@ApiModelProperty("解约")
private String signingStatus;
@ApiModelProperty("解约原因")
private String unbindCause;
@ApiModelProperty("浙北大区/萧山战区/萧山一区域")
private String area;
@ApiModelProperty("加盟商姓名")
private String franchiseeName;
@ApiModelProperty("加盟商编码")
private String frId;
}
}

64
coolstore-partner-model/src/main/java/com/cool/store/dto/ehr/StaffBaseInfoDTO.java Normal file
View File

@@ -0,0 +1,64 @@
package com.cool.store.dto.ehr;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 员工详细信息数据接口
*/
@NoArgsConstructor
@Data
public class StaffBaseInfoDTO {
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("工号")
private String staffNumber;
@ApiModelProperty("身份证")
private String idCard;
@ApiModelProperty("部门code")
private String departmentCode;
@ApiModelProperty("部门名称")
private String departmentName;
@ApiModelProperty("岗位Id")
private String jobId;
@ApiModelProperty("岗位名称")
private String jobName;
@ApiModelProperty("员工状态：0离职、1转正、2试用、3实习、4待离职、5临时工、6暑假工、7兼职工")
private Integer status;
@ApiModelProperty("性别")
private String sex;
@ApiModelProperty("生日")
private String birthday;
@ApiModelProperty("身份证-人像面")
private String idNumPhoto;
@ApiModelProperty("身份证-国徽面")
private String emblemPhoto;
@ApiModelProperty("最高学历")
private String highestDegree;
@ApiModelProperty("手机号（OA侧绑定的手机号）")
private String phone;
@ApiModelProperty("入职日期")
private String entryDate;
@ApiModelProperty("年龄")
private String age;
@ApiModelProperty("健康证")
private String healthCertificate;
}

18
coolstore-partner-model/src/main/java/com/cool/store/entity/FranchiseFeeDO.java
View File

@@ -1,12 +1,18 @@
package com.cool.store.entity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
import java.util.Date;
@Data
@Table(name = "xfsg_franchise_fee")
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FranchiseFeeDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -24,21 +30,21 @@ public class FranchiseFeeDO {
@Column(name = "first_year_end_time")
private Date firstYearEndTime;
@Column(name = "first_year_fee")
private Date firstYearFee;
private String firstYearFee;
@Column(name = "second_year_start_time")
private Date secondYearStartTime;
@Column(name = "second_year_end_time")
private Date secondYearEndTime;
@Column(name = "second_year_fee")
private Date secondYearFee;
@Column(name = "third_year_first_time")
private Date thirdYearFirstTime;
private String secondYearFee;
@Column(name = "third_year_start_time")
private Date thirdYearStartTime;
@Column(name = "third_year_end_time")
private Date thirdYearEndTime;
@Column(name = "third_year_fee")
private Date thirdYearFee;
private String thirdYearFee;
@Column(name = "performance_bond")
private Date performanceBond;
private String performanceBond;
@Column(name = "create_time")
private Date createTime;
@Column(name = "update_time")

6
coolstore-partner-model/src/main/java/com/cool/store/entity/LicenseTransactDO.java
View File

@@ -1,12 +1,18 @@
package com.cool.store.entity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
import java.util.Date;
@Table(name = "xfsg_license_transact")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class LicenseTransactDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -0,0 +1,53 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
import java.util.Date;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table(name = "xfsg_sign_franchise")
public class SignFranchiseDO {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "xfsg_shop_info.id")
private Long shopId;
@Column(name = "sign_type")
private Integer signType;
@Column(name = "brand_fee")
private String brandFee;
@Column(name = "is_business_license")
private Integer isBusinessLicense;
@Column(name = "is_food_license")
private Integer isFoodLicense;
@Column(name = "contract_start_time")
private Date contractStartTime;
@Column(name = "contract_end_time")
private Date contractStartEndTime;
@Column(name = "impression_num")
private String impressionNum;
@Column(name = "business_start_hours")
private Date businessStartHours;
@Column(name = "business_end_hours")
private Date businessEndHours;
@Column(name = "irregular_reason")
private String irregularReason;
@Column(name = "remark")
private String remark;
@Column(name = "resign")
private Integer resign;
@Column(name = "mobile")
private String mobile;
@Column(name = "create_time")
private Date createTime;
@Column(name = "update_time")
private Date updateTime;
}

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

@@ -0,0 +1,79 @@
package com.cool.store.request;
import com.cool.store.entity.SignFranchiseDO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
@ApiModel("提交加盟合同签约请求体")
public class AddSignFranchiseRequest {
@ApiModelProperty("主键，更新时才存在")
private Long id;
private Long shopId;
/**
* SignTypeEnum
*/
@ApiModelProperty("签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化")
private Integer signType;
@ApiModelProperty("品牌使用费比例")
private String brandFee;
@ApiModelProperty("是否有营业执照 0-是 1-否")
private Integer isBusinessLicense;
@ApiModelProperty("是否有食营 0-是 1-否")
private Integer isFoodLicense;
@ApiModelProperty("合同开始日期")
private Date contractStartTime;
@ApiModelProperty("合同结束日期")
private Date contractStartEndTime;
@ApiModelProperty("用印次数")
private String impressionNum;
@ApiModelProperty("营业开始时间（日期不重要传分秒即可）")
private Date businessStartHours;
@ApiModelProperty("营业结束时间（日期不重要传分秒即可）")
private Date businessEndHours;
@ApiModelProperty("非常规营业时间原因")
private String irregularReason;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否补签")
private Integer resign;
@ApiModelProperty("加盟商联系方式")
private String mobile;
public SignFranchiseDO toSignFranchiseDO() {
SignFranchiseDO signFranchiseDO = new SignFranchiseDO();
signFranchiseDO.setId(this.id);
signFranchiseDO.setShopId(this.shopId);
signFranchiseDO.setSignType(this.signType);
signFranchiseDO.setBrandFee(this.brandFee);
signFranchiseDO.setIsBusinessLicense(this.isBusinessLicense);
signFranchiseDO.setIsFoodLicense(this.isFoodLicense);
signFranchiseDO.setContractStartTime(this.contractStartTime);
signFranchiseDO.setContractStartEndTime(this.contractStartEndTime);
signFranchiseDO.setImpressionNum(this.impressionNum);
signFranchiseDO.setBusinessStartHours(this.businessStartHours);
signFranchiseDO.setBusinessEndHours(this.businessEndHours);
signFranchiseDO.setIrregularReason(this.irregularReason);
signFranchiseDO.setRemark(this.remark);
signFranchiseDO.setResign(this.resign);
signFranchiseDO.setMobile(this.mobile);
return signFranchiseDO;
}
}

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

@@ -0,0 +1,16 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AuditFranchiseFeeRequest {
@ApiModelProperty("原因")
private String result;
@ApiModelProperty("0通过 1不通过")
private Integer status;
@ApiModelProperty("shopId")
private Long shopId;
}

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

@@ -0,0 +1,32 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Auther: WangShuo
* @Date: 2024/04/28/下午9:58
* @Version 1.0
* @注释:
*/
@Data
public class DecorationPayRequest {
@ApiModelProperty("line_info.id")
private Long lineId;
@ApiModelProperty("店铺编码")
private String shopCode;
@ApiModelProperty("加盟商姓名")
private String name;
@ApiModelProperty("支付账户")
private String payAccount;
@ApiModelProperty("开户行code")
private String bankCode;
@ApiModelProperty("支行code")
private String branchBankCode;
@ApiModelProperty("缴纳时间")
private Date payTime;
@ApiModelProperty("付款截图")
private String payPic;
}

94
coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseAgreementRequest.java
View File

@@ -1,10 +1,16 @@
package com.cool.store.request;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class FranchiseAgreementRequest {
/**
* 流程发起人工号
@@ -13,7 +19,7 @@ public class FranchiseAgreementRequest {
/**
* 公司主体0.鲜丰水果股份有限公司
*/
private long company;
private Integer company;
/**
* 第一年度结束时间
*/
@@ -37,7 +43,7 @@ public class FranchiseAgreementRequest {
/**
* 辅助字段0.个人签字　1.企业盖章
*/
private long fzzd1;
private Integer fzzd1;
/**
* 工程装修合同发起人工号，默认：20230724
*/
@@ -45,11 +51,11 @@ public class FranchiseAgreementRequest {
/**
* 货款保证金
*/
private long hkbzj;
private Integer hkbzj;
/**
* 货款保证金大写
*/
private long hkbzjdx;
private Integer hkbzjdx;
/**
* 货款保证金大写文本
*/
@@ -57,27 +63,27 @@ public class FranchiseAgreementRequest {
/**
* 合同开始日
*/
private long ht_day;
private Integer ht_day;
/**
* 合同结束日
*/
private long ht_day2;
private Integer ht_day2;
/**
* 合同开始月
*/
private long ht_month1;
private Integer ht_month1;
/**
* 合同结束月
*/
private long ht_month2;
private Integer ht_month2;
/**
* 合同开始年
*/
private long ht_year1;
private Integer ht_year1;
/**
* 合同结束年
*/
private long ht_year2;
private Integer ht_year2;
/**
* 身份证正面
*/
@@ -93,15 +99,15 @@ public class FranchiseAgreementRequest {
/**
* 是否有营业执照
*/
private long is_business_license;
private Integer is_business_license;
/**
* 是否补缴保证金0.是　1.否
*/
private long is_deposit;
private Integer is_deposit;
/**
* 是否有食品许可证0.是　2.否[二证合一]　3.否[三小一摊]　4.否[暂未办理]
*/
private long is_food_license;
private Integer is_food_license;
/**
* 缴款日期
*/
@@ -129,71 +135,71 @@ public class FranchiseAgreementRequest {
/**
* 每年加盟费
*/
private long jmf;
private Integer jmf;
/**
* 第一年度加盟费
*/
private long jmf2;
private Integer jmf2;
/**
* 第二年度加盟费
*/
private long jmf3;
private Integer jmf3;
/**
* 第三年度加盟费
*/
private long jmf4;
private Integer jmf4;
/**
* 第一年度开始日
*/
private long jmfday1;
private Integer jmfday1;
/**
* 第一年度结束日
*/
private long jmfday2;
private Integer jmfday2;
/**
* 第二年度开始日
*/
private long jmfday3;
private Integer jmfday3;
/**
* 第二年度结束日
*/
private long jmfday4;
private Integer jmfday4;
/**
* 第三年度开始日
*/
private long jmfday5;
private Integer jmfday5;
/**
* 第三年度结束日
*/
private long jmfday6;
private Integer jmfday6;
/**
* 加盟费
*/
private long jmfdx;
private Integer jmfdx;
/**
* 第一年度开始月
*/
private long jmfmonth1;
private Integer jmfmonth1;
/**
* 第一年度结束月
*/
private long jmfmonth2;
private Integer jmfmonth2;
/**
* 第二年度开始月
*/
private long jmfmonth3;
private Integer jmfmonth3;
/**
* 第二年度结束月
*/
private long jmfmonth4;
private Integer jmfmonth4;
/**
* 第三年度开始月
*/
private long jmfmonth5;
private Integer jmfmonth5;
/**
* 第三年度结束月
*/
private long jmfmonth6;
private Integer jmfmonth6;
/**
* 加盟费大写文本
*/
@@ -201,27 +207,27 @@ public class FranchiseAgreementRequest {
/**
* 第一年度开始年
*/
private long jmfyear1;
private Integer jmfyear1;
/**
* 第一年度结束年
*/
private long jmfyear2;
private Integer jmfyear2;
/**
* 第二年度开始年
*/
private long jmfyear3;
private Integer jmfyear3;
/**
* 第二年度结束年
*/
private long jmfyear4;
private Integer jmfyear4;
/**
* 第三年度开始年
*/
private long jmfyear5;
private Integer jmfyear5;
/**
* 第三年度结束年
*/
private long jmfyear6;
private Integer jmfyear6;
/**
* 加盟费/保证金打款截图，上传文件，是否补签=否时必填，是否补签=是时不传
*/
@@ -233,11 +239,11 @@ public class FranchiseAgreementRequest {
/**
* 加盟商合同状态0.生效　1.终止　2.转让　3.草稿，默认值：0
*/
private long jmshtzt;
private Integer jmshtzt;
/**
* 加盟商类型0.新加盟商开单店　1.老加盟商开单店　2.老加盟商开区域单店　3.新加盟商开区域单店
*/
private long jmslx;
private Integer jmslx;
/**
* 加盟商联系方式
*/
@@ -273,11 +279,11 @@ public class FranchiseAgreementRequest {
/**
* 履约保证金
*/
private long lvbzj;
private Integer lvbzj;
/**
* 履约保证金大写
*/
private long lybzjdx;
private Integer lybzjdx;
/**
* 履约保证金大写文本
*/
@@ -309,7 +315,7 @@ public class FranchiseAgreementRequest {
/**
* 类型0.个体工商户 1.有限责任公司 2.独资企业 3.自然人经营
*/
private long partyb_type;
private Integer partyb_type;
/**
* 品牌使用费比例，默认值：0.05
*/
@@ -329,7 +335,7 @@ public class FranchiseAgreementRequest {
/**
* 签约类型,0.转让　1.新签　2.续签　3.迁址　5.新签同异业转化
*/
private long qylx;
private Integer qylx;
/**
* 契约锁电子印章，默认值：2731707107593166911
*/
@@ -353,7 +359,7 @@ public class FranchiseAgreementRequest {
/**
* 是否补签0.是　1.否
*/
private long sfbq__add;
private Integer sfbq__add;
/**
* 营业开始时间
*/
@@ -401,7 +407,7 @@ public class FranchiseAgreementRequest {
/**
* 用印次数
*/
private long yycs;
private Integer yycs;
/**
* 营业执照办理授权书
*/

26
coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseFeeRequest.java
View File

@@ -12,48 +12,34 @@ import java.util.Date;
@ApiModel("加盟费/保证金实体")
public class FranchiseFeeRequest {
@Column(name = "shop_id")
@ApiModelProperty("shopId")
private Long shopId;
@Column(name = "pay_id")
@ApiModelProperty("payId")
private Long payId;
@Column(name = "year_franchise_fee")
@ApiModelProperty("每年加盟费")
private String yearFranchiseFee;
@Column(name = "loan_margin")
@ApiModelProperty("贷款保证金")
private String loanMargin;
@Column(name = "first_year_start_time")
@ApiModelProperty("第一年度开始时间")
private Date firstYearStartTime;
@ApiModelProperty("第一年度结束时间")
@Column(name = "first_year_end_time")
private Date firstYearEndTime;
@ApiModelProperty("第一年度加盟费")
@Column(name = "first_year_fee")
private Date firstYearFee;
private String firstYearFee;
@ApiModelProperty("第二年度开始时间")
@Column(name = "second_year_start_time")
private Date secondYearStartTime;
@ApiModelProperty("第二年度结束时间")
@Column(name = "second_year_end_time")
private Date secondYearEndTime;
@ApiModelProperty("第二年度加盟费")
@Column(name = "second_year_fee")
private Date secondYearFee;
private String secondYearFee;
@ApiModelProperty("第仨年度开始时间")
@Column(name = "third_year_first_time")
private Date thirdYearFirstTime;
private Date thirdYearStartTime;
@ApiModelProperty("第仨年度结束时间")
@Column(name = "third_year_end_time")
private Date thirdYearEndTime;
@ApiModelProperty("第仨年度加盟费")
@Column(name = "third_year_fee")
private Date thirdYearFee;
private String thirdYearFee;
@ApiModelProperty("履约保证金")
@Column(name = "performance_bond")
private Date performanceBond;
private String performanceBond;
public FranchiseFeeDO toFranchiseFeeDO() {
@@ -68,7 +54,7 @@ public class FranchiseFeeRequest {
franchiseFeeDO.setSecondYearStartTime(this.secondYearStartTime);
franchiseFeeDO.setSecondYearEndTime(this.secondYearEndTime);
franchiseFeeDO.setSecondYearFee(this.secondYearFee);
franchiseFeeDO.setThirdYearFirstTime(this.thirdYearFirstTime);
franchiseFeeDO.setThirdYearStartTime(this.thirdYearStartTime);
franchiseFeeDO.setThirdYearEndTime(this.thirdYearEndTime);
franchiseFeeDO.setThirdYearFee(this.thirdYearFee);
franchiseFeeDO.setPerformanceBond(this.performanceBond);

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

@@ -22,7 +22,7 @@ public class SubmitLicenseRequest {
@ApiModelProperty("营业执照名称")
private String licenseName;
@ApiModelProperty("营业执照类型 0:有限责任公司 1:工体工商")
@ApiModelProperty("营业执照类型 0.个体工商户 1.有限责任公司 2.独资企业 3.自然人经营")
private Integer licenseType;
@ApiModelProperty("营业执照上的法人")

50
coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java
View File

@@ -1,50 +1,50 @@
package com.cool.store.response;
import com.cool.store.entity.FranchiseFeeDO;
import com.cool.store.entity.LinePayDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.*;
import java.util.Date;
@Data
@Table(name = "xfsg_franchise_fee")
public class FranchiseFeeResponse {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@Column(name = "shop_id")
@ApiModelProperty("shopId")
private Long shopId;
@Column(name = "pay_id")
@ApiModelProperty("payId")
private Long payId;
@Column(name = "year_franchise_fee")
@ApiModelProperty("每年加盟费")
private String yearFranchiseFee;
@Column(name = "loan_margin")
@ApiModelProperty("贷款保证金")
private String loanMargin;
@Column(name = "first_year_start_time")
@ApiModelProperty("第一年度开始时间")
private Date firstYearStartTime;
@Column(name = "first_year_end_time")
@ApiModelProperty("第一年度结束时间")
private Date firstYearEndTime;
@Column(name = "first_year_fee")
private Date firstYearFee;
@Column(name = "second_year_start_time")
@ApiModelProperty("第一年度加盟费")
private String firstYearFee;
@ApiModelProperty("第二年度开始时间")
private Date secondYearStartTime;
@Column(name = "second_year_end_time")
@ApiModelProperty("第二年度结束时间")
private Date secondYearEndTime;
@Column(name = "second_year_fee")
private Date secondYearFee;
@Column(name = "third_year_first_time")
private Date thirdYearFirstTime;
@Column(name = "third_year_end_time")
@ApiModelProperty("第二年度加盟费")
private String secondYearFee;
@ApiModelProperty("第仨年度开始时间")
private Date thirdYearStartTime;
@ApiModelProperty("第仨年度结束时间")
private Date thirdYearEndTime;
@Column(name = "third_year_fee")
private Date thirdYearFee;
@Column(name = "performance_bond")
private Date performanceBond;
@Column(name = "create_time")
@ApiModelProperty("第仨年度加盟费")
private String thirdYearFee;
@ApiModelProperty("履约保证金")
private String performanceBond;
private Date createTime;
@Column(name = "update_time")
private Date updateTime;
private LinePayDO linePayDO;
public static FranchiseFeeResponse from(FranchiseFeeDO franchiseFeeDO) {
if (franchiseFeeDO == null) {
@@ -62,7 +62,7 @@ public class FranchiseFeeResponse {
franchiseFeeResponse.setSecondYearStartTime(franchiseFeeDO.getSecondYearStartTime());
franchiseFeeResponse.setSecondYearEndTime(franchiseFeeDO.getSecondYearEndTime());
franchiseFeeResponse.setSecondYearFee(franchiseFeeDO.getSecondYearFee());
franchiseFeeResponse.setThirdYearFirstTime(franchiseFeeDO.getThirdYearFirstTime());
franchiseFeeResponse.setThirdYearStartTime(franchiseFeeDO.getThirdYearStartTime());
franchiseFeeResponse.setThirdYearEndTime(franchiseFeeDO.getThirdYearEndTime());
franchiseFeeResponse.setThirdYearFee(franchiseFeeDO.getThirdYearFee());
franchiseFeeResponse.setPerformanceBond(franchiseFeeDO.getPerformanceBond());

13
coolstore-partner-model/src/main/java/com/cool/store/vo/DesignInfoVo.java
View File

@@ -1,5 +1,9 @@
package com.cool.store.vo;
import com.cool.store.dto.decoration.AttachmentsDTO;
import com.cool.store.dto.decoration.BudgetDTO;
import com.cool.store.dto.decoration.ConstructionScheduleDTO;
import com.cool.store.dto.decoration.DesignSchemeDTO;
import com.cool.store.vo.log.DesignLogVo;
import lombok.Data;
@@ -14,9 +18,8 @@ import java.util.List;
@Data
public class DesignInfoVo {
private String name;
private Integer resultType;
private String planTime;
private List<DesignLogVo> logs;
private List<DesignSchemeDTO> designScheme;
private ConstructionScheduleDTO measuringRoom;
private ConstructionScheduleDTO ConstructionDrawings;
private BudgetDTO proposedBookBudget;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/log/DesignLogVo.java
View File

@@ -16,7 +16,5 @@ public class DesignLogVo {
private String logTime;
private String name;
private String description;
private String planTime;
private String finishTime;
private List<String> attachmentUrl;
}