Merge branch 'dev'

src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java

@@ -161,10 +161,10 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional
     public boolean updateState(String id) {
         ProjectException projectException = this.getById(id);
-
+        log.info("异常处理进入方法 xid:{},异常处理信息：{}",RootContext.getXID(),JsonUtils.objectToJson(projectException));
         /*检验信息*/
         updateCheck(projectException);
 
@@ -226,7 +226,8 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
         }else{ //项目再次购买
             launchAgainProject(projectException, sectionList);
         }
-        //通知招标服务停止
+
+        log.info("异常处理通知招标服务停止接口参数：{}",JsonUtils.objectToJson(sectionExceptionIds));
         abnormal(sectionExceptionIds);
 
         return result;
@@ -274,10 +275,9 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
      * @param projectException 项目ID
      * @param sectionList 项目标段
      */
-    @GlobalTransactional
     public void launchAgainProject(ProjectException projectException,List<ProjectSection> sectionList) {
 
-        log.info("异常处理发起事务 xid:" + RootContext.getXID());
+        log.info("异常处理再次发起项目事务 xid:{},异常处理信息：{}",RootContext.getXID(),JsonUtils.objectToJson(projectException));
 
         //查询项目信息
         ProjectRecord projectRecord = projectRecordService.getById(projectException.getProjectId());
@@ -326,13 +326,16 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
             section.setId(PropertyUtils.getSnowflakeId());
             section.setBusinessModule(isReviewMethod ? ProjectCommonUtil.BUSINESS_MODULE_2:ProjectCommonUtil.BUSINESS_MODULE_7);
             section.setStatus(ProjectCommonUtil.SECTION_STATUS_2);
-
+            section.setCreateDate(null);
+            section.setUpdateDate(null);
             //重新赋值新的项目ID和物资ID
             List<SectionSupplier> supplierList = sectionSupplierMap.get(section.getId());
             if (null != supplierList && supplierList.size() > 0) {
                 for (SectionSupplier supplier : supplierList) {
                     supplier.setSectionId(section.getId());
                     supplier.setProjectId(projectRecord.getId());
+                    supplier.setCreateDate(null);
+                    supplier.setUpdateDate(null);
                 }
                 sectionSupplierAddList.addAll(supplierList);
             }
@@ -343,11 +346,15 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
                 for (SectionMaterial material : materialList) {
                     material.setSectionId(section.getId());
                     material.setProjectId(projectRecord.getId());
+                    material.setCreateDate(null);
+                    material.setUpdateDate(null);
                 }
                 materialAddList.addAll(sectionMaterialList);
             }
         }
 
+        projectRecord.setCreateDate(null);
+        projectRecord.setUpdateDate(null);
         //插入项目信息
         projectRecordService.save(projectRecord);
         //插入标段信息
@@ -366,7 +373,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
         callEbtpMallBidApi(projectRecord, sectionSupplierList);
 
         //出始化标段评审室信息
-        callInitialize(projectException.getProjectId(), isReviewMethod);
+        callInitialize(projectRecord.getId(), isReviewMethod);
     }
 
 
@@ -392,8 +399,10 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
         failRequest.setFailCause(dictProject.getDicName());
         log.debug("访问失败接口"+ JsonUtils.objectToJson(failRequest));
         //调用接口
+        String xid = RootContext.getXID();
+        RootContext.unbind();
         BaseResponse baseResponse = mallPurpApi.projInvitationFail(failRequest);
-
+        RootContext.bind(xid);
         if(!baseResponse.isSuccess()){
             ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_EXCEPTION_INVITATION_FAIL_ERROR.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
         }
@@ -411,10 +420,9 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
         boolean isInvitation= projectRecordService.isInvitation(projectRecord);
 
         if(isInvitation){
-            Integer code = ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(sectionSupplierList,SectionSupplierVO.class)).getCode();
+            log.info("异常再次发起邀请出始化流程 projectID：{},供应商信息参数 sectionSupplierList：{}",projectRecord.getId(),JsonUtils.objectToJson(sectionSupplierList));
-            if(code != ResponseEnum.SUCCESS.getCode()){
+            BaseResponse<Boolean> response = ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(sectionSupplierList, SectionSupplierVO.class));
-                ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.throwException();
+            ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.customValidName(response.getMessage(),!response.isSuccess());
-            }
         }
     }
 
@@ -436,6 +444,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
      * @param isReviewMethod 是否资审预审项目
      */
     private void callInitialize(String projectId, boolean isReviewMethod) {
+        log.info("异常再次发起初始化流程 projectID：{}",projectId);
         Map<String,String> sectionMaps = projectSectionService.getFlowList(projectId);
         projectRecordService.initialize(projectId,isReviewMethod,sectionMaps);
     }

src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java

@@ -151,7 +151,12 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl<ProjectSectionMap
 
     @Override
     public List<ProjectSection> selectBatchIds(List<String> sectionIds) {
-        return projectSectionMapper.selectBatchIds(sectionIds);
+        sectionIds = sectionIds.stream().filter(n -> StringUtils.isNotBlank(n)).collect(Collectors.toList());
+        List<ProjectSection> projectSectionList = null;
+        if(null != sectionIds && sectionIds.size() > 0 ){
+            projectSectionList = projectSectionMapper.selectBatchIds(sectionIds);
+        }
+        return projectSectionList;
     }
 
     @Override