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

fix addBranchShop

Browse Source
This commit is contained in:
shuo.wang
2025-01-22 11:43:29 +08:00
parent 07cd613e32
commit 58d571f1a4
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-model/src/main/java/com/cool/store/request/AddBranchShopRequest.java
View File

@@ -23,7 +23,6 @@ public class AddBranchShopRequest {
@NotNull @NotNull
private Long lineId; private Long lineId;
@ApiModelProperty("门店名称") @ApiModelProperty("门店名称")
@NotBlank
private String shopName; private String shopName;
@ApiModelProperty("意向开店区域") @ApiModelProperty("意向开店区域")
@NotNull @NotNull

9
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -261,12 +261,19 @@ public class ShopServiceImpl implements ShopService {
if (lineInfo.getWorkflowSubStageStatus() < WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode()) { if (lineInfo.getWorkflowSubStageStatus() < WorkflowSubStageStatusEnum.PAY_DEPOSIT_45.getCode()) {
throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE); throw new ServiceException(ErrorCodeEnum.LINE_STATUS_NOT_ALLOW_OPERATE);
} }
ShopInfoDO shopInfoDO = request.toDO(request, lineInfo.getPartnerId());
List<ShopInfoDO> shopList = shopInfoDAO.getShopList(lineInfo.getId()); List<ShopInfoDO> shopList = shopInfoDAO.getShopList(lineInfo.getId());
if (CollectionUtils.isNotEmpty(shopList)) { if (CollectionUtils.isNotEmpty(shopList)) {
if (StringUtils.isBlank(request.getShopName())) {
shopInfoDO.setShopName("店铺" + NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum()+1));
}
lineInfo.setWantShopNum(lineInfo.getWantShopNum() + 1); lineInfo.setWantShopNum(lineInfo.getWantShopNum() + 1);
lineInfoDAO.updateLineInfo(lineInfo); lineInfoDAO.updateLineInfo(lineInfo);
}else {
if (StringUtils.isBlank(request.getShopName())) {
shopInfoDO.setShopName("店铺" + NumberConverter.convertArabicToChinese(lineInfo.getWantShopNum()));
}
} }
ShopInfoDO shopInfoDO = request.toDO(request, lineInfo.getPartnerId());
shopInfoDO.setCreateUserId(userId); shopInfoDO.setCreateUserId(userId);
Long shopId = shopInfoDAO.addShopInfo(shopInfoDO); Long shopId = shopInfoDAO.addShopInfo(shopInfoDO);
if (lineInfo.getWorkflowSubStageStatus().equals(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode())) { if (lineInfo.getWorkflowSubStageStatus().equals(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode())) {