From 5e4a695814bedcc9ed3bb0446f47fe18838a2de1 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Fri, 1 Sep 2023 14:09:29 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E6=9B=B4=E6=8D=A2=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/base/controller/BaseInvoiceController.java   | 4 ++--
 .../base/controller/BaseRzTDxRecordInvoiceController.java | 2 +-
 .../dxhy/base/controller/BaseTDxTaxCurrentController.java | 8 ++++----
 .../dxhy/customs/controller/CustomsJkszhcxController.java | 2 +-
 .../customs/service/impl/CustomsRecordServiceImpl.java    | 5 +++--
 .../model/dto/AuthenticationCheckConditionDTO.java        | 3 ++-
 .../domestic/model/dto/AuthenticationConditionDTO.java    | 3 ++-
 .../com/dxhy/extend/controller/ExtCustomsController.java  | 2 +-
 .../com/dxhy/extend/controller/ExtFpzhcxController.java   | 8 ++++----
 .../dxhy/extend/controller/ExtInvoicePoolController.java  | 6 +++---
 .../com/dxhy/extend/controller/ExtReportController.java   | 8 ++++----
 .../com/dxhy/extend/controller/ExtTicketController.java   | 2 +-
 .../java/com/dxhy/sign/controller/SignFpqsController.java | 8 ++++----
 13 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
index e42d5626..544b70f1 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
@@ -484,7 +484,7 @@ public class BaseInvoiceController extends AbstractController {
     public Object sggxcx(@RequestBody Map<String, Object> map) {
 
         if(map.get("gfsh") == null || "".equals(map.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
 
         if (map.get("companyCode") == null || "".equals(map.get("companyCode"))){
@@ -812,7 +812,7 @@ public class BaseInvoiceController extends AbstractController {
         if (!"99".equals(gfsh) && StringUtils.isNotBlank(gfsh)) {
             pramsMap.put("gfsh", gfsh);
         } else {
-            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         if (invoiceSource != null) {
             if (!"99".equals(invoiceSource)) {
diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
index 97aa3810..1ef25a6d 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
@@ -581,7 +581,7 @@ public class BaseRzTDxRecordInvoiceController extends AbstractController {
     public ResponseEntity<?> brzRecordInvoice(@RequestBody Map<String, Object> map) {
 
         if(map.get("gfsh") == null || "".equals(map.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) map.get("gfsh");
 
diff --git a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java
index 12323426..24211cd2 100644
--- a/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java
+++ b/dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java
@@ -67,7 +67,7 @@ public class BaseTDxTaxCurrentController extends AbstractController {
         if (StringUtils.isNotBlank(gfsh) && !"99".equals(gfsh)) {
             pramsMap.put("gfsh", gfsh);
         } else {
-            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         try {
             return ResponseEntity.ok(R.ok().put("data", baseITDxTaxCurrentService.getTaxCurrent(pramsMap)));
@@ -157,7 +157,7 @@ public class BaseTDxTaxCurrentController extends AbstractController {
         if (!StringHelper.isBlank(gfsh)) {
             pramsMap.put("gfsh", gfsh);
         } else {
-            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         if (!StringHelper.isBlank(sdzt)) {
             pramsMap.put("sdzt", sdzt);
@@ -194,7 +194,7 @@ public class BaseTDxTaxCurrentController extends AbstractController {
         if (!StringHelper.isBlank(gfsh)) {
             pramsMap.put("gfsh", gfsh);
         } else {
-            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         try {
             return ResponseEntity
@@ -223,7 +223,7 @@ public class BaseTDxTaxCurrentController extends AbstractController {
         if (!StringHelper.isBlank(gfsh)) {
             pramsMap.put("gfsh", gfsh);
         } else {
-            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
 
         if (!StringHelper.isBlank(dkse) && new BigDecimal(dkse).intValue() < 0) {
diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsJkszhcxController.java b/dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsJkszhcxController.java
index 3a449c2e..cd6f4a24 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsJkszhcxController.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsJkszhcxController.java
@@ -55,7 +55,7 @@ public class CustomsJkszhcxController extends AbstractController {
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
diff --git a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordServiceImpl.java b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordServiceImpl.java
index 6304d21e..85708ebb 100644
--- a/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordServiceImpl.java
+++ b/dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordServiceImpl.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.dxhy.common.constant.CommonConstants;
 import com.dxhy.common.constant.DbConstant;
 import com.dxhy.common.constant.DictConstant;
 import com.dxhy.common.datasource.config.DynamicContextHolder;
@@ -300,7 +301,7 @@ public class CustomsRecordServiceImpl extends MpBaseServiceImpl<CustomsRecordDao
 
         if (StringUtils.isBlank(entity.getGfTaxNo())) {
             data.put("code", "-1");
-            data.put("msg", "购方税号不能为空");
+            data.put("msg", CommonConstants.GFSH_OR_COMPANYCODE_MISS);
             return RESULT_DATA.putData(data).toJsonBase();
         }
 
@@ -393,7 +394,7 @@ public class CustomsRecordServiceImpl extends MpBaseServiceImpl<CustomsRecordDao
         }
         if (StringUtils.isBlank(entity.getGfTaxNo())) {
             data.put("code", "-1");
-            data.put("msg", "购方税号不能为空");
+            data.put("msg", CommonConstants.GFSH_OR_COMPANYCODE_MISS);
             return new ResultData().putData(data).toJsonBase();
         }
 
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationCheckConditionDTO.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationCheckConditionDTO.java
index 168f219f..150d20b7 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationCheckConditionDTO.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationCheckConditionDTO.java
@@ -1,5 +1,6 @@
 package com.dxhy.domestic.model.dto;
 
+import com.dxhy.common.constant.CommonConstants;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +20,7 @@ import java.util.List;
 @ApiModel("退税认证查询接口参数")
 public class AuthenticationCheckConditionDTO extends PageInfo implements Serializable {
 
-    @NotBlank(message = "购方税号不能为空")
+    @NotBlank(message = CommonConstants.GFSH_OR_COMPANYCODE_MISS)
     @ApiModelProperty("购方税号，页面“购方名称”下拉框中购方名称相应税号")
     private String gfsh;
 
diff --git a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationConditionDTO.java b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationConditionDTO.java
index 6dd3e97b..9c9ad9a2 100644
--- a/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationConditionDTO.java
+++ b/dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationConditionDTO.java
@@ -1,5 +1,6 @@
 package com.dxhy.domestic.model.dto;
 
+import com.dxhy.common.constant.CommonConstants;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +18,7 @@ import java.util.List;
 @ApiModel("手工认证列表查询参数")
 public class AuthenticationConditionDTO extends PageInfo implements Serializable {
 
-    @NotBlank(message = "购方税号不能为空")
+    @NotBlank(message = CommonConstants.GFSH_OR_COMPANYCODE_MISS)
     @ApiModelProperty("购方税号，页面“购方名称”下拉框中购方名称相应税号,默认99")
     private String gfsh;
 
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java
index 638bed88..79350fda 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java
@@ -51,7 +51,7 @@ public class ExtCustomsController extends AbstractController {
 
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
index 7d8cdfd2..30d3526b 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
@@ -106,7 +106,7 @@ public class ExtFpzhcxController extends AbstractController {
         pramsMap.put("dbName", getUserInfo().getDbName());
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
@@ -240,7 +240,7 @@ public class ExtFpzhcxController extends AbstractController {
         data.put("inAccountStatus",pramsMap.get("inAccountStatus"));
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         data.put("gfsh", gfsh);
@@ -370,7 +370,7 @@ public class ExtFpzhcxController extends AbstractController {
     public Object listYcBbFpxx(@RequestBody Map<String, Object> pramsMap) {
 
         if (StringUtils.isBlank((String) pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         Map<String, Object> data = new HashMap<>(16);
         data.put("dbName", getUserInfo().getDbName());
@@ -593,7 +593,7 @@ public class ExtFpzhcxController extends AbstractController {
         pramsMap.put("dbName", getUserInfo().getDbName());
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
index f40a0bca..7531032f 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
@@ -57,7 +57,7 @@ public class ExtInvoicePoolController extends AbstractController {
         pramsMap.put("dbName", getUserInfo().getDbName());
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh")) || "99".equals(pramsMap.get("gfsh").toString())){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
@@ -146,7 +146,7 @@ public class ExtInvoicePoolController extends AbstractController {
         log.info("其他发票采集接收参数 {}",pramsMap);
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh")) || "99".equals(pramsMap.get("gfsh").toString())){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
@@ -203,7 +203,7 @@ public class ExtInvoicePoolController extends AbstractController {
         pramsMap.put("dbName", getUserInfo().getDbName());
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh")) || "99".equals(pramsMap.get("gfsh").toString())){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtReportController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtReportController.java
index ed3d14d4..0cfc8979 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtReportController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtReportController.java
@@ -171,7 +171,7 @@ public class ExtReportController extends AbstractController {
 
         data.put("dbName", getUserInfo().getDbName());
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         data.put("gfsh", gfsh);
@@ -220,7 +220,7 @@ public class ExtReportController extends AbstractController {
         data.put("dbName", getUserInfo().getDbName());
         data.put("businessCode", pramsMap.get("businessCode"));
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         data.put("gfsh", gfsh);
@@ -315,7 +315,7 @@ public class ExtReportController extends AbstractController {
         data.put("business", getUserInfo().getBusiness());
         data.put("businessCode", pramsMap.get("businessCode"));
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         data.put("gfsh", gfsh);
@@ -365,7 +365,7 @@ public class ExtReportController extends AbstractController {
         data.put("business", getUserInfo().getBusiness());
         data.put("businessCode", pramsMap.get("businessCode"));
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         data.put("gfsh", gfsh);
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java
index dafe1849..59f876f4 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java
@@ -52,7 +52,7 @@ public class ExtTicketController extends AbstractController {
         paramsMap.put("dbName", getUserInfo().getDbName());
 
         if(paramsMap.get("gfsh") == null || "".equals(paramsMap.get("gfsh")) || "99".equals(paramsMap.get("gfsh").toString())){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) paramsMap.get("gfsh");
         paramsMap.put("gfsh", gfsh);
diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
index 1848a4c1..f6c72bc6 100644
--- a/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
+++ b/dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.java
@@ -85,7 +85,7 @@ public class SignFpqsController extends AbstractController {
 //            }
 //        }
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         pramsMap.put("gfsh", gfsh);
@@ -484,7 +484,7 @@ public class SignFpqsController extends AbstractController {
 
         if (pramsMap.get("gfsh") != null && pramsMap.get("gfsh").isEmpty()) {
 
-            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
 
 
@@ -599,7 +599,7 @@ public class SignFpqsController extends AbstractController {
         data.put("dbName", getUserInfo().getDbName());
 
         if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-            return ResponseEntity.ok(R.error("购方税号不能为空"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
         String gfsh = (String) pramsMap.get("gfsh");
         data.put("gfsh", gfsh);
@@ -1234,7 +1234,7 @@ public class SignFpqsController extends AbstractController {
 
         if (pramsMap.get("gfsh") != null && pramsMap.get("gfsh").isEmpty()) {
 
-            return ResponseEntity.ok(R.error("购方税号不能为空！"));
+            return ResponseEntity.ok(R.error(CommonConstants.GFSH_OR_COMPANYCODE_MISS));
         }
 
         if (pramsMap.get("xfsh") != null && pramsMap.get("xfsh").isEmpty()) {