Merge #149 into master from cc_20260408_close_up_v2
fix:歇业管理优化
* cc_20260408_close_up_v2: (37 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
- fix:平台关闭开启处理自动发起三方调用
- Merge branch 'master' into cc_20260408_close_up_v2
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/closeup/impl/CloseUpServiceImpl.java
#	coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
- fix:平台关闭开启时调用三方平台接口
- fix:修复自动关闭三方平台状态更新失败的问题
- Merge branch 'refs/heads/master' into cc_20260408_close_up_v2
- fix:修复三方门店歇业失败时POS待办不更新的问题
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/149
This commit is contained in:
王非凡
@@ -9,6 +9,7 @@ import com.cool.store.response.ResponseResult;
|
||||
import com.cool.store.service.closeup.CloseUpService;
|
||||
import com.cool.store.vo.closeup.CloseUpApplyFormSimpleVO;
|
||||
import com.cool.store.vo.closeup.CloseUpApplyFormVO;
|
||||
import com.cool.store.vo.closeup.CloseUpPlatformStatusVO;
|
||||
import com.cool.store.vo.closeup.CloseUpPlatformVO;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import io.swagger.annotations.Api;
|
||||
@@ -85,7 +86,7 @@ public class CloseUpController {
|
||||
|
||||
@ApiOperation("平台关闭开启处理")
|
||||
@PostMapping("/handlePlatform")
|
||||
public ResponseResult<Boolean> handlePlatform(@RequestBody @Validated CloseUpPlatformHandleRequest request) {
|
||||
public ResponseResult<CloseUpPlatformStatusVO> handlePlatform(@RequestBody @Validated CloseUpPlatformHandleRequest request) {
|
||||
return ResponseResult.success(closeUpService.handlePlatform(request));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -181,6 +181,11 @@ public class PCTestController {
|
||||
return ResponseResult.success(true);
|
||||
}
|
||||
|
||||
@PostMapping("/storeStatusAndPlatformUpdate")
|
||||
public void storeStatusAndPlatformUpdate(Long applyId) {
|
||||
closeUpService.storeStatusAndPlatformUpdate(applyId);
|
||||
}
|
||||
|
||||
@PostMapping("/closeUpAutoOpen")
|
||||
public void closeUpAutoOpen(Long applyId) {
|
||||
closeUpService.closeUpAutoOpen(applyId);
|
||||
@@ -194,7 +199,7 @@ public class PCTestController {
|
||||
@PostMapping("/autoPlatform")
|
||||
public void autoPlatform(Long applyId) {
|
||||
CloseUpApplyFormDO formDO = closeUpApplyFormDAO.getById(applyId);
|
||||
List<CloseUpPlatformDO> platformList = closeUpPlatformDAO.getList(applyId, 0, 1, null);
|
||||
List<CloseUpPlatformDO> platformList = closeUpPlatformDAO.getList(applyId, 0, 1, null, null);
|
||||
closeUpService.autoPlatform(formDO.getStoreId(), formDO.getType(), platformList);
|
||||
}
|
||||
|
||||
|
||||
@@ -806,7 +806,7 @@ public class XxlJobHandler {
|
||||
int pageSize = CommonConstants.BATCH_SIZE;
|
||||
while (hasNext) {
|
||||
PageHelper.startPage(pageNum, pageSize);
|
||||
List<CloseUpPlatformDO> list = closeUpPlatformDAO.getList(null, 0, null, true);
|
||||
List<CloseUpPlatformDO> list = closeUpPlatformDAO.getList(null, null, null, true, true);
|
||||
hasNext = list.size() >= pageSize;
|
||||
if (CollectionUtils.isEmpty(list)) {
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user