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

fix

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-15 15:40:20 +08:00
parent a973ef9364
commit 84cb1af364
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/resources/mapper/OpenNewShopRecordMapper.xml
View File

@@ -32,7 +32,7 @@
and (b.username like concat('%',#{request.keyword},'%') or b.mobile like concat('%',#{request.keyword},'%'))
</if>
<if test="request.areaPath != null and request.areaPath != '' ">
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}, '%'))
</if>
<if test="request.auditResult != null">
and a.audit_result = #{request.auditResult}

6
coolstore-partner-model/src/main/java/com/cool/store/vo/IsSubmitOpenNewShopVO.java
View File

@@ -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;
}
}

4
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenNewShopServiceImpl.java
View File

@@ -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);
}
}