ariesy 修复bug 70373 70372等

dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java

@@ -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",
+                    map.put("taxAmount", AmountFormatUtil.fmtMicrometer(new BigDecimal(ObjectUtil.fixNull(map.get("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")));
                 }

dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java

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

dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java

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

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/ckzrz/impl/DomesticExportInvoiceCkServiceImpl.java

@@ -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 {
@@ -91,10 +93,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
 
                 String invoiceStatus = (String) map.get("invoiceStatus");
 
-                map.put("xh",
+                map.put("xh", String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
-                    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));
 
@@ -405,10 +409,14 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
                 String invoiceStatus = (String) map.get("invoiceStatus");
                 String bdkStatus = (String) map.get("bdkStatus");
 
-                map.put("xh",
+                map.put("xh", String.valueOf((((page.getCurrent() == 0 ? 1 : page.getCurrent()) - 1) * page.getSize()) + i + 1));
-                    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));

dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java

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