luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ariesy 优化代码

Browse Source
release
yefei 2 years ago
parent d77070c457
commit c16225c4da
2 changed files with 28 additions and 39 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 33
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  2. 34
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

33
dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
Unescape View File

@ -116,7 +116,7 @@ public class SDNYMainProcessController extends AbstractController {
log.info("传入的参数为:{}", pramsMap); log.info("传入的参数为:{}", pramsMap);
String userid = "101833"; String userid = "101833";
String dbName = "business"; String dbName = "business";
JSONObject checkInvoiceResult = null; JSONObject checkInvoiceResult = new JSONObject();
//挡板开关 //挡板开关
if ("1".equals(isPresure)) { if ("1".equals(isPresure)) {
@ -496,7 +496,7 @@ public class SDNYMainProcessController extends AbstractController {
taxRateDetail = "0"; taxRateDetail = "0";
snDetailMap.put("taxRate", taxRateDetail); snDetailMap.put("taxRate", taxRateDetail);
} else { } else {
if (detail.get("taxRate") != null && StringUtils.isNoneBlank(detail.get("taxRate").toString())) { if (StringUtils.isNoneBlank(detail.get("taxRate").toString())) {
try { try {
taxRateDetail = detail.get("taxRate").toString(); taxRateDetail = detail.get("taxRate").toString();
if (!"0".equals(taxRateDetail)) { if (!"0".equals(taxRateDetail)) {
@ -504,33 +504,24 @@ public class SDNYMainProcessController extends AbstractController {
int index = taxRateDetail.indexOf("%"); int index = taxRateDetail.indexOf("%");
if (index > 0) { if (index > 0) {
taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1);
Float num = Float.parseFloat(taxRateDetail); // Float num = Float.parseFloat(taxRateDetail);
if (num > 9) { // if (num > 9) {
taxRateDetail = "0." + taxRateDetail; // taxRateDetail = "0." + taxRateDetail;
} else { // } else {
if (!taxRateDetail.startsWith("0")) { // if (!taxRateDetail.startsWith("0")) {
taxRateDetail = "0.0" + taxRateDetail; // taxRateDetail = "0.0" + taxRateDetail;
} // }
} // }
} else {
Float num = Float.parseFloat(taxRateDetail);
if (num > 9) {
taxRateDetail = "0." + taxRateDetail;
} else {
if (!taxRateDetail.startsWith("0")) {
taxRateDetail = "0.0" + taxRateDetail;
}
}
} }
} }
} }
}catch (Exception e){ }catch (Exception e){
log.error("报错的原因为:{}",e); log.error("报错的原因为:{}",e);
taxRateDetail = "0.00"; taxRateDetail = "0";
} }
if ("11".equals(invoiceType)) { if ("11".equals(invoiceType)) {
taxRateDetail = "0.000"; taxRateDetail = "0";
} }
log.info("明细-发票税率为:{}", taxRateDetail); log.info("明细-发票税率为:{}", taxRateDetail);
snDetailMap.put("taxRate", taxRateDetail); snDetailMap.put("taxRate", taxRateDetail);

34
dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
Unescape View File

@ -459,20 +459,18 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
jsonObject.put("tonnage", invoiceData.get("dw")); jsonObject.put("tonnage", invoiceData.get("dw"));
jsonObject.put("limitPeople", invoiceData.get("xcrs")); jsonObject.put("limitPeople", invoiceData.get("xcrs"));
String taxRate = ""; String taxRate = "";
if (invoiceData.get("sl") == null || StringUtils.isBlank(invoiceData.get("sl").toString()) || if (StringUtils.isBlank(invoiceData.get("sl").toString()) || "免税".equals(invoiceData.get("sl").toString()) || "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) {
"免税".equals(invoiceData.get("sl").toString()) || "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) {
taxRate = "0"; taxRate = "0";
jsonObject.put("taxRate", taxRate); jsonObject.put("taxRate", taxRate);
} else { } else {
if (invoiceData.get("sl") != null && StringUtils.isNoneBlank(invoiceData.get("sl").toString())) { if (StringUtils.isNoneBlank(invoiceData.get("sl").toString())) {
taxRate = invoiceData.get("sl").toString(); taxRate = invoiceData.get("sl").toString();
if (!"0".equals(taxRate)) { if (!"0".equals(taxRate)) {
taxRate = "0." + taxRate;
taxRate = taxRate.substring(0, taxRate.length() - 1); taxRate = taxRate.substring(0, taxRate.length() - 1);
} }
if ("11".equals(invoiceType)) { if ("11".equals(invoiceType)) {
taxRate = "0.000"; taxRate = "0";
} }
log.info("明细-发票税率为:{}", taxRate); log.info("明细-发票税率为:{}", taxRate);
jsonObject.put("taxRate", taxRate); jsonObject.put("taxRate", taxRate);
@ -557,27 +555,27 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
taxRateDetail = "0"; taxRateDetail = "0";
snDetailMap.put("taxRate", taxRateDetail); snDetailMap.put("taxRate", taxRateDetail);
} else { } else {
if (detail.get("sl") != null && StringUtils.isNoneBlank(detail.get("sl").toString())) { if (StringUtils.isNoneBlank(detail.get("sl").toString())) {
taxRateDetail = detail.get("sl").toString(); taxRateDetail = detail.get("sl").toString();
if (!"0".equals(taxRateDetail)) { if (!"0".equals(taxRateDetail)) {
if (StringUtils.isNoneBlank(taxRateDetail)) { if (StringUtils.isNoneBlank(taxRateDetail)) {
int index = taxRateDetail.indexOf("%"); int index = taxRateDetail.indexOf("%");
if (index > 0) { // if (index > 0) {
taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1); // taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1);
Float num = Float.parseFloat(taxRateDetail); // Float num = Float.parseFloat(taxRateDetail);
if (num > 9) { // if (num > 9) {
taxRateDetail = "0." + taxRateDetail; // taxRateDetail = "0." + taxRateDetail;
} else { // } else {
if (!taxRateDetail.startsWith("0")) { // if (!taxRateDetail.startsWith("0")) {
taxRateDetail = "0.0" + taxRateDetail; // taxRateDetail = "0.0" + taxRateDetail;
} // }
} // }
} // }
} }
} }
if ("11".equals(invoiceType)) { if ("11".equals(invoiceType)) {
taxRateDetail = "0.000"; taxRateDetail = "0";
} }
log.info("明细-发票税率为:{}", taxRateDetail); log.info("明细-发票税率为:{}", taxRateDetail);
snDetailMap.put("taxRate", taxRateDetail); snDetailMap.put("taxRate", taxRateDetail);

Write Preview
Loading…
Cancel
Save