开业筹备阶段4.0

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

@@ -121,22 +121,17 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
             log.error(" getPlanByShopId shopId is null");
             throw new ServiceException(ErrorCodeEnum.SHOP_ID_IS_NULL);
         }
-        OpeningOperationPlanVO openingOperationPlanVO = new OpeningOperationPlanVO();
         OpeningOperationPlanDO openingOperationPlanDO = openingOperationPlanDAO.selectByShopId(shopId);
-        try {
             if (openingOperationPlanDO != null) {
+                OpeningOperationPlanVO openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO);
                 String preparationUserIds = openingOperationPlanDO.getPreparationUserIds();
                 List<String> stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList());
                 List<UserNameDTO> nameByUserId = enterpriseUserDAO.getNameByUserId(stream);
-                BeanUtils.copyProperties(openingOperationPlanDO, openingOperationPlanVO);
                 openingOperationPlanVO.setPreparationUsers(nameByUserId);
                 return openingOperationPlanVO;
             }
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            e.printStackTrace();
-            return null;
-        }
-        return openingOperationPlanVO;
+
+        return null;
     }
 
     @Override
@@ -163,9 +158,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService {
         log.info("getPlanListPage shopIdlist:{}", JSONObject.toJSONString(shopIdlist));
         //根据ShopName等查询门店名字1，门店代码1，开店负责人id1，督导id1,大区名称,战区名称,线索id
         List<OpenPlanShopInfoDTO> openPlanShopList = shopInfoDAO.
-                getOpenPlanShopListByShopName(shopIdlist, request.getShopName(), request.getBigName(),
-                        request.getFightName()
-                );
+                getOpenPlanShopListByShopName(shopIdlist, request.getShopName(), request.getRegionId());
         log.info("getPlanListPage openPlanShopList:{}", JSONObject.toJSONString(openPlanShopList));
         Map<Long, OpenPlanShopInfoDTO> shopInfoMap = openPlanShopList.stream()
                 .collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, vo -> vo));