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-05-15 15:40:30 +08:00
parent 84cb1af364 56d02812ac
commit 8b68a7e856
23 changed files with 112 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ public class SignFranchiseDO {
@Column(name = "contract_start_time")
private Date contractStartTime;
@Column(name = "contract_end_time")
private Date contractStartEndTime;
private Date contractEndTime;
@Column(name = "impression_num")
private String impressionNum;
@Column(name = "business_start_hours")

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

@@ -175,6 +175,11 @@ public class SystemBuildingShopDO {
// regioGeneralId
systemBuildingShopDO.setRegioGeneralId(sysStoreAppRequest.getSupervisorDetail().getRegioGeneralId());
systemBuildingShopDO.setStoreName(sysStoreAppRequest.getStoreDetail().getStoreName());
systemBuildingShopDO.setBigName(sysStoreAppRequest.getStoreDetail().getBigName());
systemBuildingShopDO.setBigCode(sysStoreAppRequest.getStoreDetail().getBigCode());
systemBuildingShopDO.setFightName(sysStoreAppRequest.getStoreDetail().getFightName());
systemBuildingShopDO.setFightCode(sysStoreAppRequest.getStoreDetail().getFightCode());
systemBuildingShopDO.setSmallName(sysStoreAppRequest.getStoreDetail().getSmallName());
return systemBuildingShopDO;
}
}

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

@@ -65,7 +65,7 @@ public class AddSignFranchiseRequest {
signFranchiseDO.setIsBusinessLicense(this.isBusinessLicense);
signFranchiseDO.setIsFoodLicense(this.isFoodLicense);
signFranchiseDO.setContractStartTime(this.contractStartTime);
signFranchiseDO.setContractStartEndTime(this.contractStartEndTime);
signFranchiseDO.setContractEndTime(this.contractStartEndTime);
signFranchiseDO.setImpressionNum(this.impressionNum);
signFranchiseDO.setBusinessStartHours(this.businessStartHours);
signFranchiseDO.setBusinessEndHours(this.businessEndHours);

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

@@ -0,0 +1,15 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author byd
* @date 2024-04-24 16:40
*/
@Data
public class ShopIdRequest {
@ApiModelProperty("shopId")
private Long shopId;
}

12
coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentUserTrainingVO.java
View File

@@ -106,6 +106,18 @@ public class AssessmentUserTrainingVO {
@ApiModelProperty("所属区域")
private String regionNodeName;
/**
* 考核项数
*/
@ApiModelProperty("考核项数")
private Integer assessmentNum;
/**
* 考核总项数
*/
@ApiModelProperty("考核总项数")
private Integer assessmentTotalNum;
@ApiModelProperty("考核数据")