|
|
@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.RandomUtil; |
|
|
|
import cn.hutool.core.util.RandomUtil; |
|
|
|
import cn.hutool.json.JSONUtil; |
|
|
|
import cn.hutool.json.JSONUtil; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
|
|
|
|
import com.dxhy.base.file.common.ExcelReadContext; |
|
|
|
import com.dxhy.base.file.common.ExcelReadContext; |
|
|
|
import com.dxhy.base.file.handle.ExcelExportHandle; |
|
|
|
import com.dxhy.base.file.handle.ExcelExportHandle; |
|
|
|
import com.dxhy.order.baseservice.config.BaseServiceConfig; |
|
|
|
import com.dxhy.order.baseservice.config.BaseServiceConfig; |
|
|
@ -54,13 +53,18 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook; |
|
|
|
import org.joda.time.DateTime; |
|
|
|
import org.joda.time.DateTime; |
|
|
|
import org.joda.time.Duration; |
|
|
|
import org.joda.time.Duration; |
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
import org.springframework.beans.BeanUtils; |
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Qualifier; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import java.io.*; |
|
|
|
import java.io.File; |
|
|
|
import java.nio.charset.StandardCharsets; |
|
|
|
import java.io.FileInputStream; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.io.IOException; |
|
|
|
|
|
|
|
import java.io.OutputStream; |
|
|
|
import java.util.*; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
import java.util.concurrent.CompletableFuture; |
|
|
|
|
|
|
|
import java.util.concurrent.Executor; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.zip.ZipEntry; |
|
|
|
import java.util.zip.ZipEntry; |
|
|
|
import java.util.zip.ZipOutputStream; |
|
|
|
import java.util.zip.ZipOutputStream; |
|
|
@ -116,6 +120,9 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { |
|
|
|
|
|
|
|
|
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private InvoiceKpdInfoService invoiceKpdInfoService; |
|
|
|
private InvoiceKpdInfoService invoiceKpdInfoService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
|
|
|
@Qualifier("asyncExecutor") |
|
|
|
|
|
|
|
private Executor voucherTaskExecutor; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -1115,8 +1122,9 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { |
|
|
|
salerWarningService.pushExceptionMessageToItax(orderInvoiceInfo); |
|
|
|
salerWarningService.pushExceptionMessageToItax(orderInvoiceInfo); |
|
|
|
|
|
|
|
|
|
|
|
// 异常订单发送邮件
|
|
|
|
// 异常订单发送邮件
|
|
|
|
emailService.sendEmailOfInnormalOrder(orderInvoiceInfo, OrderInfoEnum.ORDER_STATUS_6.getValue(), rabbitMqCommonInvoice.getSbyy()); |
|
|
|
CompletableFuture.runAsync(()->{ |
|
|
|
|
|
|
|
emailService.sendEmailOfInnormalOrder(orderInvoiceInfo, OrderInfoEnum.ORDER_STATUS_6.getValue(), rabbitMqCommonInvoice.getSbyy()); |
|
|
|
|
|
|
|
}, voucherTaskExecutor); |
|
|
|
|
|
|
|
|
|
|
|
//处理开票失败后,推送销项后台开票控制逻辑
|
|
|
|
//处理开票失败后,推送销项后台开票控制逻辑
|
|
|
|
processSimsBackPauseInvoice(orderInvoiceInfo.getSkcwdm(), orderInvoiceInfo.getSbyy(), orderInvoiceInfo.getXhfNsrsbh(), orderInvoiceInfo.getEntId()); |
|
|
|
processSimsBackPauseInvoice(orderInvoiceInfo.getSkcwdm(), orderInvoiceInfo.getSbyy(), orderInvoiceInfo.getXhfNsrsbh(), orderInvoiceInfo.getEntId()); |
|
|
|