Merge #74 into master from cc_20260324_decoration_update

feat:新增修改装修信息接口

* cc_20260324_decoration_update: (2 commits squashed)

  - feat:新增修改装修信息接口

  - 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/74
This commit is contained in:
王非凡
2026-03-25 09:38:34 +00:00
committed by 正新
parent 1f3d5a0df7
commit 14aa3507b7
4 changed files with 54 additions and 0 deletions

View File

@@ -0,0 +1,24 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* <p>
* 加盟合同签约装修信息Request
* </p>
*
* @author wangff
* @since 2026/3/24
*/
@Data
public class SignFranchiseDecorationRequest {
@ApiModelProperty("门店id")
private Long shopId;
@ApiModelProperty("装修设计要求字典表decoration_requirement")
private String decorationRequirement;
@ApiModelProperty("特殊情况说明")
private String specialInstruction;
}

View File

@@ -24,6 +24,11 @@ public interface SignFranchiseService {
*/
Boolean reSubmitSignFranchise(AddSignFranchiseRequest request, LoginUserInfo user);
/**
* 装修信息修改
*/
Boolean decorationUpdate(SignFranchiseDecorationRequest request);
AddSignFranchiseResponse getSignFranchise(Long shopId);

View File

@@ -379,6 +379,23 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
return Boolean.TRUE;
}
@Override
public Boolean decorationUpdate(SignFranchiseDecorationRequest request) {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
if (Objects.isNull(shopInfo)) {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
}
ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_9);
if (shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91.getShopSubStageStatus())) {
throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE);
}
ShopInfoDO update = new ShopInfoDO();
update.setId(request.getShopId());
update.setDecorationRequirement(request.getDecorationRequirement());
update.setSpecialInstruction(request.getSpecialInstruction());
return shopInfoDAO.updateShopInfo(update) > 0;
}
/**
* 费用校验
* @param request

View File

@@ -6,10 +6,12 @@ import com.cool.store.context.LoginUserInfo;
import com.cool.store.request.AddSignFranchiseRequest;
import com.cool.store.request.AssignOperationConsultantRequest;
import com.cool.store.request.AuditApproveRequest;
import com.cool.store.request.SignFranchiseDecorationRequest;
import com.cool.store.response.AddSignFranchiseResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.SignFranchiseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -37,6 +39,12 @@ public class PCSignFranchiseController {
return ResponseResult.success(signFranchiseService.reSubmitSignFranchise(request,user));
}
@ApiOperation("修改装修信息")
@PostMapping("/decorationUpdate")
public ResponseResult<Boolean> decorationUpdate(@RequestBody @Validated SignFranchiseDecorationRequest request) {
return ResponseResult.success(signFranchiseService.decorationUpdate(request));
}
@ApiOperation("加盟合同签约审核")
@PostMapping("/audit/result")
public ResponseResult<Boolean> auditSignFranchise(@RequestBody @Validated AuditApproveRequest request) {