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

Merge branch 'master' into cc_20250515_handle

Browse Source
This commit is contained in:
苏竹红
2025-05-16 15:19:20 +08:00
parent eb9c69f82e d857501b36
commit 683167687c
46 changed files with 1144 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseReportDTO.java Normal file
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;
}

11
coolstore-partner-model/src/main/java/com/cool/store/entity/BigRegionDO.java
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
*/

33
coolstore-partner-model/src/main/java/com/cool/store/request/FranchiseReportRequest.java Normal file
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;
}

8
coolstore-partner-model/src/main/java/com/cool/store/request/OrderSysInfoRequest.java
View File

@@ -1,7 +1,9 @@
package com.cool.store.request;
import com.cool.store.entity.OrderSysInfoDO;
import com.cool.store.enums.JoinModeEnum;
import com.cool.store.enums.OrderSysTypeEnum;
import com.cool.store.enums.SignTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
@@ -115,13 +117,17 @@ public class OrderSysInfoRequest {
return orderSysInfoDO;
}
public Boolean check(){
public Boolean check(Integer joinMode){
if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_1.getType())){
if (StringUtils.isAnyBlank(this.xgjRegionId,this.xgjVicePresident,this.declareGoodsDate,this.declareGoodsLogisticsWarehouse,this.declareGoodsType)){
return false;
}
}
if (Objects.equals(this.type, OrderSysTypeEnum.ORDER_SYS_TYPE_2.getType())){
//自由店只需要门店编码
if (Objects.equals(joinMode, JoinModeEnum.OWN_STORE.getCode())&&this.shopCode!=null){
return true;
}
if (StringUtils.isAnyBlank(this.receivingFirmName,this.receivingMsBankAccount,this.receivingMsBankBranch,this.bankUnionPayAccount,this.shopCode)){
return false;
}

18
coolstore-partner-model/src/main/java/com/cool/store/request/QueryBigRegionRequest.java Normal file
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;
}

94
coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java Normal file
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;
}

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

@@ -49,5 +49,7 @@ public class PreparationCommonPendingVO {
private Integer joinMode;
private Long regionId;
private Date updateTime;
@ApiModelProperty("签约类型")
private Integer signType;
}