From 68eb28167fc9e85d42eef9a37bd39e6f0290f217 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Mon, 29 Mar 2021 13:40:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectSectionServiceImpl.java            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
index 055e9a6..ee1635e 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java
+++ b/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

From 77ec13c8aea762a42a5f211e41fbf093fc508f88 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Mon, 29 Mar 2021 16:48:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=A4=8D=E5=88=B6=E9=A1=B9=E7=9B=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=E9=97=B4=E4=B8=8D=E8=BF=9B=E8=A1=8C=E5=A4=8D?=
 =?UTF-8?q?=E5=88=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProjectExceptionServiceImpl.java     | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
index 49b71f4..f9c002f 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
+++ b/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);
     }
 
 
@@ -411,10 +418,9 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl<ProjectExceptio
         boolean isInvitation= projectRecordService.isInvitation(projectRecord);
 
         if(isInvitation){
-            Integer code = ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(sectionSupplierList,SectionSupplierVO.class)).getCode();
-            if(code != ResponseEnum.SUCCESS.getCode()){
-                ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.throwException();
-            }
+            log.info("异常再次发起邀请出始化流程 projectID：{},供应商信息参数 sectionSupplierList：{}",projectRecord.getId(),JsonUtils.objectToJson(sectionSupplierList));
+            BaseResponse<Boolean> response = ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(sectionSupplierList, SectionSupplierVO.class));
+            ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.customValidName(response.getMessage(),!response.isSuccess());
         }
     }
 
@@ -436,6 +442,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);
     }

From b6948f5338ae797d5452f30a1cc0f823ac92d495 Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Mon, 29 Mar 2021 16:56:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=94=A8=E5=8F=8B?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=BC=82=E5=B8=B8=E6=96=B9=E6=B3=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0seata=E6=A0=87=E7=AD=BE=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectExceptionServiceImpl.java             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
index f9c002f..0c77df9 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java
@@ -399,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());
         }