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

ariesy 修复bug 70373 70372等

Browse Source
release
yefei 2 years ago
parent a8473e6596
commit 1e6723bcf3
5 changed files with 92 additions and 63 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. 14
      dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
  2. 6
      dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
  3. 4
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
  4. 62
      dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
  5. 7
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java

14
dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
Unescape View File

@ -548,16 +548,24 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl<CustomsRecordDao,
// map.put("auditStatus", AuditStatusEnum.getVal(ObjectUtil.fixNull(map.get("auditStatus"))));
// map.put("applyCheck", ApplyCheckEnum.getVal(ObjectUtil.fixNull(map.get("applyCheck"))));
// map.put("checkStatus", CheckStatusEnum.getVal(ObjectUtil.fixNull(map.get("checkStatus"))));
log.info("taxAmount-{}",map.get("taxAmount"));
if (map.get("taxAmount") == null || "".equals(map.get("taxAmount"))) {
map.put("taxAmount", "0.00");
} else {
map.put("taxAmount",
AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(map.get("taxAmount")))
map.put("taxAmount", AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(map.get("taxAmount")))
.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
}
if (map.get("fillInDate") != null) {
map.put("fillInDate", sdf.format(map.get("fillInDate")));
String fillInDate = map.get("fillInDate").toString();
log.info("fillInDate={}", fillInDate);
if (fillInDate.length() > 10)
fillInDate = fillInDate.substring(0, 10);
if (fillInDate != null && StringUtils.isNotBlank(fillInDate))
map.put("invoiceDate", sdf.format(fillInDate));
}
if (map.get("qsDate") != null) {
map.put("qsDate", sdf.format(map.get("qsDate")));
}

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

@ -322,8 +322,14 @@ public class SDNYMainProcessController extends AbstractController {
invoice.setPassenger(snInvoice.getRiderName());
invoice.setDepartCity(snInvoice.getStationGetOn());
invoice.setArriveCity(snInvoice.getStationGetOff());
if("92".equals(invoice.getInvoiceTypeCode())){
if(snInvoice.getAmountTax() != null)
invoice.setInvoiceAmount(new BigDecimal(snInvoice.getAmountTax()));
}
if("90".equals(invoice.getInvoiceTypeCode())) {
invoice.setFare(snInvoice.getNoTaxAmount());
invoice.setFuelSurcharge(snInvoice.getFuelSurcharge());
}
if(snInvoice.getNoTaxAmount() != null){
BigDecimal amount = new BigDecimal(snInvoice.getNoTaxAmount());
invoice.setInvoiceAmount(amount);

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

@ -583,7 +583,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
// 计算税额
// 航空客票：税额=（票价+燃油附加费）÷（1+9%）×9%
if (invoiceInfo.getInvoiceTypeCode().equals(Constant.AIR_PASSENGER_ELECTRONIC_TICKET_ITINERARY_CODE)) {
if (!StringUtils.isNotEmpty(invoiceInfo.getFare()) && isBigDecimal(invoiceInfo.getFare())
if (StringUtils.isNotEmpty(invoiceInfo.getFare()) && isBigDecimal(invoiceInfo.getFare())
&& StringUtils.isNotEmpty(invoiceInfo.getFuelSurcharge())
&& isBigDecimal(invoiceInfo.getFuelSurcharge())) {
// 票价
@ -614,7 +614,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
invoiceInfo.setInvoiceAmount(invoiceInfo.getInvoiceAmount().subtract(invoiceInfo.getTaxAmount()));
}
} else {
if (!StringUtils.isNotEmpty(invoiceInfo.getFare()) && isBigDecimal(invoiceInfo.getFare())
if (StringUtils.isNotEmpty(invoiceInfo.getFare()) && isBigDecimal(invoiceInfo.getFare())
&& StringUtils.isNotEmpty(invoiceInfo.getFuelSurcharge())
&& isBigDecimal(invoiceInfo.getFuelSurcharge())) {
// 票价

62
dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java
Unescape View File

@ -7,6 +7,7 @@ import java.util.*;
import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
@ -44,6 +45,7 @@ import cn.hutool.core.codec.Base64;
* @author dxhy
*/
@SuppressWarnings("AlibabaMethodTooLong")
@Slf4j
@Service
public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExportInvoiceDao, TdxExportInvoice>
implements DomesticExportInvoiceCkService {
@ -89,20 +91,22 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
for (int i = 0; i < page.getRecords().size(); i++) {
Map<String, Object> map = result.getRecords().get(i);
String invoiceStatus = (String)map.get("invoiceStatus");
String invoiceStatus = (String) map.get("invoiceStatus");
map.put("xh",
String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
map.put("xh", String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
if (map.get("invoiceDate") != null) {
map.put("invoiceDate", sdf.format(map.get("invoiceDate")));
String invoiceDate = map.get("invoiceDate").toString();
log.info("invoiceDate={}", invoiceDate);
if (invoiceDate != null && StringUtils.isNotBlank(invoiceDate))
map.put("invoiceDate", sdf.format(invoiceDate));
}
map.put("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
map.put("exportAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportAmount")).toPlainString())));
map.put("exportTaxAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportTaxAmount")).toPlainString())));
map.put("exportYxse", MathUtil.round(((BigDecimal)map.get("exportYxse")).toPlainString()));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportTaxAmount")).toPlainString())));
map.put("exportYxse", MathUtil.round(((BigDecimal) map.get("exportYxse")).toPlainString()));
map.put("select", true);
map.put("upgradeStatus", "1");
@ -128,7 +132,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
tDxDkCount = tdxDkCounts.get(0);
if (!DateUtil.isInTwoDate(tDxTaxCurrent.getSelectStartDate(), tDxTaxCurrent.getSelectEndDate(),
(String)map.get("invoiceDate"))) {
(String) map.get("invoiceDate"))) {
map.put("select", false);
continue;
}
@ -400,15 +404,19 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
for (int i = 0; i < page.getRecords().size(); i++) {
Map<String, Object> map = result.getRecords().get(i);
String authStatus = (String)map.get("authStatus");
String cxbdkStatus = (String)map.get("cxbdkStatus");
String invoiceStatus = (String)map.get("invoiceStatus");
String bdkStatus = (String)map.get("bdkStatus");
String authStatus = (String) map.get("authStatus");
String cxbdkStatus = (String) map.get("cxbdkStatus");
String invoiceStatus = (String) map.get("invoiceStatus");
String bdkStatus = (String) map.get("bdkStatus");
map.put("xh",
String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
map.put("xh", String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
if (map.get("invoiceDate") != null) {
map.put("invoiceDate", sdf.format(map.get("invoiceDate")));
String invoiceDate = map.get("invoiceDate").toString();
if (invoiceDate.length() > 10)
invoiceDate = invoiceDate.substring(0, 10);
log.info("invoiceDate={}", invoiceDate);
if (invoiceDate != null && StringUtils.isNotBlank(invoiceDate))
map.put("invoiceDate", sdf.format(invoiceDate));
}
// 字典转换
map.put("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
@ -416,11 +424,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_UNDO_STATUS, cxbdkStatus));
map.put("exportAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportAmount")).toPlainString())));
map.put("exportTaxAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportTaxAmount")).toPlainString())));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportTaxAmount")).toPlainString())));
map.put("exportYxse", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportYxse")).toPlainString())));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportYxse")).toPlainString())));
map.put("select", true);
TdxDkCount tDxDkCount;
@ -463,7 +471,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
}
}
String invoiceDate = (String)map.get("invoiceDate");
String invoiceDate = (String) map.get("invoiceDate");
if (!DateUtil.isInTwoDate(tDxTaxCurrent.getSelectStartDate(), tDxTaxCurrent.getSelectEndDate(),
invoiceDate)) {
map.put("select", false);
@ -514,11 +522,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
for (int i = 0; i < page.getRecords().size(); i++) {
Map<String, Object> map = result.getRecords().get(i);
String bdkStatus = (String)map.get("bdkStatus");
String cxrzStatus = (String)map.get("cxrzStatus");
String rzhYesorno = (String)map.get("rzhYesorno");
String invoiceStatus = (String)map.get("invoiceStatus");
String authStatus = (String)map.get("authStatus");
String bdkStatus = (String) map.get("bdkStatus");
String cxrzStatus = (String) map.get("cxrzStatus");
String rzhYesorno = (String) map.get("rzhYesorno");
String invoiceStatus = (String) map.get("invoiceStatus");
String authStatus = (String) map.get("authStatus");
map.put("xh",
String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
@ -539,11 +547,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
map.put("bdkStatusBak", bdkStatus);
map.put("exportAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString())));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportAmount")).toPlainString())));
map.put("exportTaxAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportTaxAmount")).toPlainString())));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportTaxAmount")).toPlainString())));
map.put("exportYxse", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportYxse")).toPlainString())));
.fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportYxse")).toPlainString())));
map.put("select", true);
TdxDkCount tDxDkCount;

7
dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
Unescape View File

@ -67,6 +67,13 @@ public class ExtInvoicePoolController extends AbstractController {
if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) {
pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString())));
}
if (pramsMap.get("accountPeriod") != null && !"".equals(pramsMap.get("accountPeriod"))) {
String accountPeriod = pramsMap.get("accountPeriod").toString().substring(0,7);
pramsMap.put("accountPeriod", accountPeriod);
log.info("accountPeriod:{}",accountPeriod);
}
if (pramsMap.get("kpjsrq") != null && !"".equals(pramsMap.get("kpjsrq"))) {
pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(pramsMap.get("kpjsrq").toString())));
}

Write Preview
Loading…
Cancel
Save