fix:新接口和默认值

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

@@ -82,6 +82,9 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
     @Resource
     SimpleMessageService simpleMessageService;
 
+    @Resource
+    PointDetailInfoMapper pointDetailInfoMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseResult submitSysBuildStore(SysStoreAppRequest request, LoginUserInfo user) {
@@ -167,6 +170,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
         storeDetail.setFightName(fightRegion.getName());
         storeDetail.setFightCode(fightRegion.getSynDingDeptId());
         storeDetail.setFightId(fightRegion.getId());
+
         if (Objects.nonNull(systemBuildingShopDO)) {
             sysStoreAppResponse.setId(systemBuildingShopDO.getId());
             sysStoreAppResponse.setLineId(systemBuildingShopDO.getLineId());
@@ -224,6 +228,12 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe
             storeDetail.setReasons(systemBuildingShopDO.getReasons());
             storeDetail.setUsageRate(systemBuildingShopDO.getUsageRate());
         }
+        PointDetailInfoDO shopPointDetailInfoByPointId = pointDetailInfoMapper.getShopPointDetailInfoByPointId(pointInfoDO.getId());
+        if (Objects.isNull(systemBuildingShopDO) && Objects.nonNull(shopPointDetailInfoByPointId)){
+            storeDetail.setLandlordMobile(shopPointDetailInfoByPointId.getLandlordMobile());
+            storeDetail.setLandlordName(shopPointDetailInfoByPointId.getLandlordUsername());
+            storeDetail.setStoreRent(Integer.valueOf(shopPointDetailInfoByPointId.getMonthRent()));
+        }
         if (Objects.nonNull(lineInfoDO)) {
             RegionDO byRegionId = regionMapper.getByRegionId(lineInfoDO.getRegionId());
             franInfo.setSubregion(byRegionId.getName());

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/SysStoreAppController.java

@@ -3,17 +3,19 @@ package com.cool.store.controller.webb;
 
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.entity.EnterpriseUserDO;
+import com.cool.store.enums.UserRoleEnum;
 import com.cool.store.request.SysStoreAppRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.response.SysStoreAppResponse;
 import com.cool.store.service.SysStoreAppService;
+import com.cool.store.service.UserAuthMappingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/pc/sysStore")
@@ -24,11 +26,14 @@ public class SysStoreAppController {
     @Resource
     private SysStoreAppService sysStoreAppService;
 
+    @Resource
+    UserAuthMappingService userAuthMappingService;
+
     @PostMapping(path = "/submit")
     @ApiOperation("提交(更新) 系统建店申请")
     public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) {
         LoginUserInfo user = CurrentUserHolder.getUser();
-        return sysStoreAppService.submitSysBuildStore(request,user);
+        return sysStoreAppService.submitSysBuildStore(request, user);
     }
 
     @GetMapping(path = "/default/get")
@@ -36,7 +41,14 @@ public class SysStoreAppController {
     public ResponseResult<SysStoreAppResponse> getDefaultValueSysBuildStore(@RequestParam("lineId") Long lineId,
                                                                             @RequestParam("shopId") Long shopId) {
         LoginUserInfo user = CurrentUserHolder.getUser();
-        return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId,user));
+        return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId, shopId, user));
+    }
+
+
+    @GetMapping(path = "/getSmallRegionDD")
+    @ApiOperation("获取小区督导")
+    public ResponseResult<EnterpriseUserDO> getSmallRegionDD(@RequestParam("regionId") Long regionId) {
+        return ResponseResult.success(userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, regionId));
     }
 
 

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSysStoreAppController.java

@@ -2,10 +2,13 @@ package com.cool.store.controller.webc;
 
 import com.cool.store.context.CurrentUserHolder;
 import com.cool.store.context.LoginUserInfo;
+import com.cool.store.entity.EnterpriseUserDO;
+import com.cool.store.enums.UserRoleEnum;
 import com.cool.store.request.SysStoreAppRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.response.SysStoreAppResponse;
 import com.cool.store.service.SysStoreAppService;
+import com.cool.store.service.UserAuthMappingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +25,10 @@ public class MiniSysStoreAppController {
     @Resource
     private SysStoreAppService sysStoreAppService;
 
+
+    @Resource
+    UserAuthMappingService userAuthMappingService;
+
     @PostMapping(path = "/submit")
     @ApiOperation("提交(更新) 系统建店申请")
     public ResponseResult submitSysBuildStore(@RequestBody SysStoreAppRequest request) {
@@ -36,4 +43,11 @@ public class MiniSysStoreAppController {
         LoginUserInfo user = CurrentUserHolder.getUser();
         return ResponseResult.success(sysStoreAppService.getDefaultValueSysBuildStore(lineId,shopId,user));
     }
+
+    @GetMapping(path = "/getSmallRegionDD")
+    @ApiOperation("获取小区督导")
+    public ResponseResult<EnterpriseUserDO> getSmallRegionDD(@RequestParam("regionId") Long regionId) {
+        return ResponseResult.success(userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, regionId));
+    }
+
 }