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

feat:通过/失败原因

Browse Source
This commit is contained in:
guohb
2024-04-24 10:14:36 +08:00
parent b500a94d61
commit 1678ad3dbd
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java
View File

@@ -1,7 +1,9 @@
package com.cool.store.mapper;
import com.cool.store.entity.ShopAuditInfoDO;
import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper;
public interface ShopAuditInfoMapper extends Mapper<ShopAuditInfoDO> {
ShopAuditInfoDO selectBykeyAndType(@Param("shopId") Long shopId);
}

7
coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml
View File

@@ -18,4 +18,11 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<select id="selectBykeyAndType" resultType="com.cool.store.entity.ShopAuditInfoDO">
select *
from xfsg_shop_audit_info
where shop_id = #{shopId}
and audit_type = 4
and deleted = 0
</select>
</mapper>

26
coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java
View File

@@ -1,13 +1,10 @@
package com.cool.store.response;
import com.cool.store.entity.SystemBuildingShopDO;
import com.cool.store.request.SysStoreAppRequest;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.Objects;
@Data
public class SysStoreAppResponse {
@@ -29,6 +26,21 @@ public class SysStoreAppResponse {
private SupervisorDetail supervisorDetail;
private AuditDetail auditDetail;
@Data
public static class AuditDetail {
@ApiModelProperty("0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 4-系统建店")
private Integer auditType;
@ApiModelProperty("结果类型 0通过,1拒绝")
private Integer resultType;
@ApiModelProperty("通过原因")
private String passReason;
@ApiModelProperty("拒绝原因")
private String rejectReason;
}
@Data
@ApiModel("加盟商信息")
public static class FranInfo {
@@ -54,7 +66,7 @@ public class SysStoreAppResponse {
"6-直营门店;" +
"7-同异业转化;" +
"8-老加盟商迁址开新店")
private Integer franchiseeType;
private Integer franchiseeType;
@ApiModelProperty("门店邀约人id")
private String inviteUserId;
@@ -65,7 +77,7 @@ public class SysStoreAppResponse {
@Data
@ApiModel("门店信息")
public static class StoreDetail{
public static class StoreDetail {
@ApiModelProperty("门店性质")
private Integer storeNature;
@ApiModelProperty("门店经营者")
@@ -132,7 +144,7 @@ public class SysStoreAppResponse {
@Data
@ApiModel("督导相关信息")
public static class SupervisorDetail{
public static class SupervisorDetail {
@ApiModelProperty("督导姓名")
private String supervisorName;
@@ -149,6 +161,4 @@ public class SysStoreAppResponse {
}
}

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

@@ -105,6 +105,15 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(lineId, shopId);
//2.组装数据并返回
sysStoreAppResponse = polymerization(sysStoreAppResponse,systemBuildingShopDO,lineInfoDO,pointInfoDO);
ShopAuditInfoDO shopAuditInfoDO = shopAuditInfoMapper.selectBykeyAndType(shopId);
if (Objects.nonNull(shopAuditInfoDO)){
SysStoreAppResponse.AuditDetail auditDetail = new SysStoreAppResponse.AuditDetail();
auditDetail.setAuditType(shopAuditInfoDO.getAuditType());
auditDetail.setPassReason(shopAuditInfoDO.getPassReason());
auditDetail.setRejectReason(shopAuditInfoDO.getRejectReason());
auditDetail.setResultType(shopAuditInfoDO.getResultType());
sysStoreAppResponse.setAuditDetail(auditDetail);
}
return sysStoreAppResponse;
}