diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java index f966f80d1..2218ba78c 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/point/ShopSubStageStatusEnum.java @@ -121,6 +121,7 @@ public enum ShopSubStageStatusEnum { //营帐通开通 SHOP_SUB_STAGE_STATUS_240(ShopSubStageEnum.SHOP_STAGE_24, 2400, "待提交", Boolean.FALSE), + SHOP_SUB_STAGE_STATUS_244(ShopSubStageEnum.SHOP_STAGE_24, 2440, "无需开通", Boolean.TRUE), SHOP_SUB_STAGE_STATUS_245(ShopSubStageEnum.SHOP_STAGE_24, 2450, "已完成", Boolean.TRUE), ; diff --git a/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml index e7927a718..928f0b8db 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/PlatformBuildMapper.xml @@ -25,6 +25,8 @@ + + @@ -35,6 +37,6 @@ settler_bank_name, account,store_positioning_url,authorization_url, create_time,update_time,create_user, - update_user + update_user,poi,store_id diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java index 9c91b6238..b2222e667 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/PlatformBuildDO.java @@ -132,5 +132,15 @@ public class PlatformBuildDO { @Column(name = "update_user") private String updateUser; + /** + * poi + */ + @Column(name = "poi") + private String poi; + /** + * 门店ID + */ + @Column(name = "store_id") + private String storeId; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java index a61c1cd1a..76aa66572 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/PlatformBuildRequest.java @@ -72,6 +72,13 @@ public class PlatformBuildRequest { @Length(max = 250, message = "快手平台账号 长度不能超过250") private String ksAccount; + @ApiModelProperty( "poi") + @Length(max = 250, message = "poi 长度不能超过250") + private String poi; + + @ApiModelProperty( "门店ID") + @Length(max = 250, message = "门店ID 长度不能超过250") + private String storeId; public PlatformBuildDO toDO() { @@ -87,6 +94,8 @@ public class PlatformBuildRequest { platformBuildDO.setSettlerBankName(this.settlerBankName); platformBuildDO.setStorePositioningUrl(this.storePositioningUrl); platformBuildDO.setAuthorizationUrl(this.authorizationUrl); + platformBuildDO.setPoi(this.poi); + platformBuildDO.setStoreId(this.storeId); return platformBuildDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java index a50fd6c4f..1d3cb6195 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/PlatformBuildResponse.java @@ -52,6 +52,14 @@ public class PlatformBuildResponse { @ApiModelProperty("初审原因") private String reason; + @ApiModelProperty("小程序美团外卖和饿了吗勇这个：最新审批原因") private String newReason; + + @ApiModelProperty( "poi") + private String poi; + + @ApiModelProperty( "门店ID") + private String storeId; + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PosAndOrderInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PosAndOrderInfoService.java index f8f4fce72..e22441991 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PosAndOrderInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PosAndOrderInfoService.java @@ -13,7 +13,7 @@ public interface PosAndOrderInfoService { Integer submitOrUpdate(PostAndOrderRequest request ,String user); - PosAndOrderResponse get(Long shopId, Integer type); + Boolean skip(Long shopId, Integer type); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index b56c57605..a17c23a32 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -99,7 +99,8 @@ public class PointServiceImpl implements PointService { Long pointId = pointInfoDAO.addPointInfo(pointInfo); PointDetailInfoDO shopPoint = AddPointDetailRequest.convertDO(shopPointDetailRequest); shopPoint.setPointId(pointId); - return pointDetailInfoDAO.addPointDetailInfo(shopPoint); + pointDetailInfoDAO.addPointDetailInfo(shopPoint); + return pointId; } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java index e95ac0170..c007d2c1d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java @@ -5,8 +5,12 @@ import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.PosAndOrderInfoDAO; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.PosAndOrderInfoDO; +import com.cool.store.entity.ShopStageInfoDO; +import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.PosAndOrderEnum; +import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; +import com.cool.store.exception.ServiceException; import com.cool.store.request.PostAndOrderRequest; import com.cool.store.response.PosAndOrderResponse; import com.cool.store.service.PosAndOrderInfoService; @@ -44,15 +48,15 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService { if (Objects.isNull(posAndOrderInfoDO)) { if (request.getType().equals(PosAndOrderEnum.POS.getCode())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163); - }else if (request.getType().equals(PosAndOrderEnum.ORDER.getCode())) { + } else if (request.getType().equals(PosAndOrderEnum.ORDER.getCode())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173); - }else if (request.getType().equals(PosAndOrderEnum.XIN_FA_SYS.getCode())) { + } else if (request.getType().equals(PosAndOrderEnum.XIN_FA_SYS.getCode())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_235); - }else if (request.getType().equals(PosAndOrderEnum.TENT_PASS.getCode())) { + } else if (request.getType().equals(PosAndOrderEnum.TENT_PASS.getCode())) { shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_245); } return posAndOrderInfoDAO.insertSelective(posAndOrderInfo); - }else{ + } else { return posAndOrderInfoDAO.updateByShopIdSelective(posAndOrderInfo); } } @@ -60,7 +64,7 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService { @Override public PosAndOrderResponse get(Long shopId, Integer type) { PosAndOrderResponse response = new PosAndOrderResponse(); - PosAndOrderInfoDO posAndOrderInfoDO = posAndOrderInfoDAO.selectOneByShopId(shopId,type); + PosAndOrderInfoDO posAndOrderInfoDO = posAndOrderInfoDAO.selectOneByShopId(shopId, type); if (Objects.nonNull(posAndOrderInfoDO)) { response.setShopId(posAndOrderInfoDO.getShopId()); response.setAccount(posAndOrderInfoDO.getAccount()); @@ -72,6 +76,16 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService { } return response; } + + @Override + public Boolean skip(Long shopId, Integer type) { + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_24); + if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_240.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); + } + shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_244); + return Boolean.TRUE; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/XinFaSysAndTentPassController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/XinFaSysAndTentPassController.java index 57cbd54e9..29bcdac7d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/XinFaSysAndTentPassController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/XinFaSysAndTentPassController.java @@ -49,4 +49,9 @@ public class XinFaSysAndTentPassController { request.setType(PosAndOrderEnum.TENT_PASS.getCode()); return ResponseResult.success(posAndOrderInfoService.submitOrUpdate(request, CurrentUserHolder.getUserId())); } + @ApiOperation("营帐通无需提交") + @PostMapping("/skipTentPass") + private ResponseResult skipTentPass(@RequestParam Long shopId) { + return ResponseResult.success(posAndOrderInfoService.skip(shopId, PosAndOrderEnum.TENT_PASS.getCode())); + } }