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

feat:backPayFeeStage

Browse Source
This commit is contained in:
苏竹红
2025-11-26 10:05:21 +08:00
parent 1ca3994821
commit 7d2b2f40e4
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java
View File

@@ -46,7 +46,7 @@ public interface SignFranchiseService {
* @param shopId * @param shopId
* @return * @return
*/ */
Boolean backPayFeeStage(Long shopId); Boolean backPayFeeStage(AuditApproveRequest request, LoginUserInfo user);

18
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java
View File

@@ -756,11 +756,23 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
} }
@Override @Override
public Boolean backPayFeeStage(Long shopId) { public Boolean backPayFeeStage(AuditApproveRequest request, LoginUserInfo user) {
//回退到对账中 此阶段账单可编辑 可再次对账 //回退到对账中 此阶段账单可编辑 可再次对账
shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72); shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_72);
//缴费阶段回退到未开始 //缴费阶段回退到未开始
shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_8); shopStageInfoDAO.updateShopStageToNotStarted(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_8);
ShopAuditInfoDO shopAuditInfoDO = new ShopAuditInfoDO();
shopAuditInfoDO.setShopId(request.getShopId());
shopAuditInfoDO.setAuditType(AuditTypeEnum.SIGN_FRANCHISE.getCode());
shopAuditInfoDO.setSubmittedUserId(user.getUserId());
shopAuditInfoDO.setSubmittedUserName(user.getName());
shopAuditInfoDO.setResultType(Constants.ONE_INTEGER);
shopAuditInfoDO.setRejectReason(request.getCause());
shopAuditInfoMapper.insertSelective(shopAuditInfoDO);
Long auditId = shopAuditInfoDO.getId();
//审批记录表记录
List<OperationLogDO> operationLogs = operationLogDAO.getBySubStageStatusEnumAndsStatus(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83, OperationTypeEnum.OPERATION_TYPE_1.getCode());
operationLogService.batchUpdateProcessed(operationLogs, auditId, user.getUserId(), "回退到缴费阶段，"+request.getCause());
return true; return true;
} }

6
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java
View File

@@ -55,6 +55,12 @@ public class PCSignFranchiseController {
return ResponseResult.success(signFranchiseService.rePay(shopId)); return ResponseResult.success(signFranchiseService.rePay(shopId));
} }
@ApiOperation("回到缴费阶段")
@PostMapping("/backPayFeeStage")
public ResponseResult<Boolean> backPayFeeStage(@RequestBody @Validated AuditApproveRequest request) {
return ResponseResult.success(signFranchiseService.backPayFeeStage(request, CurrentUserHolder.getUser()));
}
@ApiOperation("数据处理，全部设置为新签") @ApiOperation("数据处理，全部设置为新签")
@GetMapping("/dateHandle") @GetMapping("/dateHandle")
public ResponseResult<Integer> dateHandle() { public ResponseResult<Integer> dateHandle() {