优化

src/main/java/com/qtzl/alterSales/dao/repo/jpa/second/AflAccessChannelInfoRepo.java

@@ -17,8 +17,8 @@ public interface AflAccessChannelInfoRepo extends JpaRepository<AflAccessChannel
      * @param accessChannelCode
      * @return
      */
-    @Query(" from AflAccessChannelInfo where accessChannelCode =?1 and isDelete=0 ")
-    AflAccessChannelInfo findByAccessChannelCode(String accessChannelCode);
+    @Query(" from AflAccessChannelInfo where accessChannelName =?1 and isDelete=0 ")
+    AflAccessChannelInfo findByAccessChannelName(String accessChannelName);
 
     @Query(" from AflAccessChannelInfo where id =?1 and isDelete=0 ")
     AflAccessChannelInfo findByIdAndIsDelete(String id);

src/main/java/com/qtzl/alterSales/dao/repo/jpa/second/AflSignChannelsInfoRepo.java

@@ -21,6 +21,6 @@ public interface AflSignChannelsInfoRepo extends JpaRepository<AflSignChannelsIn
     AflSignChannelsInfo findByChannelCode(String channelCode);
     @Query("from AflSignChannelsInfo  where id = ?1 and isDelete = 0")
     AflSignChannelsInfo findByIdAndIsDelete(String id);
-    @Query("select channelCode from AflSignChannelsInfo  where channelName = ?1 and isDelete = 0")
-    String findByChannelName(String channelName);
+    @Query(" from AflSignChannelsInfo  where channelName = ?1 and isDelete = 0")
+    AflSignChannelsInfo findByChannelName(String channelName);
 }

src/main/java/com/qtzl/alterSales/manager/service/AflAccessChannelInfoServiceImpl.java

@@ -52,7 +52,7 @@ public class AflAccessChannelInfoServiceImpl implements AflAccessChannelInfoServ
         if (!StringUtils.isEmpty(request.getId())) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该方法为新增,接入渠道编号不可以指定");
         }
-        AflAccessChannelInfo aflAccessChannelInfo = aflAccessChannelInfoRepo.findByAccessChannelCode(request.getAccessChannelCode());
+        AflAccessChannelInfo aflAccessChannelInfo = aflAccessChannelInfoRepo.findByAccessChannelName(request.getAccessChannelName());
         if (aflAccessChannelInfo!=null){
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该接入渠道编码配置，不允许重复，请核实");
         }
@@ -69,14 +69,12 @@ public class AflAccessChannelInfoServiceImpl implements AflAccessChannelInfoServ
         if (StringUtils.isEmpty(request.getUpdator())){
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("修改人不能为空");
         }
-        AflAccessChannelInfo aflAccessChannelInfo= null;
-        try {
-            aflAccessChannelInfo = findById(request.getId());
-        } catch (ServiceHandleException e) {
-            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException(e.getMessage());
-        }
+        AflAccessChannelInfo aflAccessChannelInfo= findById(request.getId());
         if (!aflAccessChannelInfo.getAccessChannelCode().equals(request.getAccessChannelCode())){
-            AflAccessChannelInfo byAccessChannelCode = aflAccessChannelInfoRepo.findByAccessChannelCode(request.getAccessChannelCode());
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不允许修改编号，请核实");
+        }
+        if (!aflAccessChannelInfo.getAccessChannelName().equals(request.getAccessChannelName())){
+            AflAccessChannelInfo byAccessChannelCode = aflAccessChannelInfoRepo.findByAccessChannelName(request.getAccessChannelName());
             if (byAccessChannelCode!=null){
                 throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该接入渠道编码配置，不允许重复，请核实");
             }

src/main/java/com/qtzl/alterSales/manager/service/AflSignChannelsInfoServiceImpl.java

@@ -49,9 +49,9 @@ public class AflSignChannelsInfoServiceImpl implements AflSignChannelsInfoServic
         if (!StringUtils.isEmpty(request.getId())) {
             throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("该方法为新增,渠道编号不可以指定");
         }
-        AflSignChannelsInfo aflSignChannelsInfo= aflSignChannelsInfoRepo.findByChannelCode(request.getChannelCode());
+        AflSignChannelsInfo aflSignChannelsInfo= aflSignChannelsInfoRepo.findByChannelName(request.getChannelName());
         if (aflSignChannelsInfo!=null){
-            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该渠道编码配置，不允许重复，请核实");
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该渠道名称配置，不允许重复，请核实");
         }
         aflSignChannelsInfo=new AflSignChannelsInfo();
         BeanUtils.copyProperties(request,aflSignChannelsInfo);
@@ -63,16 +63,15 @@ public class AflSignChannelsInfoServiceImpl implements AflSignChannelsInfoServic
 
     @Override
     public void update(AflSignChannelsInfoSaveOrUpdateRequest request) throws ServiceHandleException {
-        AflSignChannelsInfo aflSignChannelsInfo= null;
-        try {
-            aflSignChannelsInfo = findById(request.getId());
-        } catch (ServiceHandleException e) {
-            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException(e.getMessage());
-        }
+
+        AflSignChannelsInfo  aflSignChannelsInfo = findById(request.getId());
         if (!aflSignChannelsInfo.getChannelCode().equals(request.getChannelCode())){
-            AflSignChannelsInfo aflSignChannelsVo= aflSignChannelsInfoRepo.findByChannelCode(request.getChannelCode());
+            throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("不允许修改编号，请核实");
+        }
+        if (!aflSignChannelsInfo.getChannelName().equals(request.getChannelName())){
+            AflSignChannelsInfo aflSignChannelsVo= aflSignChannelsInfoRepo.findByChannelName(request.getChannelName());
             if (aflSignChannelsVo!=null){
-                throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该渠道编码配置，不允许重复，请核实");
+                throw UcServiceError.BUSINESS_VALIDATE_ERR.toHandleException("已存在该渠道名称配置，不允许重复，请核实");
             }
         }
         getAflSignChannelsInfo(request,aflSignChannelsInfo);