ariesy 更换提示信息

release
yefei 2 years ago
parent 71fb5919b1
commit 5e4a695814
  1. 4
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
  2. 2
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseRzTDxRecordInvoiceController.java
  3. 8
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseTDxTaxCurrentController.java
  4. 2
      dxhy-customs/src/main/java/com/dxhy/customs/controller/CustomsJkszhcxController.java
  5. 5
      dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordServiceImpl.java
  6. 3
      dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationCheckConditionDTO.java
  7. 3
      dxhy-export-domestic/src/main/java/com/dxhy/domestic/model/dto/AuthenticationConditionDTO.java
  8. 2
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtCustomsController.java
  9. 8
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
  10. 6
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
  11. 8
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtReportController.java
  12. 2
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtTicketController.java
  13. 8
      dxhy-sign/src/main/java/com/dxhy/sign/controller/SignFpqsController.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)) {

@ -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");

@ -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) {

@ -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);

@ -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();
}

@ -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;

@ -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;

@ -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);

@ -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);

@ -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);

@ -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);

@ -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);

@ -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()) {

Loading…
Cancel
Save