Merge branch 'master-bugs' into 'uat'

20220315-bugs

See merge request eshop/biz_service_ebtp_project!41

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

@@ -8,9 +8,10 @@ import java.util.stream.Collectors;
 
 /**
  * 项目委托推送数据辅助类
+ *
  * @author daixc
- * @date 2020/12/04
  * @version V1.0
+ * @date 2020/12/04
  */
 public class EbpProjectCommonUtil {
 
@@ -209,7 +210,7 @@ public class EbpProjectCommonUtil {
     /**
      * 组织形式转换 MAP
      */
-    public static Map<String,String> ORGANIZATIONAL_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> ORGANIZATIONAL_MAP = new HashMap<String, String>() {{
         put(ORGANIZATIONAL_FORM_001, ProjectCommonUtil.ORGANIZATION_2);
         put(ORGANIZATIONAL_FORM_002, ProjectCommonUtil.ORGANIZATION_1);
     }};
@@ -218,7 +219,7 @@ public class EbpProjectCommonUtil {
     /**
      * 采购类型转换 MAP
      */
-    public static Map<String,String> PROCUREMENT_TYPE_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> PROCUREMENT_TYPE_MAP = new HashMap<String, String>() {{
         put(TARGET_TYPE_001, ProjectCommonUtil.PROCUREMENT_TYPE_1);
         put(TARGET_TYPE_002, ProjectCommonUtil.PROCUREMENT_TYPE_2);
         put(TARGET_TYPE_003, ProjectCommonUtil.PROCUREMENT_TYPE_3);
@@ -228,7 +229,7 @@ public class EbpProjectCommonUtil {
     /**
      * 采购方式转换 MAP
      */
-    public static Map<String,String> PROCUREMENT_MODE_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> PROCUREMENT_MODE_MAP = new HashMap<String, String>() {{
         put(PURC_MODE_001, ProjectCommonUtil.PROCUREMENT_MODE_1);
         put(PURC_MODE_002, ProjectCommonUtil.PROCUREMENT_MODE_2);
         put(PURC_MODE_003, ProjectCommonUtil.PROCUREMENT_MODE_5);
@@ -239,7 +240,7 @@ public class EbpProjectCommonUtil {
     /**
      * 资金来源转换 MAP
      */
-    public static Map<String,String> FUNDS_PROVIDER_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> FUNDS_PROVIDER_MAP = new HashMap<String, String>() {{
         put(FUND_ORIGN_001, ProjectCommonUtil.FUNDS_PROVIDER_2);
         put(FUND_ORIGN_002, ProjectCommonUtil.FUNDS_PROVIDER_1);
         put(FUND_ORIGN_003, ProjectCommonUtil.FUNDS_PROVIDER_3);
@@ -251,7 +252,7 @@ public class EbpProjectCommonUtil {
     /**
      * 比选方式转换 MAP
      */
-    public static Map<String,String> SELECTION_METHOD_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> SELECTION_METHOD_MAP = new HashMap<String, String>() {{
         put(COMPAR_SELECT_MODE_001, ProjectCommonUtil.SELECTION_METHOD_1);
         put(COMPAR_SELECT_MODE_002, ProjectCommonUtil.SELECTION_METHOD_2);
     }};
@@ -259,7 +260,7 @@ public class EbpProjectCommonUtil {
     /**
      * 资审方式转换 MAP
      */
-    public static Map<String,String> EXAMINATION_METHOD_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> EXAMINATION_METHOD_MAP = new HashMap<String, String>() {{
         put(SUPP_QUALIFY_001, ProjectCommonUtil.EXAMINATION_METHOD_1);
         put(SUPP_QUALIFY_002, ProjectCommonUtil.EXAMINATION_METHOD_2);
 //        put(COMPAR_SELECT_MODE_002,ProjectCommonUtil.EXAMINATION_METHOD_3);
@@ -269,7 +270,7 @@ public class EbpProjectCommonUtil {
     /**
      * 评审次数转换 MAP
      */
-    public static Map<String,String> RECRUITMENT_METHOD_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> RECRUITMENT_METHOD_MAP = new HashMap<String, String>() {{
         put(REVIEW_NUM_001, ProjectCommonUtil.RECRUITMENT_METHOD_1);
         put(REVIEW_NUM_002, ProjectCommonUtil.RECRUITMENT_METHOD_2);
         put(REVIEW_NUM_003, ProjectCommonUtil.RECRUITMENT_METHOD_3);
@@ -278,7 +279,7 @@ public class EbpProjectCommonUtil {
     /**
      * 评审方法转换 MAP
      */
-    public static Map<String,String> EVAL_METHOD_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> EVAL_METHOD_MAP = new HashMap<String, String>() {{
         put(SCORE_TYPE_001, ProjectCommonUtil.EVAL_METHOD_1);
         put(SCORE_TYPE_002, ProjectCommonUtil.EVAL_METHOD_2);
     }};
@@ -286,7 +287,7 @@ public class EbpProjectCommonUtil {
     /**
      * 标段异常转换 MAP
      */
-    public static Map<String,String> FAIL_STATUS_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> FAIL_STATUS_MAP = new HashMap<String, String>() {{
         put(ProjectCommonUtil.EXCEPTION_DESC_1, FAIL_STATUS_001);
         put(ProjectCommonUtil.EXCEPTION_DESC_2, FAIL_STATUS_002);
         put(ProjectCommonUtil.EXCEPTION_DESC_3, FAIL_STATUS_003);
@@ -296,13 +297,14 @@ public class EbpProjectCommonUtil {
     /**
      * 招标方式转换 MAP
      */
-    public static Map<String,String> BID_METHOD_MAP = new HashMap<String,String>(){{
+    public static final Map<String, String> BID_METHOD_MAP = new HashMap<String, String>() {{
         put(BID_METHOD_001, ProjectCommonUtil.OPEN_TENDER_FORM_1);
         put(BID_METHOD_002, ProjectCommonUtil.OPEN_TENDER_FORM_2);
     }};
 
     /**
      * 获取map的key
+     *
      * @param map   集合
      * @param value value值
      * @param <K>   泛型 key

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

@@ -5,9 +5,10 @@ import java.util.Map;
 
 /**
  * 询价项目委托推送数据辅助类
+ *
  * @author daixc
- * @date 2020/12/04
  * @version V1.0
+ * @date 2020/12/04
  */
 public class InquiryCommonUtil {
 
@@ -72,11 +73,10 @@ public class InquiryCommonUtil {
     public static final int ANNOUNCEMENT_STATUS = -1;
 
 
-
     /**
      * 组织形式转换 MAP
      */
-    public static Map<Integer,String> IS_DELEGATION_MAP = new HashMap<Integer,String>(){{
+    public static final Map<Integer, String> IS_DELEGATION_MAP = new HashMap<Integer, String>() {{
         put(IS_DELEGATION_0, ProjectCommonUtil.ORGANIZATION_2);
         put(IS_DELEGATION_1, ProjectCommonUtil.ORGANIZATION_1);
     }};
@@ -84,7 +84,7 @@ public class InquiryCommonUtil {
     /**
      * 采购类型转换 MAP
      */
-    public static Map<Integer,String> BID_TYPE_MAP = new HashMap<Integer,String>(){{
+    public static final Map<Integer, String> BID_TYPE_MAP = new HashMap<Integer, String>() {{
         put(BID_TYPE_1, ProjectCommonUtil.PROCUREMENT_TYPE_1);
         put(BID_TYPE_2, ProjectCommonUtil.PROCUREMENT_TYPE_2);
         put(BID_TYPE_3, ProjectCommonUtil.PROCUREMENT_TYPE_3);
@@ -93,14 +93,14 @@ public class InquiryCommonUtil {
     /**
      * 采购方式 MAP
      */
-    public static Map<Integer,String> BUY_WAY_MAP = new HashMap<Integer,String>(){{
+    public static final Map<Integer, String> BUY_WAY_MAP = new HashMap<Integer, String>() {{
         put(BUY_WAY_0, ProjectCommonUtil.PROCUREMENT_MODE_7);
     }};
 
     /**
      * 询价模式 MAP
      */
-    public static Map<Integer,String> INQUIRY_MODEL_MAP = new HashMap<Integer,String>(){{
+    public static final Map<Integer, String> INQUIRY_MODEL_MAP = new HashMap<Integer, String>() {{
         put(INQUIRY_MODEL_0, ProjectCommonUtil.INQUIRY_METHOD_1);
         put(INQUIRY_MODEL_1, ProjectCommonUtil.INQUIRY_METHOD_2);
     }};
@@ -108,7 +108,7 @@ public class InquiryCommonUtil {
     /**
      * 中选方式转换 MAP
      */
-    public static Map<Integer,String> SELECT_TYPE_MAP = new HashMap<Integer,String>(){{
+    public static final Map<Integer, String> SELECT_TYPE_MAP = new HashMap<Integer, String>() {{
         put(SELECT_TYPE_0, ProjectCommonUtil.EVAL_METHOD_2);
         put(SELECT_TYPE_1, ProjectCommonUtil.EVAL_METHOD_1);
     }};

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

@@ -553,7 +553,7 @@ public class ProjectCommonUtil {
      */
     public static final String IS_AGAIN_PURCHASE_1 = "1";
 
-    public static Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{
+    public static final Map<String,String[]> PROCUREMENT_MODE_MAP = new HashMap<String,String[]>(){{
         String[] biddingArray = {PROCUREMENT_MODE_1,PROCUREMENT_MODE_2};
         String[] recruitArray = {PROCUREMENT_MODE_4};
         String[] negotiationArray = {PROCUREMENT_MODE_5,PROCUREMENT_MODE_6};

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

@@ -6,6 +6,7 @@ import lombok.Getter;
 
 /**
  * 项目建档错误提示信息
+ *
  * @author daixc
  * @date 2020/10/10
  */
@@ -13,14 +14,27 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum ProjectlnnerShotExceptionEnum implements BusinessExceptionAssert {
 
+    /**
+     * 暂无此项目建档信息
+     */
     AUCTION_PROJECT_INFORMATION_NONE(200001, "暂无此项目建档信息!"),
+    /**
+     * 查询不到此数据
+     */
     AUCTION_PROJECT_FAILED_TO_QUERY_ITEM_DATA(200002, "查询不到此数据!"),
+    /**
+     * 已参与此竞拍项目
+     */
     AUCTION_PROJECT_CAN_ALREADY(200003, "已参与此竞拍项目!"),
 
+    /**
+     * 再次发起竞拍失败
+     */
     AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN(200004, "再次发起竞拍失败!"),
-    AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN_MATERIAL(200005, "再次发起竞拍失败!")
+    /**
-
+     * 再次发起竞拍失败
-    ;
+     */
+    AUCTION_PROJECT_FAILED_TO_OPEN_AUCTION_AGAIN_MATERIAL(200005, "再次发起竞拍失败!");
 
     /**
      * 返回码

src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallBidClientFallback.java

@@ -1,6 +1,7 @@
 package com.chinaunicom.mall.ebtp.project.feign.fallback;
 
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.project.feign.EbtpMallBidApi;
 import com.chinaunicom.mall.ebtp.project.feign.entity.AgainRoomVO;
@@ -15,8 +16,6 @@ import java.util.List;
 
 
 /**
- *
- *
  * @author yuzining
  * @version 1.0
  * @date 2020-10-05 14:57:11
@@ -28,7 +27,7 @@ public class EbtpMallBidClientFallback implements FallbackFactory<EbtpMallBidApi
 
     @Override
     public EbtpMallBidApi create(Throwable throwable) {
-        throwable.printStackTrace();
+        log.info(ExceptionUtil.stacktraceToString(throwable));
         return new EbtpMallBidApi() {
 
             @Override

src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpMallProcessClientFallback.java

@@ -1,6 +1,7 @@
 package com.chinaunicom.mall.ebtp.project.feign.fallback;
 
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.project.feign.EbtpMallProcessApi;
 import com.chinaunicom.mall.ebtp.project.feign.entity.AgainRoomVO;
@@ -17,8 +18,6 @@ import java.util.Map;
 
 
 /**
- *
- *
  * @author yuzining
  * @version 1.0
  * @date 2020-10-05 14:57:11
@@ -30,7 +29,7 @@ public class EbtpMallProcessClientFallback implements FallbackFactory<EbtpMallPr
 
     @Override
     public EbtpMallProcessApi create(Throwable throwable) {
-        throwable.printStackTrace();
+        log.info(ExceptionUtil.stacktraceToString(throwable));
         return new EbtpMallProcessApi() {
 
             @Override

src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/EbtpProjectClientFallback.java

@@ -1,6 +1,7 @@
 package com.chinaunicom.mall.ebtp.project.feign.fallback;
 
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.project.feign.MallPurpApi;
 import com.chinaunicom.mall.ebtp.project.feign.entity.ProjInvitationFailRequest;
@@ -11,8 +12,6 @@ import org.springframework.stereotype.Component;
 
 
 /**
- *
- *
  * @author yuzining
  * @version 1.0
  * @date 2020-10-05 14:57:11
@@ -24,7 +23,7 @@ public class EbtpProjectClientFallback implements FallbackFactory<MallPurpApi> {
 
     @Override
     public MallPurpApi create(Throwable throwable) {
-        throwable.printStackTrace();
+        log.info(ExceptionUtil.stacktraceToString(throwable));
         return new MallPurpApi() {
             @Override
             public BaseResponse projInvitationFail(ProjInvitationFailRequest failRequest) {

src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/MallResuClientFallback.java

@@ -1,5 +1,6 @@
 package com.chinaunicom.mall.ebtp.project.feign.fallback;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.project.feign.MallResuApi;
 import feign.hystrix.FallbackFactory;
@@ -8,6 +9,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 用友项目中心查询API
+ *
  * @author daixc
  * @date 2021/04/06
  */
@@ -16,7 +18,7 @@ import org.springframework.stereotype.Component;
 public class MallResuClientFallback implements FallbackFactory<MallResuApi> {
     @Override
     public MallResuApi create(Throwable throwable) {
-        throwable.printStackTrace();
+        log.info(ExceptionUtil.stacktraceToString(throwable));
         return new MallResuApi() {
             @Override
             public BaseResponse<Boolean> findStatusByPurpIdForEval(Long purpId) {

src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/PriceQueryApiClientFallback.java

@@ -1,5 +1,6 @@
 package com.chinaunicom.mall.ebtp.project.feign.fallback;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.project.feign.PriceQueryApi;
 import com.chinaunicom.mall.ebtp.project.projectentrust.entity.inquiryentity.InquiryNoticeVO;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 询价接口返回
+ *
  * @author daixc
  * @date 2021/02/19
  */
@@ -17,7 +19,7 @@ import org.springframework.stereotype.Component;
 public class PriceQueryApiClientFallback implements FallbackFactory<PriceQueryApi> {
     @Override
     public PriceQueryApi create(Throwable throwable) {
-        throwable.printStackTrace();
+        log.info(ExceptionUtil.stacktraceToString(throwable));
         return new PriceQueryApi() {
             @Override
             public BaseResponse updateInquiryAllowPublish(InquiryNoticeVO vo) {

src/main/java/com/chinaunicom/mall/ebtp/project/feign/fallback/WfapApiClientFallback.java

@@ -1,5 +1,6 @@
 package com.chinaunicom.mall.ebtp.project.feign.fallback;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
 import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse;
 import com.chinaunicom.mall.ebtp.project.feign.WfapApi;
 import com.chinaunicom.mall.ebtp.project.feign.entity.Approve;
@@ -13,7 +14,7 @@ import org.springframework.stereotype.Component;
 public class WfapApiClientFallback implements FallbackFactory<WfapApi> {
     @Override
     public WfapApi create(Throwable throwable) {
-        throwable.printStackTrace();
+        log.info(ExceptionUtil.stacktraceToString(throwable));
         return new WfapApi() {
             @Override
             public BaseResponse start(Approve approve) {