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

建店阶段审批流

Browse Source
This commit is contained in:
shuo.wang
2025-04-17 16:36:42 +08:00
parent b301d5375c
commit 80500fd6a6
23 changed files with 363 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java
View File

@@ -26,6 +26,10 @@ public class ExportBranchShopDTO {
@ColumnWidth(30)
private String shopName;
@ExcelProperty(value = "加盟签约店铺地址",order = 4)
@ColumnWidth(40)
private String shopAddress;
@ExcelProperty(value = "门店编号",order = 4)
@ColumnWidth(30)
private String shopCode;
@@ -77,9 +81,11 @@ public class ExportBranchShopDTO {
@ExcelProperty(value = "缴纳加盟费/保证金",order =15)
@ColumnWidth(30)
private String franchiseFeeStageStatus;
@ExcelProperty(value = "加盟合同签约",order =16)
@ColumnWidth(30)
private String signFranchiseStageStatus ;
@ExcelProperty(value = "签约时间",order =17)
@ColumnWidth(30)
private String signTime ;
@@ -100,91 +106,95 @@ public class ExportBranchShopDTO {
@ColumnWidth(30)
private String totalAmountContributions;
@ExcelProperty(value = "加盟费（取自账单）",order = 20)
@ExcelProperty(value = "加盟费优惠原因",order = 20)
@ColumnWidth(40)
private String discountReason;
@ExcelProperty(value = "加盟费（取自账单）",order = 21)
@ColumnWidth(30)
private String franchiseFeeBill;
@ExcelProperty(value = "加盟费(含税金额)",order = 21)
@ExcelProperty(value = "加盟费(含税金额)",order = 22)
@ColumnWidth(30)
private String franchiseFeeTax;
@ExcelProperty(value = "加盟费(不含税金额)",order = 22)
@ExcelProperty(value = "加盟费(不含税金额)",order = 23)
@ColumnWidth(30)
private String franchiseFee;
@ExcelProperty(value = "保证金（取自账单）",order = 23)
@ExcelProperty(value = "保证金（取自账单）",order = 24)
@ColumnWidth(30)
private String loanMargin;
@ExcelProperty(value = "第一年度管理费（取自账单）",order = 24)
@ExcelProperty(value = "第一年度管理费（取自账单）",order = 25)
@ColumnWidth(30)
private String firstYearManagementFeeBill;
@ExcelProperty(value = "第一年度管理费(含税金额)",order = 25)
@ExcelProperty(value = "第一年度管理费(含税金额)",order = 26)
@ColumnWidth(30)
private String firstYearManagementFeeTax;
@ExcelProperty(value = "第一年度管理费(不含税金额)",order = 26)
@ExcelProperty(value = "第一年度管理费(不含税金额)",order = 27)
@ColumnWidth(30)
private String firstYearManagementFee;
@ExcelProperty(value = "第一年度品牌费（取自账单）",order = 27)
@ExcelProperty(value = "第一年度品牌费（取自账单）",order = 28)
@ColumnWidth(30)
private String firstYearBrandingFeeBill;
@ExcelProperty(value = "第一年度品牌费(含税金额)",order = 28)
@ExcelProperty(value = "第一年度品牌费(含税金额)",order = 29)
@ColumnWidth(30)
private String firstYearBrandingFeeTax;
@ExcelProperty(value = "第一年度品牌费(不含税金额)",order = 29)
@ExcelProperty(value = "第一年度品牌费(不含税金额)",order = 30)
@ColumnWidth(30)
private String firstYearBrandingFee;
@ExcelProperty(value = "设计费（取自账单)",order = 30)
@ExcelProperty(value = "设计费（取自账单)",order = 31)
@ColumnWidth(30)
private String performanceBondBill;
@ExcelProperty(value = "设计费(含税金额)",order = 31)
@ExcelProperty(value = "设计费(含税金额)",order = 32)
@ColumnWidth(30)
private String designFeeTax;
@ExcelProperty(value = "设计费(不含税金额)",order = 32)
@ExcelProperty(value = "设计费(不含税金额)",order = 33)
@ColumnWidth(30)
private String designFee;
@ExcelProperty(value = "缴款人",order = 33)
@ExcelProperty(value = "缴款人",order = 34)
@ColumnWidth(30)
private String payUserName;
@ExcelProperty(value = "第1次缴纳时间",order = 33)
@ExcelProperty(value = "第1次缴纳时间",order = 35)
@ColumnWidth(30)
private String firstPayTime;
@ExcelProperty(value = "第2次缴纳时间",order = 34)
@ExcelProperty(value = "第2次缴纳时间",order = 36)
@ColumnWidth(30)
private String secondPayTime;
@ExcelProperty(value = "第3次缴纳时间",order = 35)
@ExcelProperty(value = "第3次缴纳时间",order = 37)
@ColumnWidth(30)
private String thirdPayTime;
@ExcelProperty(value = "第4次缴纳时间",order = 36)
@ExcelProperty(value = "第4次缴纳时间",order = 38)
@ColumnWidth(30)
private String fourthPayTime;
@ExcelProperty(value = "当前进度",order = 37)
@ExcelProperty(value = "当前进度",order = 39)
@ColumnWidth(30)
private String currentProgress;
@ExcelProperty(value = "状态",order = 38)
@ExcelProperty(value = "状态",order = 40)
@ColumnWidth(30)
private String shopStatus;
@ExcelProperty(value = "计划开店时间",order = 39)
@ExcelProperty(value = "计划开店时间",order = 41)
@ColumnWidth(30)
private String planOpenTime;
@ExcelProperty(value = "开店时长(天)",order =40)
@ExcelProperty(value = "开店时长(天)",order =42)
@ColumnWidth(30)
private String openDuration;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
View File

@@ -15,6 +15,8 @@ import java.util.List;
*/
@Data
public class FranchiseFeeDTO {
private String discountReason;
private Long shopId;
//缴费时间
private Date payTime;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/Preparation/PreparationDTO.java
View File

@@ -13,6 +13,8 @@ import java.util.Date;
@Data
public class PreparationDTO {
private String shopAddress;
private Long id;
private Long wantShopAreaId;

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

@@ -1,5 +1,6 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -54,4 +55,8 @@ public class FranchiseFeeDO {
@Column(name = "update_time")
private Date updateTime;
@ApiModelProperty("加盟费优惠原因")
@Column(name = "discount_reason")
private String discountReason;
}

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

@@ -0,0 +1,53 @@
package com.cool.store.request;
import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.enums.AuditResultTypeEnum;
import com.cool.store.enums.AuditTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Author: WangShuo
* @Date: 2025/04/17/13:36
* @Version 1.0
* @注释:
*/
@Data
public class AuditRequest {
@NotNull
private Long shopId;
@ApiModelProperty(value = "当前阶段状态")
@NotNull(message = "当前阶段状态不能为空")
private Integer shopSubStageStatus;
@ApiModelProperty(value = "审核结果,0通过，1拒绝")
@NotNull(message = "审核结果不能为空")
private Integer resultType;
@ApiModelProperty(value = "审核原因")
private String reason;
@ApiModelProperty(value = "操作人id", hidden = true)
private String operateUserId;
@ApiModelProperty(value = "操作人姓名", hidden = true)
private String operateUserName;
public static ShopAuditInfoDO convert(AuditRequest request, AuditTypeEnum auditType) {
ShopAuditInfoDO result = new ShopAuditInfoDO();
result.setShopId(request.getShopId());
result.setAuditType(auditType.getCode());
result.setSubmittedUserId(request.getOperateUserId());
result.setSubmittedUserName(request.getOperateUserName());
result.setResultType(request.getResultType());
if (AuditResultTypeEnum.PASS.getCode().equals(request.getResultType())) {
result.setPassReason(request.getReason());
} else {
result.setRejectReason(request.getReason());
}
return result;
}
}

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

@@ -41,6 +41,8 @@ public class FranchiseFeeRequest {
private String thirdYearFee;
@ApiModelProperty("履约保证金")
private String performanceBond;
@ApiModelProperty("加盟费优惠原因")
private String discountReason;
public FranchiseFeeDO toFranchiseFeeDO() {
@@ -60,6 +62,7 @@ public class FranchiseFeeRequest {
franchiseFeeDO.setThirdYearEndTime(this.thirdYearEndTime);
franchiseFeeDO.setThirdYearFee(this.thirdYearFee);
franchiseFeeDO.setPerformanceBond(this.performanceBond);
franchiseFeeDO.setDiscountReason(this.discountReason);
return franchiseFeeDO;
}
}

2
coolstore-partner-model/src/main/java/com/cool/store/response/AuditInfoResponse.java
View File

@@ -35,6 +35,8 @@ public class AuditInfoResponse {
private String annex;
@ApiModelProperty("实际操作人id")
private String actualUserId;
@ApiModelProperty("阶段状态")
private Integer shopSubStageStatus;
@Data
@Builder
@NoArgsConstructor

3
coolstore-partner-model/src/main/java/com/cool/store/response/BranchShopResponse.java
View File

@@ -1,5 +1,7 @@
package com.cool.store.response;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,6 +25,7 @@ public class BranchShopResponse {
private String mobile;
@ApiModelProperty("门店名称")
private String shopName;
private String shopAddress;
@ApiModelProperty("门店编号")
private String shopCode;
@ApiModelProperty("所属大区")

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

@@ -43,6 +43,8 @@ public class FranchiseFeeResponse {
private String performanceBond;
private Date createTime;
private Date updateTime;
@ApiModelProperty("加盟费优惠原因")
private String discountReason;
private LinePay linePayDO;
@@ -177,6 +179,7 @@ public class FranchiseFeeResponse {
franchiseFeeResponse.setCreateTime(franchiseFeeDO.getCreateTime());
franchiseFeeResponse.setUpdateTime(franchiseFeeDO.getUpdateTime());
franchiseFeeResponse.setFirstYearManageFee(franchiseFeeDO.getFirstYearManageFee());
franchiseFeeResponse.setDiscountReason(franchiseFeeDO.getDiscountReason());
return franchiseFeeResponse;
}
}