|
|
@@ -31,6 +31,7 @@ import com.yc.ship.module.trade.service.invoice.InvoiceDetailService;
|
|
|
import com.yc.ship.module.trade.service.invoice.InvoiceGroupService;
|
|
|
import com.yc.ship.module.trade.service.invoice.InvoiceLogService;
|
|
|
import com.yc.ship.module.trade.service.invoiceinventory.InvoiceInventoryService;
|
|
|
+import com.yc.ship.module.trade.service.order.TradeOrderRepositoryService;
|
|
|
import com.yc.ship.module.trade.utils.GzipUtils;
|
|
|
import com.yc.ship.module.trade.utils.TripleDesUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -74,6 +75,9 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
|
|
|
@Resource
|
|
|
private InvoiceDetailService invoiceDetailService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private TradeOrderRepositoryService tradeOrderRepositoryService;
|
|
|
+
|
|
|
@Resource
|
|
|
private FileApi fileApi;
|
|
|
|
|
|
@@ -187,10 +191,23 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
|
|
|
|
|
|
List<InvoiceDetailDO> list = invoiceDetailService.getInvoiceDetails(invoice.getId());
|
|
|
List<String> orderNoList = list.stream().map(InvoiceDetailDO::getOrderNo).collect(Collectors.toList());
|
|
|
- //TODO:
|
|
|
-// tradeOrderRepositoryService.updateInvoiceStatusByOrderNo(orderNoList, 1);
|
|
|
+ tradeOrderRepositoryService.updateInvoiceStatusByOrderNo(orderNoList, 1);
|
|
|
|
|
|
}
|
|
|
+ }else if (StringUtils.equals("032000", ddzt)) {
|
|
|
+ String ddztxx = ddfpxx.getStr("DDZTXX");
|
|
|
+ log.error("集团电子发票查询异常:" + ddfpxx);
|
|
|
+ invoice.setCResultmsg(ddztxx);
|
|
|
+ invoiceMapper.updateById(invoice);
|
|
|
+ }else if (StringUtils.equals("031999", ddzt)) {
|
|
|
+ String ddztxx = ddfpxx.getStr("DDZTXX");
|
|
|
+ invoice.setInvoiceStatus(InvoiceStatusEnum.INVOICE_FAILED.getValue());
|
|
|
+ invoice.setCResultmsg(ddztxx);
|
|
|
+ invoiceMapper.updateById(invoice);
|
|
|
+
|
|
|
+ List<InvoiceDetailDO> orderList = invoiceDetailService.getInvoiceDetails(invoice.getId());
|
|
|
+ List<String> orderNoList = orderList.stream().map(InvoiceDetailDO::getOrderNo).collect(Collectors.toList());
|
|
|
+ tradeOrderRepositoryService.updateInvoiceStatusByOrderNo(orderNoList, InvoiceStatusEnum.NOT_INVOICED.getValue());
|
|
|
}
|
|
|
return CommonResult.success(invoice);
|
|
|
}
|
|
|
@@ -233,8 +250,7 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
|
|
|
invoiceMapper.updateById(invoice);
|
|
|
List<InvoiceDetailDO> orderList = invoiceDetailService.getInvoiceDetails(invoice.getId());
|
|
|
List<String> orderNoList = orderList.stream().map(InvoiceDetailDO::getOrderNo).collect(Collectors.toList());
|
|
|
- //TODO:
|
|
|
-// tradeOrderRepositoryService.updateInvoiceStatusByOrderNo(orderNoList, InvoiceStatusEnum.NOT_INVOICED.getValue());
|
|
|
+ tradeOrderRepositoryService.updateInvoiceStatusByOrderNo(orderNoList, InvoiceStatusEnum.NOT_INVOICED.getValue());
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
invoice.setInvoiceStatus(InvoiceStatusEnum.INVOICE_RED_FAILED.getValue());
|
|
|
@@ -260,8 +276,7 @@ public class InvoiceGroupServiceImpl implements InvoiceGroupService {
|
|
|
invoiceMapper.updateById(invoice);
|
|
|
List<InvoiceDetailDO> orderList = invoiceDetailService.getInvoiceDetails(invoice.getId());
|
|
|
List<String> orderNoList = orderList.stream().map(InvoiceDetailDO::getOrderNo).collect(Collectors.toList());
|
|
|
- //TODO
|
|
|
-// tradeOrderRepositoryService.updateInvoiceStatusByOrderNo(orderNoList, InvoiceStatusEnum.NOT_INVOICED.getValue());
|
|
|
+ tradeOrderRepositoryService.updateInvoiceStatusByOrderNo(orderNoList, InvoiceStatusEnum.NOT_INVOICED.getValue());
|
|
|
}
|
|
|
return CommonResult.success(invoice);
|
|
|
}
|