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

Merge #17 into master from cc_20251218_opening

Browse Source 
Merge branch 'master' into cc_20251218_opening

* cc_20251218_opening: (11 commits squashed)

  - fix:信发查询bug

  - fix:信发查询bug

  - fix:测试

  - fix:老店新开不需要开业验收

  - feat:开业验收数据处理

  - fix:开业验收bug修复

  - fix:开业验收bug修复

  - fix:云流水权限开通

  - feat:开业验收数据处理

  - feat:开业验收数据处理

  - Merge branch 'master' into cc_20251218_opening

Signed-off-by: 苏竹红 <570057076@qq.com>
Merged-by: 苏竹红 <570057076@qq.com>

CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/17
This commit is contained in:
苏竹红
2025-12-25 10:50:38 +00:00
parent 32ae1b7315
commit e97c147fac
31 changed files with 824 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
coolstore-partner-model/src/main/java/com/cool/store/entity/OpeningAcceptanceDO.java Normal file
View File

@@ -0,0 +1,85 @@
package com.cool.store.entity;
import lombok.Data;
import java.util.Date;
import javax.persistence.*;
@Table(name = "zxjp_opening_acceptance")
@Data
public class OpeningAcceptanceDO {
/**
* 主键ID
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
/**
* 门店ID
*/
@Column(name = "shop_id")
private Long shopId;
/**
* 创建时间
*/
@Column(name = "create_time")
private Date createTime;
/**
* 更新时间
*/
@Column(name = "update_time")
private Date updateTime;
/**
* 创建人ID
*/
@Column(name = "create_user")
private String createUser;
/**
* 更新人ID
*/
@Column(name = "update_user")
private String updateUser;
/**
* 门头照URL
*/
@Column(name = "storefront_photo")
private String storefrontPhoto;
/**
* 店内照URL
*/
@Column(name = "interior_photo")
private String interiorPhoto;
/**
* 监控照URL
*/
@Column(name = "monitor_photo")
private String monitorPhoto;
/**
* 收银机照URL
*/
@Column(name = "cash_register_photo")
private String cashRegisterPhoto;
/**
* 信发屏照URL
*/
@Column(name = "info_screen_photo")
private String infoScreenPhoto;
/**
* 验收状态
*/
@Column(name = "status")
private Integer status;
}

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

@@ -11,7 +11,7 @@ import lombok.Data;
@Data
public class AuditApproveRequest {
@ApiModelProperty("审核结果 1：成功 0：失败")
@ApiModelProperty("审核结果 1：通过 0：驳回")
private Integer auditResult;
@ApiModelProperty("通过/失败原因")

64
coolstore-partner-model/src/main/java/com/cool/store/request/opening/OpeningAcceptanceRequest.java Normal file
View File

@@ -0,0 +1,64 @@
package com.cool.store.request.opening;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Auther zx_szh
* @Date 2025/12/22 10:04
* @Version 1.0
*/
@Data
public class OpeningAcceptanceRequest {
@ApiModelProperty( "ID")
private Long id;
/**
* 门店ID
*/
@ApiModelProperty( "门店ID")
@NotNull(message = "门店ID不能为空")
private Long shopId;
/**
* 门头照URL
*/
@ApiModelProperty( "门头照URL 多张用逗号隔开")
@NotBlank(message = "门头照URL不能为空")
private String storefrontPhoto;
/**
* 店内照URL
*/
@ApiModelProperty( "店内照URL 多张用逗号隔开")
@NotBlank(message = "店内照URL不能为空")
private String interiorPhoto;
/**
* 监控照URL
*/
@ApiModelProperty( "监控照URL 多张用逗号隔开")
@NotBlank(message = "监控照URL不能为空")
private String monitorPhoto;
/**
* 收银机照URL
*/
@ApiModelProperty( "收银机照URL 多张用逗号隔开")
@NotBlank(message = "收银机照URL不能为空")
private String cashRegisterPhoto;
/**
* 信发屏照URL
*/
@ApiModelProperty( "信发屏照URL 多张用逗号隔开")
@NotBlank(message = "信发屏照URL不能为空")
private String infoScreenPhoto;
}

68
coolstore-partner-model/src/main/java/com/cool/store/vo/opening/OpeningAcceptanceDetailVO.java Normal file
View File

@@ -0,0 +1,68 @@
package com.cool.store.vo.opening;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Auther zx_szh
* @Date 2025/12/22 11:19
* @Version 1.0
*/
@Data
public class OpeningAcceptanceDetailVO {
private Long id;
/**
* 门店ID
*/
@ApiModelProperty( "门店ID")
@NotNull(message = "门店ID不能为空")
private Long shopId;
/**
* 门头照URL
*/
@ApiModelProperty( "门头照URL 多张用逗号隔开")
@NotBlank(message = "门头照URL不能为空")
private String storefrontPhoto;
/**
* 店内照URL
*/
@ApiModelProperty( "店内照URL 多张用逗号隔开")
@NotBlank(message = "店内照URL不能为空")
private String interiorPhoto;
/**
* 监控照URL
*/
@ApiModelProperty( "监控照URL 多张用逗号隔开")
@NotBlank(message = "监控照URL不能为空")
private String monitorPhoto;
/**
* 收银机照URL
*/
@ApiModelProperty( "收银机照URL 多张用逗号隔开")
@NotBlank(message = "收银机照URL不能为空")
private String cashRegisterPhoto;
/**
* 信发屏照URL
*/
@ApiModelProperty( "信发屏照URL 多张用逗号隔开")
@NotBlank(message = "信发屏照URL不能为空")
private String infoScreenPhoto;
@ApiModelProperty("验收状态")
private Integer status;
}