diff --git a/coolstore-partner-dao/src/main/resources/mapper/OpenNewShopRecordMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/OpenNewShopRecordMapper.xml index ba245ca80..15240fda3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/OpenNewShopRecordMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/OpenNewShopRecordMapper.xml @@ -32,7 +32,7 @@ and (b.username like concat('%',#{request.keyword},'%') or b.mobile like concat('%',#{request.keyword},'%')) - and b.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{areaPath}, '%')) + and b.want_shop_area_id in (select id from xfsg_open_area_info where area_path like concat(#{request.areaPath}, '%')) and a.audit_result = #{request.auditResult} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/IsSubmitOpenNewShopVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/IsSubmitOpenNewShopVO.java index fe9f1ae62..aefaaa4c5 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/IsSubmitOpenNewShopVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/IsSubmitOpenNewShopVO.java @@ -15,7 +15,11 @@ public class IsSubmitOpenNewShopVO { @ApiModelProperty("是否可以开新店 true:可以开店 false:不能开新店") private Boolean isSubmitOpenNewShop; - public IsSubmitOpenNewShopVO(Boolean isSubmitOpenNewShop) { + @ApiModelProperty("审核状态 0待审核 1通过 2不通过") + private Integer auditResult; + + public IsSubmitOpenNewShopVO(Boolean isSubmitOpenNewShop, Integer auditResult) { this.isSubmitOpenNewShop = isSubmitOpenNewShop; + this.auditResult = auditResult; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenNewShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenNewShopServiceImpl.java index f36fd86ae..73592c650 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenNewShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenNewShopServiceImpl.java @@ -140,10 +140,10 @@ public class OpenNewShopServiceImpl implements OpenNewShopService { //首先获取有没有待审核的记录 OpenNewShopRecordDO openNewShopRecord = openNewShopRecordDAO.getWaitAuditOpenNewShopRecord(lineId); if(Objects.nonNull(openNewShopRecord)){ - return new IsSubmitOpenNewShopVO(Boolean.FALSE); + return new IsSubmitOpenNewShopVO(Boolean.FALSE, openNewShopRecord.getAuditResult()); } //没有待审核的记录 去获取店铺是否都已经在验收中 Integer notOpenShopCount = shopStageInfoDAO.getNotOpenShopCountByLineId(lineId); - return new IsSubmitOpenNewShopVO(notOpenShopCount <= CommonConstants.ZERO); + return new IsSubmitOpenNewShopVO(notOpenShopCount <= CommonConstants.ZERO, null); } } \ No newline at end of file