ariesy 修复bug 70373 70372等

release
yefei 2 years ago
parent a8473e6596
commit 1e6723bcf3
  1. 14
      dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsSignServiceImpl.java
  2. 10
      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. 120
      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

@ -548,16 +548,24 @@ public class CustomsSignServiceImpl extends MpBaseServiceImpl<CustomsRecordDao,
// map.put("auditStatus", AuditStatusEnum.getVal(ObjectUtil.fixNull(map.get("auditStatus")))); // map.put("auditStatus", AuditStatusEnum.getVal(ObjectUtil.fixNull(map.get("auditStatus"))));
// map.put("applyCheck", ApplyCheckEnum.getVal(ObjectUtil.fixNull(map.get("applyCheck")))); // map.put("applyCheck", ApplyCheckEnum.getVal(ObjectUtil.fixNull(map.get("applyCheck"))));
// map.put("checkStatus", CheckStatusEnum.getVal(ObjectUtil.fixNull(map.get("checkStatus")))); // 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"))) { if (map.get("taxAmount") == null || "".equals(map.get("taxAmount"))) {
map.put("taxAmount", "0.00"); map.put("taxAmount", "0.00");
} else { } 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())); .setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
} }
if (map.get("fillInDate") != null) { 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) { if (map.get("qsDate") != null) {
map.put("qsDate", sdf.format(map.get("qsDate"))); map.put("qsDate", sdf.format(map.get("qsDate")));
} }

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

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

@ -7,6 +7,7 @@ import java.util.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -44,9 +45,10 @@ import cn.hutool.core.codec.Base64;
* @author dxhy * @author dxhy
*/ */
@SuppressWarnings("AlibabaMethodTooLong") @SuppressWarnings("AlibabaMethodTooLong")
@Slf4j
@Service @Service
public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExportInvoiceDao, TdxExportInvoice> public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExportInvoiceDao, TdxExportInvoice>
implements DomesticExportInvoiceCkService { implements DomesticExportInvoiceCkService {
@Resource @Resource
private DomesticTaxCurrentService domesticTaxCurrentService; private DomesticTaxCurrentService domesticTaxCurrentService;
@ -62,7 +64,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
@Override @Override
public String queryVatSgrz(Page page, TdxExportInvoiceModelDTO dto, UserInfo userInfo) throws Exception { public String queryVatSgrz(Page page, TdxExportInvoiceModelDTO dto, UserInfo userInfo) throws Exception {
DynamicContextHolder DynamicContextHolder
.push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ); .push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ);
dto.setParam(page, userInfo); dto.setParam(page, userInfo);
ResultData<Object> resultData = new ResultData<>(); ResultData<Object> resultData = new ResultData<>();
@ -89,27 +91,29 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
for (int i = 0; i < page.getRecords().size(); i++) { for (int i = 0; i < page.getRecords().size(); i++) {
Map<String, Object> map = result.getRecords().get(i); Map<String, Object> map = result.getRecords().get(i);
String invoiceStatus = (String)map.get("invoiceStatus"); 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) { 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("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
map.put("exportAmount", AmountFormatUtil map.put("exportAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportAmount")).toPlainString())));
map.put("exportTaxAmount", AmountFormatUtil map.put("exportTaxAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportTaxAmount")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportTaxAmount")).toPlainString())));
map.put("exportYxse", MathUtil.round(((BigDecimal)map.get("exportYxse")).toPlainString())); map.put("exportYxse", MathUtil.round(((BigDecimal) map.get("exportYxse")).toPlainString()));
map.put("select", true); map.put("select", true);
map.put("upgradeStatus", "1"); map.put("upgradeStatus", "1");
TdxDkCount tDxDkCount; TdxDkCount tDxDkCount;
TdxTaxCurrent tDxTaxCurrent; TdxTaxCurrent tDxTaxCurrent;
List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService
.list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, map.get("gfTaxNo"))); .list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, map.get("gfTaxNo")));
if (tdxTaxCurrents == null || tdxTaxCurrents.size() == 0) { if (tdxTaxCurrents == null || tdxTaxCurrents.size() == 0) {
map.put("select", false); map.put("select", false);
@ -117,8 +121,8 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
} }
tDxTaxCurrent = tdxTaxCurrents.get(0); tDxTaxCurrent = tdxTaxCurrents.get(0);
List<TdxDkCount> tdxDkCounts = domesticDkCountService List<TdxDkCount> tdxDkCounts = domesticDkCountService
.list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, map.get("gfTaxNo")) .list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, map.get("gfTaxNo"))
.eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod())); .eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod()));
if (tdxDkCounts == null || tdxDkCounts.size() == 0) { if (tdxDkCounts == null || tdxDkCounts.size() == 0) {
map.put("select", false); map.put("select", false);
@ -128,7 +132,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
tDxDkCount = tdxDkCounts.get(0); tDxDkCount = tdxDkCounts.get(0);
if (!DateUtil.isInTwoDate(tDxTaxCurrent.getSelectStartDate(), tDxTaxCurrent.getSelectEndDate(), if (!DateUtil.isInTwoDate(tDxTaxCurrent.getSelectStartDate(), tDxTaxCurrent.getSelectEndDate(),
(String)map.get("invoiceDate"))) { (String) map.get("invoiceDate"))) {
map.put("select", false); map.put("select", false);
continue; continue;
} }
@ -180,7 +184,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
// 1.查询数据 // 1.查询数据
DynamicContextHolder DynamicContextHolder
.push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ); .push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ);
List<TdxExportInvoice> records = new ArrayList<>(); List<TdxExportInvoice> records = new ArrayList<>();
// 2.校验 // 2.校验
List<String> dkList = new ArrayList<>(); List<String> dkList = new ArrayList<>();
@ -207,20 +211,20 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
TdxTaxCurrent tDxTaxCurrent; TdxTaxCurrent tDxTaxCurrent;
TdxDkCount tDxDkCount; TdxDkCount tDxDkCount;
List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService
.list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, record.getGfTaxNo())); .list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, record.getGfTaxNo()));
tDxTaxCurrent = tdxTaxCurrents.get(0); tDxTaxCurrent = tdxTaxCurrents.get(0);
List<TdxDkCount> tdxDkCounts = domesticDkCountService List<TdxDkCount> tdxDkCounts = domesticDkCountService
.list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, record.getGfTaxNo()) .list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, record.getGfTaxNo())
.eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod())); .eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod()));
tDxDkCount = tdxDkCounts.get(0); tDxDkCount = tdxDkCounts.get(0);
InvoiceLog invoiceLog = new InvoiceLog(); InvoiceLog invoiceLog = new InvoiceLog();
// 认证抵扣 // 认证抵扣
if ("1".equals(dto.getRzlx())) { if ("1".equals(dto.getRzlx())) {
if (Double.parseDouble(yxTaxAmount) <= 0 if (Double.parseDouble(yxTaxAmount) <= 0
|| Double.parseDouble(yxTaxAmount) > record.getExportTaxAmount().doubleValue()) { || Double.parseDouble(yxTaxAmount) > record.getExportTaxAmount().doubleValue()) {
sb.append(record.getInvoiceNo()).append(" \n "); sb.append(record.getInvoiceNo()).append(" \n ");
flag = true; flag = true;
continue; continue;
@ -246,7 +250,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
// 判断抵扣限额 // 判断抵扣限额
if (tDxTaxCurrent.getLimitDkse() != null if (tDxTaxCurrent.getLimitDkse() != null
&& tDxTaxCurrent.getLimitDkse().compareTo(BigDecimal.ZERO) != 0) { && tDxTaxCurrent.getLimitDkse().compareTo(BigDecimal.ZERO) != 0) {
if (!dkList.contains(record.getGfTaxNo())) { if (!dkList.contains(record.getGfTaxNo())) {
Map<String, Object> paramMap = new HashMap<>(16); Map<String, Object> paramMap = new HashMap<>(16);
@ -332,7 +336,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
} }
// 3.更新数据 // 3.更新数据
DynamicContextHolder DynamicContextHolder
.push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_WRITE); .push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_WRITE);
if (!flag && !flag1 && !flag2 && !flag3) { if (!flag && !flag1 && !flag2 && !flag3) {
for (TdxExportInvoice record : records) { for (TdxExportInvoice record : records) {
@ -358,11 +362,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
} }
resultMap.put("total", AmountFormatUtil.fmtMicrometer(String.valueOf(total))); resultMap.put("total", AmountFormatUtil.fmtMicrometer(String.valueOf(total)));
resultMap.put("hjje", resultMap.put("hjje",
AmountFormatUtil.fmtMicrometer(hjje.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); AmountFormatUtil.fmtMicrometer(hjje.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
resultMap.put("hjse", resultMap.put("hjse",
AmountFormatUtil.fmtMicrometer(hjse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); AmountFormatUtil.fmtMicrometer(hjse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
resultMap.put("hjyxse", resultMap.put("hjyxse",
AmountFormatUtil.fmtMicrometer(hjyxse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); AmountFormatUtil.fmtMicrometer(hjyxse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
resultMap.put("message", message); resultMap.put("message", message);
if (logList.size() > 0) { if (logList.size() > 0) {
invoiceLogService.toInvoiceLog(logList); invoiceLogService.toInvoiceLog(logList);
@ -373,7 +377,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
@Override @Override
public String queryVatBdk(Page page, TdxExportInvoiceModelDTO dto, UserInfo userInfo) throws Exception { public String queryVatBdk(Page page, TdxExportInvoiceModelDTO dto, UserInfo userInfo) throws Exception {
DynamicContextHolder DynamicContextHolder
.push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ); .push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ);
dto.setParam(page, userInfo); dto.setParam(page, userInfo);
JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(dto.getCompany(), dto.getMenuId()); JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(dto.getCompany(), dto.getMenuId());
@ -400,15 +404,19 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
for (int i = 0; i < page.getRecords().size(); i++) { for (int i = 0; i < page.getRecords().size(); i++) {
Map<String, Object> map = result.getRecords().get(i); Map<String, Object> map = result.getRecords().get(i);
String authStatus = (String)map.get("authStatus"); String authStatus = (String) map.get("authStatus");
String cxbdkStatus = (String)map.get("cxbdkStatus"); String cxbdkStatus = (String) map.get("cxbdkStatus");
String invoiceStatus = (String)map.get("invoiceStatus"); String invoiceStatus = (String) map.get("invoiceStatus");
String bdkStatus = (String)map.get("bdkStatus"); 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) { 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)); map.put("invoiceStatus", dictdetaServcice.queryDictName(DictConstant.INVOICE_STATUS, invoiceStatus));
@ -416,17 +424,17 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_UNDO_STATUS, cxbdkStatus)); map.put("cxbdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_UNDO_STATUS, cxbdkStatus));
map.put("exportAmount", AmountFormatUtil map.put("exportAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportAmount")).toPlainString())));
map.put("exportTaxAmount", AmountFormatUtil map.put("exportTaxAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportTaxAmount")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportTaxAmount")).toPlainString())));
map.put("exportYxse", AmountFormatUtil map.put("exportYxse", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportYxse")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportYxse")).toPlainString())));
map.put("select", true); map.put("select", true);
TdxDkCount tDxDkCount; TdxDkCount tDxDkCount;
TdxTaxCurrent tDxTaxCurrent; TdxTaxCurrent tDxTaxCurrent;
List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService
.list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, map.get("gfTaxNo"))); .list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, map.get("gfTaxNo")));
if (tdxTaxCurrents == null || tdxTaxCurrents.size() == 0) { if (tdxTaxCurrents == null || tdxTaxCurrents.size() == 0) {
map.put("select", false); map.put("select", false);
@ -434,8 +442,8 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
} }
tDxTaxCurrent = tdxTaxCurrents.get(0); tDxTaxCurrent = tdxTaxCurrents.get(0);
List<TdxDkCount> tdxDkCounts = domesticDkCountService List<TdxDkCount> tdxDkCounts = domesticDkCountService
.list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, map.get("gfTaxNo")) .list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, map.get("gfTaxNo"))
.eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod())); .eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod()));
if (tdxDkCounts == null || tdxDkCounts.size() == 0) { if (tdxDkCounts == null || tdxDkCounts.size() == 0) {
map.put("select", false); map.put("select", false);
@ -447,7 +455,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
// 认证不抵扣 // 认证不抵扣
if ("0".equals(dto.getSfDkStatus())) { if ("0".equals(dto.getSfDkStatus())) {
if (!"0".equals(authStatus) && !"4".equals(authStatus) && !"5".equals(authStatus) if (!"0".equals(authStatus) && !"4".equals(authStatus) && !"5".equals(authStatus)
&& !"6".equals(authStatus)) { && !"6".equals(authStatus)) {
map.put("select", false); map.put("select", false);
continue; continue;
} }
@ -463,9 +471,9 @@ 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(), if (!DateUtil.isInTwoDate(tDxTaxCurrent.getSelectStartDate(), tDxTaxCurrent.getSelectEndDate(),
invoiceDate)) { invoiceDate)) {
map.put("select", false); map.put("select", false);
continue; continue;
} }
@ -514,11 +522,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
for (int i = 0; i < page.getRecords().size(); i++) { for (int i = 0; i < page.getRecords().size(); i++) {
Map<String, Object> map = result.getRecords().get(i); Map<String, Object> map = result.getRecords().get(i);
String bdkStatus = (String)map.get("bdkStatus"); String bdkStatus = (String) map.get("bdkStatus");
String cxrzStatus = (String)map.get("cxrzStatus"); String cxrzStatus = (String) map.get("cxrzStatus");
String rzhYesorno = (String)map.get("rzhYesorno"); String rzhYesorno = (String) map.get("rzhYesorno");
String invoiceStatus = (String)map.get("invoiceStatus"); String invoiceStatus = (String) map.get("invoiceStatus");
String authStatus = (String)map.get("authStatus"); String authStatus = (String) map.get("authStatus");
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));
@ -539,11 +547,11 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
map.put("bdkStatusBak", bdkStatus); map.put("bdkStatusBak", bdkStatus);
map.put("exportAmount", AmountFormatUtil map.put("exportAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportAmount")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportAmount")).toPlainString())));
map.put("exportTaxAmount", AmountFormatUtil map.put("exportTaxAmount", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportTaxAmount")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportTaxAmount")).toPlainString())));
map.put("exportYxse", AmountFormatUtil map.put("exportYxse", AmountFormatUtil
.fmtMicrometer(MathUtil.round(((BigDecimal)map.get("exportYxse")).toPlainString()))); .fmtMicrometer(MathUtil.round(((BigDecimal) map.get("exportYxse")).toPlainString())));
map.put("select", true); map.put("select", true);
TdxDkCount tDxDkCount; TdxDkCount tDxDkCount;
@ -618,7 +626,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
// 1.查询数据 // 1.查询数据
DynamicContextHolder DynamicContextHolder
.push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ); .push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_READ);
List<TdxExportInvoice> records = new ArrayList<>(); List<TdxExportInvoice> records = new ArrayList<>();
List<InvoiceLog> logList = new ArrayList<>(); List<InvoiceLog> logList = new ArrayList<>();
// 2.校验 // 2.校验
@ -632,13 +640,13 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
TdxTaxCurrent tDxTaxCurrent; TdxTaxCurrent tDxTaxCurrent;
TdxDkCount tDxDkCount; TdxDkCount tDxDkCount;
List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService List<TdxTaxCurrent> tdxTaxCurrents = domesticTaxCurrentService
.list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, record.getGfTaxNo())); .list(Wrappers.<TdxTaxCurrent>query().lambda().eq(TdxTaxCurrent::getTaxno, record.getGfTaxNo()));
tDxTaxCurrent = tdxTaxCurrents.get(0); tDxTaxCurrent = tdxTaxCurrents.get(0);
List<TdxDkCount> tdxDkCounts = domesticDkCountService List<TdxDkCount> tdxDkCounts = domesticDkCountService
.list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, record.getGfTaxNo()) .list(Wrappers.<TdxDkCount>query().lambda().eq(TdxDkCount::getTaxno, record.getGfTaxNo())
.eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod())); .eq(TdxDkCount::getSkssq, tDxTaxCurrent.getCurrentTaxPeriod()));
tDxDkCount = tdxDkCounts.get(0); tDxDkCount = tdxDkCounts.get(0);
@ -699,7 +707,7 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
} }
// 3.更新数据 // 3.更新数据
DynamicContextHolder DynamicContextHolder
.push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_WRITE); .push(StringUtils.defaultString(userInfo.getDbName(), "business") + DbConstant.BUSINESS_WRITE);
for (TdxExportInvoice record : records) { for (TdxExportInvoice record : records) {
total++; total++;
hjje = hjje.add(record.getExportAmount()); hjje = hjje.add(record.getExportAmount());
@ -718,12 +726,12 @@ public class DomesticExportInvoiceCkServiceImpl extends ServiceImpl<DomesticExpo
} }
resultMap.put("total", AmountFormatUtil.fmtMicrometer(String.valueOf(total))); resultMap.put("total", AmountFormatUtil.fmtMicrometer(String.valueOf(total)));
resultMap.put("hjse", resultMap.put("hjse",
AmountFormatUtil.fmtMicrometer(hjse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); AmountFormatUtil.fmtMicrometer(hjse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
resultMap.put("message", message); resultMap.put("message", message);
resultMap.put("hjje", resultMap.put("hjje",
AmountFormatUtil.fmtMicrometer(hjje.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); AmountFormatUtil.fmtMicrometer(hjje.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
resultMap.put("hjdk", resultMap.put("hjdk",
AmountFormatUtil.fmtMicrometer(hjyxse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString())); AmountFormatUtil.fmtMicrometer(hjyxse.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString()));
if (logList.size() > 0) { if (logList.size() > 0) {
invoiceLogService.toInvoiceLog(logList); invoiceLogService.toInvoiceLog(logList);
} }

@ -67,6 +67,13 @@ public class ExtInvoicePoolController extends AbstractController {
if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) { if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) {
pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString()))); 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"))) { if (pramsMap.get("kpjsrq") != null && !"".equals(pramsMap.get("kpjsrq"))) {
pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(pramsMap.get("kpjsrq").toString()))); pramsMap.put("kpjsrq", DateUtils.getNight(DateUtils.strToDate(pramsMap.get("kpjsrq").toString())));
} }

Loading…
Cancel
Save