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

开业筹备阶段3.0

Browse Source
This commit is contained in:
shuo.wang
2024-04-26 02:26:15 +08:00
parent 1d274bfe55
commit 1eef5980e7
20 changed files with 115 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpeningOperationPlanDTO.java
View File

@@ -2,8 +2,6 @@ package com.cool.store.dto.openPreparation;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDate;
import java.util.Date;
/**
@@ -33,12 +31,10 @@ public class OpeningOperationPlanDTO {
@ApiModelProperty("审核结果,0待审核，1通过，2拒绝")
private Integer resultType;
@ApiModelProperty("起始日期")
public Date planStartDate;
@ApiModelProperty("结束日期")
public Date planEndDate;
@ApiModelProperty("更新时间")
private Date updateTime;
private Long auditId;

2
coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/UserInfoDTO.java → coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/UserNameDTO.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
*/
@Data
public class UserInfoDTO {
public class UserNameDTO {
private Long userId;

11
coolstore-partner-model/src/main/java/com/cool/store/entity/OpeningOperationPlanDO.java
View File

@@ -109,6 +109,9 @@ public class OpeningOperationPlanDO {
@Column(name = "result_type")
private Integer resultType;
public Integer getResultType() {
return resultType;
}
@@ -117,14 +120,6 @@ public class OpeningOperationPlanDO {
this.resultType = resultType;
}
/**
* @return id
*/

24
coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanAuditRequest.java
View File

@@ -1,6 +1,7 @@
package com.cool.store.request;
import com.cool.store.entity.ShopAuditInfoDO;
import com.cool.store.enums.AuditTypeEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,21 +16,9 @@ import java.util.Date;
@Data
public class OpeningOperationPlanAuditRequest {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("店铺id")
private Long shopId;
@ApiModelProperty("2-开业运营方案")
private Integer auditType;
@ApiModelProperty("提交人ID")
private String submittedUserId;
@ApiModelProperty("提交人名称")
private String submittedUserName;
@ApiModelProperty("结果类型 0通过,1拒绝")
private Integer resultType;
@@ -39,20 +28,15 @@ public class OpeningOperationPlanAuditRequest {
@ApiModelProperty("拒绝原因")
private String rejectReason;
@ApiModelProperty("是否删除：0.否 1.是")
private Boolean deleted;
public ShopAuditInfoDO toShopAuditInfoDO() {
ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO();
shopAuditInfoDO.setId(id);
shopAuditInfoDO.setShopId(shopId);
shopAuditInfoDO.setAuditType(auditType);
shopAuditInfoDO.setAuditType(AuditTypeEnum.OPENING_OPERATION_PLAN.getCode());
shopAuditInfoDO.setResultType(resultType);
if (resultType == 0 )
shopAuditInfoDO.setPassReason(passReason);
else
shopAuditInfoDO.setRejectReason(rejectReason);
shopAuditInfoDO.setDeleted(deleted);
shopAuditInfoDO.setSubmittedUserId(submittedUserId);
shopAuditInfoDO.setSubmittedUserName(submittedUserName);
shopAuditInfoDO.setCreateTime(new Date());
shopAuditInfoDO.setUpdateTime(new Date());
return shopAuditInfoDO;

10
coolstore-partner-model/src/main/java/com/cool/store/request/OpeningOperationPlanRequest.java
View File

@@ -13,8 +13,6 @@ import lombok.Data;
@Data
public class OpeningOperationPlanRequest {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("店铺id")
private Long shopId;
@@ -40,12 +38,6 @@ public class OpeningOperationPlanRequest {
@ApiModelProperty("是否完成排车路线")
private Byte routeCompleted;
@ApiModelProperty("是否删除：0.否 1.是")
private Boolean deleted;
@ApiModelProperty("审核结果,0待审核，1通过，2拒绝")
private Integer resultType;
public OpeningOperationPlanDO toOpeningOperationPlanDO() {
@@ -58,8 +50,6 @@ public class OpeningOperationPlanRequest {
openingOperationPlanDO.setActivityThemeUrl(activityThemeUrl);
openingOperationPlanDO.setPreparationUserIds(preparationUserIds);
openingOperationPlanDO.setRouteCompleted(routeCompleted);
openingOperationPlanDO.setDeleted(deleted);
openingOperationPlanDO.setResultType(resultType);
return openingOperationPlanDO;
}
}

5
coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java
View File

@@ -9,11 +9,14 @@ import java.util.Date;
* @Auther: WangShuo
* @Date: 2024/04/23/上午10:47
* @Version 1.0
* @注释:
* @注释: 运营方案审核
*/
@Data
public class OpeningOperationPlanListVO {
@ApiModelProperty("方案关联审核id")
private Long auditId;
@ApiModelProperty("门店id")
private Long shopId;

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

@@ -26,7 +26,7 @@ public class OpeningOperationPlanVO {
@ApiModelProperty("活动主题url")
private String activityThemeUrl;
@ApiModelProperty("筹备人员ids")
@ApiModelProperty("筹备人员name")
private String preparationUsers;
@ApiModelProperty("是否完成排车路线")