Merge branch 'cc_20250513_franchise_report' into 'master'

Cc 20250513 franchise report

See merge request hangzhou/java/custom_zxjp!82
This commit is contained in:
苏竹红
2025-05-15 10:14:23 +00:00
37 changed files with 1083 additions and 105 deletions

View File

@@ -0,0 +1,19 @@
package com.cool.store.dto;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2025/05/13/15:59
* @Version 1.0
* @注释:
*/
@Data
public class FranchiseReportDTO {
private Long shopId;
private Long regionId;
private Integer storeType;
}

View File

@@ -57,6 +57,17 @@ public class BigRegionDO {
@Column(name = "update_time")
private Date updateTime;
//集团名称
@Column(name = "group_name")
private String groupName;
public String getGroupName() {
return groupName;
}
public void setGroupName(String groupName) {
this.groupName = groupName;
}
/**
* @return id
*/

View File

@@ -0,0 +1,33 @@
package com.cool.store.request;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* @Author: WangShuo
* @Date: 2025/05/13/15:27
* @Version 1.0
* @注释:
*/
@Data
public class FranchiseReportRequest {
@ApiModelProperty(value = "加盟集团")
private List<String> joinGroupName;
@ApiModelProperty(value = "加盟分部/片区")
private List<Long> regionIds;
@ApiModelProperty(value = "门店类型")
private List<Integer> storeTypes;
@ApiModelProperty(value = "建店完成开始 时间格式 2025-05-01 00:00:00")
private String buildStartTime;
@ApiModelProperty(value = "建店完成结束时间 时间格式 2025-05-01 23:59:59")
private String buildEndTime;
}

View File

@@ -0,0 +1,18 @@
package com.cool.store.request;
import lombok.Data;
import java.util.List;
/**
* @Author: WangShuo
* @Date: 2025/05/15/10:15
* @Version 1.0
* @注释:
*/
@Data
public class QueryBigRegionRequest{
private String keyword;
private List<String> groupNameList;
}

View File

@@ -0,0 +1,94 @@
package com.cool.store.response;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.cool.store.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* @Author: WangShuo
* @Date: 2025/05/13/15:30
* @Version 1.0
* @注释:
*/
@Data
public class FranchiseReportResponse {
@ApiModelProperty(value = "加盟集团")
@ExcelProperty(value = "加盟集团",order = 1)
@ColumnWidth(25)
private String joinGroupName;
@ApiModelProperty(value = "加盟分部/片区")
@ExcelProperty(value = "加盟分部/片区",order = 2)
@ColumnWidth(20)
private String regionName;
@ApiModelProperty(value = "门店数")
@ExcelProperty(value = "门店数",order = 3)
@ColumnWidth(15)
private Integer storeNum = 0;
@ApiModelProperty(value = "鸡排普通店")
@ExcelProperty(value = "鸡排普通店",order = 4)
@ColumnWidth(20)
private Integer normalStoreNum = 0;
@ApiModelProperty(value = "鸡排餐厅店")
@ExcelProperty(value = "鸡排餐厅店",order = 5)
@ColumnWidth(20)
private Integer restaurantStoreNum = 0;
@ApiModelProperty(value = "鸡排无展示门店")
@ExcelProperty(value = "鸡排无展示门店",order = 6)
@ColumnWidth(25)
private Integer noShowStoreNum = 0;
@ApiModelProperty(value = "加盟费")
@ExcelProperty(value = "加盟费",order = 7)
@ColumnWidth(20)
private BigDecimal franchiseFeeTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "品牌费")
@ExcelProperty(value = "品牌费",order = 8)
@ColumnWidth(20)
private BigDecimal firstYearBrandingFeeTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "管理费")
@ExcelProperty(value = "管理费",order = 9)
@ColumnWidth(20)
private BigDecimal firstYearManagementFeeTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "设计费")
@ExcelProperty(value = "设计费",order = 10)
@ColumnWidth(20)
private BigDecimal performanceBondTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "管理/品牌/设计费")
@ExcelProperty(value = "管理/品牌/设计费",order = 11)
@ColumnWidth(25)
private BigDecimal managementBrandingDesignFeeTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "保证金")
@ExcelProperty(value = "保证金",order = 12)
@ColumnWidth(20)
private BigDecimal loanMarginTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "昨日日期")
@ExcelProperty(value = "昨日日期",order = 13)
@ColumnWidth(15)
private String yesterdayDate;
@ApiModelProperty(value = "昨天门店数")
@ExcelProperty(value = "昨天门店数",order = 14)
@ColumnWidth(15)
private Integer yesterdayStoreNum = 0;
@ExcelIgnore
private Long regionId;
}