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

平台建店 fix

Browse Source
This commit is contained in:
shuo.wang
2024-10-11 19:44:49 +08:00
parent 5fcda285b2
commit fad9b980f4
16 changed files with 425 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,15 @@
package com.cool.store.dto;
import lombok.Data;
/**
* @Author: WangShuo
* @Date: 2024/10/11/下午7:09
* @Version 1.0
* @注释:
*/
@Data
public class DeskStageDTO {
private Integer shopSubStageStatus;
private String actualCompleteTime;
}

14
coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java
View File

@@ -33,7 +33,7 @@ public class PlatformBuildDO {
private Long auditId;
/**
* 1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖，6-（营帐通）
* 1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖
*/
@Column(name = "type")
private Integer type;
@@ -81,18 +81,6 @@ public class PlatformBuildDO {
@Column(name = "settler_bank_name")
private String settlerBankName;
/**
* 商户关系证明图片（营帐通非法人结算需要）
*/
@Column(name = "relationship_proof_url")
private String relationshipProofUrl;
/**
* 开户许可证（图片）（营帐通公司结算需要）
*/
@Column(name = "account_opening_permit_url")
private String accountOpeningPermitUrl;
/**
* 平台账号（快手）
*/

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

@@ -20,7 +20,7 @@ public class PlatformBuildAuditRequest {
@NotNull
private Long shopId;
@ApiModelProperty(value = "'1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖，6-（营帐通）',")
@ApiModelProperty(value = "'1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖")
private Integer type;
@ApiModelProperty("审核结果,0通过，1拒绝")

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

@@ -22,7 +22,7 @@ public class PlatformBuildRequest {
private Long shopId;
@NotNull
@ApiModelProperty(value = "'1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖，6-（营帐通）',")
@ApiModelProperty(value = "'1-抖音，2-快手，3-美团团购，4-饿了么，5-美团外卖',")
private Integer type;
@NotBlank

3
coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java
View File

@@ -45,6 +45,9 @@ public class RentInfoToDoVO {
@ApiModelProperty("提交时间")
private Date submitTime;
@ApiModelProperty("阶段")
private Integer shopSubStageStatus;
public static List<RentInfoToDoVO> convert(List<RentInfoToDoVO> list, Map<Long, ShopInfoDO> shopPointMap, Map<Long, PointInfoDO> pointMap, Map<Long, String> regionNameMap, Map<Long, Date> rentContractSubmitTimeMap){
if(CollectionUtils.isEmpty(list)){
return Lists.newArrayList();