1、增加询价校验信息和日志输出

2、修改seata查询报错问题

src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectExceptionEnum.java

@@ -159,6 +159,10 @@ public enum ProjectExceptionEnum implements BusinessExceptionAssert {
     FRAME_EXCEPTION_PROJECT_ENTRUST_PURP_IMPLEMENT_NO_EMPTY(110070, "项目委托信息实施项目编号不能为空！"),
 
     FRAME_EXCEPTION_PROJECT_ENTRUST_SUPP_QUALIFY_ERROR(110071, "邀请招标资审方式应为后审方式！"),
+
+    FRAME_EXCEPTION_INQUIRY_PROJECT_NOT_EMPTY(110072,"询价单已经初始化，请误重复提交"),
+
+    FRAME_EXCEPTION_INQUIRY_DELEGATION_CODE_EMPTY(110073,"询价单委托招标代理机构编码不能为空"),
     ;
 
     /**

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/controller/ProjectEntrustController.java

@@ -76,7 +76,6 @@ public class ProjectEntrustController{
 	 *            
 	 * @return 返回结果
 	 */
-//	@OperLog()
 	@ApiOperation("查询数据")
 	@GetMapping("/{id}")
 	public BaseResponse<ProjectEntrustVO> get(@ApiParam(value = "主键id", required = true) @PathVariable String id){
@@ -227,6 +226,7 @@ public class ProjectEntrustController{
 	 *
 	 * @return 返回结果
 	 */
+	@Idempotent(expireTime = 10)
 	@OperLog("询价通知返回处理接口")
 	@ApiOperation("询价通知返回处理接口")
 	@PostMapping("/inquiryNotice")
@@ -242,6 +242,7 @@ public class ProjectEntrustController{
 	 *
 	 * @return 返回结果
 	 */
+	@Idempotent(expireTime = 10)
 	@OperLog("初始化询价信息接口")
 	@ApiOperation("初始化询价信息接口")
 	@PostMapping("/initInquiryProjectEntrust")

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ISeatatEntrustServiceImpl.java

@@ -57,8 +57,9 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
     @Override
     @GlobalTransactional
     public void initProcess(ProjectEntrustVO projectEntrustVO){
-
+        String xid = RootContext.getXID();
-        log.info("询价初始化发起事务 xid:" + RootContext.getXID());
+        RootContext.unbind();
+        log.info("询价初始化发起事务 xid:" + xid);
 
         //初始化流程
         ProjectRecordVO recordVO = new ProjectRecordVO();
@@ -76,6 +77,8 @@ public class ISeatatEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
         for(String key : sectionMaps.keySet()){
             sectionId = key;
         }
+
+        RootContext.bind(xid);
         //初始化招标文件
         DocumentXjVO xjVO = new DocumentXjVO();
         xjVO.setTpId(recordVO.getId());

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustInquiryServiceImpl.java

@@ -19,6 +19,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustI
 import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustService;
 import com.chinaunicom.mall.ebtp.project.projectentrust.service.ISeataEntrustService;
 import com.chinaunicom.mall.ebtp.project.projectexception.service.IProjectExceptionService;
+import com.chinaunicom.mall.ebtp.project.projectrecord.entity.ProjectRecordVO;
 import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -119,6 +120,11 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
         }else{
             ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_END_TIME_EMPTY.customValid(null == inquiryNoticeVO.getEndTime());
             ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_REVIEW_START_TIME_EMPTY.customValid(null == inquiryNoticeVO.getReviewStartTime());
+
+            //校验是否已经初始化项目信息
+            ProjectRecordVO vo = projectRecordService.getInquiryProjectRecord(inquiryNoticeVO.getInquiryId());
+            ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_PROJECT_NOT_EMPTY.customValid(null != vo);
+
             result = projectRecordService.assent(projectEntrust.getId());
             //初始化后续流程
             ProjectEntrustExpand expand = entrustExpandService.getOne(new QueryWrapper<ProjectEntrustExpand>().eq("entrust_id",projectEntrust.getId()));
@@ -212,8 +218,13 @@ public class ProjectEntrustInquiryServiceImpl extends BaseServiceImpl<ProjectEnt
         //询价单采购方式
         if(null == inquiryVO.getBuyWay()){
             ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_BUY_WAY_EMPTY.throwException();
+        }else{
+            if(InquiryCommonUtil.IS_DELEGATION_1 == inquiryVO.getBuyWay() && StringUtils.isEmpty(inquiryVO.getDelegationCode())){
+                ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_DELEGATION_CODE_EMPTY.throwException();
+            }
         }
 
+
         //评审开始时间不能为空
         if(InquiryCommonUtil.IS_DELEGATION_0 == inquiryVO.getBuyWay() && null == inquiryVO.getReviewStartTime()){
             ProjectExceptionEnum.FRAME_EXCEPTION_INQUIRY_REVIEW_START_TIME_EMPTY.throwException();

src/main/java/com/chinaunicom/mall/ebtp/project/projectentrust/service/impl/ProjectEntrustServiceImpl.java

@@ -31,6 +31,7 @@ import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.Inq
 import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustExpandService;
 import com.chinaunicom.mall.ebtp.project.projectentrust.service.IProjectEntrustService;
 import com.chinaunicom.mall.ebtp.project.projectrecord.service.IProjectRecordService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -49,6 +50,7 @@ import java.util.List;
  *
  */
 @Service
+@Slf4j
 public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMapper,ProjectEntrust>  implements IProjectEntrustService {
 
     @Resource
@@ -178,7 +180,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
             inquiryVO.setInquiryId(projectEntrust.getProcurementPlanId());
             inquiryVO.setInquiryNoticeStatus(ProjectCommonUtil.INQUIRY_NOTICE_STATUS_1);
             inquiryVO.setReason(remarks);
+            log.info("项目经理拒绝 询价项目招投标推送询价单是否可以发布访问参数:"+JsonUtils.objectToJson(inquiryVO));
             BaseResponse response = priceQueryApi.updateInquiryAllowPublish(inquiryVO);
+            log.info("项目经理拒绝 询价项目招投标推送询价单是否可以发布返回参数:"+JsonUtils.objectToJson(inquiryVO));
             CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess());
         }
 
@@ -203,7 +207,9 @@ public class ProjectEntrustServiceImpl extends BaseServiceImpl<ProjectEntrustMap
                 InquiryNoticeVO inquiryVO = new InquiryNoticeVO();
                 inquiryVO.setInquiryId(projectEntrust.getProcurementPlanId());
                 inquiryVO.setInquiryNoticeStatus(ProjectCommonUtil.INQUIRY_NOTICE_STATUS_0);
+                log.info("询价项目招投标推送询价单是否可以发布访问参数:"+JsonUtils.objectToJson(inquiryVO));
                 BaseResponse response = priceQueryApi.updateInquiryAllowPublish(inquiryVO);
+                log.info("询价项目招投标推送询价单是否可以发布返回参数:"+JsonUtils.objectToJson(inquiryVO));
                 CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(response.getMessage(),!response.isSuccess());
             }else{
                 //初始化项目信息