Merge #126 into master from cc_20260408_close_up
歇业管理逻辑修改
* cc_20260408_close_up: (31 commits squashed)
- fix:歇业管理（部分）
- fix:歇业管理（部分）
- fix:审批逻辑修改；拒绝审批实现
- fix:恢复开业申请及审批
- fix:主流程补充
- fix:主流程补充
- fix:字段补充及逻辑修改
- fix:字段补充
- fix
- fix:平台处理新增字段
- fix
- Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业营业发送短信
- fix:排序
- fix:详情接口新增加盟商手机号字段；申请单日期和已有申请单存在交集时申请失败
- fix:申请单详情接口新增品牌字段
- fix:新增列表筛选条件；审批单状态校验
- Merge branch 'master' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
- fix:歇业对接三方平台
- fix:歇业对接三方平台
- fix:日志
- fix:歇业后自动恢复营业;抖音自动歇业三方对接
- fix:歇业后自动恢复营业;抖音自动歇业三方对接
- fix:火码平台账号处理状态初始化为已处理
- Merge remote-tracking branch 'origin/cc_20260408_close_up' into cc_20260408_close_up
- fix:歇业管理逻辑修改
- Merge branch 'cc_20260511_close_up_modify' into cc_20260408_close_up
# Conflicts:
#	coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqGroupEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/RocketMqTagEnum.java
#	coolstore-partner-common/src/main/java/com/cool/store/enums/closeup/CloseUpPlatformEnum.java
#	coolstore-partner-dao/src/main/java/com/cool/store/dao/closeup/CloseUpPlatformDAO.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/StoreMapper.java
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/closeup/CloseUpPlatformMapper.java
#	coolstore-partner-dao/src/main/resources/mapper/StoreMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpApplyFormMapper.xml
#	coolstore-partner-dao/src/main/resources/mapper/closeup/CloseUpPlatformMapper.xml
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpApplyFormDO.java
#	coolstore-partner-model/src/main/java/com/cool/store/entity/closeup/CloseUpPlatformDO.java
#	coolstore-partner-service/src/main/java/com/cool/store/mq/consumer/ConsumerClient.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/CloseUpService.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
#	coolstore-partner-web/src/main/resources/application-ab.properties
#	coolstore-partner-web/src/main/resources/application-local.properties
#	coolstore-partner-web/src/main/resources/application-online.properties
#	coolstore-partner-web/src/main/resources/application-test.properties
- fix:合并冲突
- Merge branch 'master' into cc_20260408_close_up
- fix:火码歇业时机修改
- fix
Signed-off-by: 王非凡 <accounts_67eba0c5fee9c49c80c8e2b4@mail.teambition.com>
Merged-by: 正新 <accounts_6964c7bcd2a2c377c5bbd01b@mail.teambition.com>
CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/126
This commit is contained in:
王非凡
@@ -0,0 +1,30 @@
|
||||
package com.cool.store.dto.closeup;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 平台异步状态DTO
|
||||
* </p>
|
||||
*
|
||||
* @author wangff
|
||||
* @since 2026/4/27
|
||||
*/
|
||||
@Data
|
||||
public class PlatformAsyncStatusDTO {
|
||||
@ApiModelProperty("任务id")
|
||||
private Long taskId;
|
||||
|
||||
@ApiModelProperty("状态 1 - 待执行; 2 - 执行中; 50 - 执行成功; 60 - 执行失败")
|
||||
private String status;
|
||||
|
||||
@ApiModelProperty("结果消息")
|
||||
private String message;
|
||||
|
||||
@ApiModelProperty("门店编码")
|
||||
private String shopSn;
|
||||
|
||||
@ApiModelProperty("平台编号")
|
||||
private String platformCode;
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.cool.store.dto.closeup;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 平台营业状态修改DTO
|
||||
* </p>
|
||||
*
|
||||
* @author wangff
|
||||
* @since 2026/4/16
|
||||
*/
|
||||
@Data
|
||||
public class PlatformStatusDTO {
|
||||
@ApiModelProperty("门店编号")
|
||||
private String shopSn;
|
||||
|
||||
@ApiModelProperty("门店名称")
|
||||
private String shopName;
|
||||
|
||||
@ApiModelProperty("营业状态：1-营业，0-歇业")
|
||||
private Integer isOpen;
|
||||
|
||||
@ApiModelProperty("各平台更新结果列表")
|
||||
private List<PlatformUpdateResult> platformResults;
|
||||
|
||||
@Data
|
||||
public static class PlatformUpdateResult {
|
||||
@ApiModelProperty("平台编号")
|
||||
private String platformCode;
|
||||
|
||||
@ApiModelProperty("平台名称")
|
||||
private String platformName;
|
||||
|
||||
@ApiModelProperty("是否更新成功：true-成功，false-失败")
|
||||
private Boolean success;
|
||||
|
||||
@ApiModelProperty("结果消息")
|
||||
private String message;
|
||||
|
||||
@ApiModelProperty("任务ID（仅抖音平台异步操作时返回，用于查询任务状态）")
|
||||
private String taskId;
|
||||
}
|
||||
}
|
||||
@@ -109,4 +109,10 @@ public class CloseUpApplyFormDO {
|
||||
*/
|
||||
@Column(name = "updated_time")
|
||||
private Date updatedTime;
|
||||
|
||||
/**
|
||||
* 是否恢复营业，申请恢复营业通过或者到营业时间置1
|
||||
*/
|
||||
@Column(name = "is_open")
|
||||
private Integer isOpen;
|
||||
}
|
||||
@@ -75,4 +75,10 @@ public class CloseUpPlatformDO {
|
||||
*/
|
||||
@Column(name = "update_time")
|
||||
private Date updateTime;
|
||||
|
||||
/**
|
||||
* 任务id
|
||||
*/
|
||||
@Column(name = "task_id")
|
||||
private String taskId;
|
||||
}
|
||||
Reference in New Issue
Block a user