From 1678ad3dbd354c0ffe437eb89881d48cb4656326 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 24 Apr 2024 10:14:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=80=9A=E8=BF=87/=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/mapper/ShopAuditInfoMapper.java | 2 ++ .../resources/mapper/ShopAuditInfoMapper.xml | 7 +++++ .../store/response/SysStoreAppResponse.java | 26 +++++++++++++------ .../service/impl/SysStoreAppServiceImpl.java | 9 +++++++ 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java index c2322b69d..34f6f69f5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAuditInfoMapper.java @@ -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 selectBykeyAndType(@Param("shopId") Long shopId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml index 38efed473..b9c220f3c 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAuditInfoMapper.xml @@ -18,4 +18,11 @@ + \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java index af5502a6d..0ac1c434e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SysStoreAppResponse.java @@ -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 { } - - } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index 2f1633a44..82d4ed094 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -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; }