|
|
@ -28,6 +28,7 @@ import com.dxhy.order.consumer.openapi.service.AllocateInvoiceInterfaceServiceV3 |
|
|
|
import com.dxhy.order.consumer.openapi.service.CommonDisposeService; |
|
|
|
import com.dxhy.order.consumer.openapi.service.CommonDisposeService; |
|
|
|
import com.dxhy.order.consumer.openapi.service.InterfaceServiceV6; |
|
|
|
import com.dxhy.order.consumer.openapi.service.InterfaceServiceV6; |
|
|
|
import com.dxhy.order.invoice.config.InvoiceConfig; |
|
|
|
import com.dxhy.order.invoice.config.InvoiceConfig; |
|
|
|
|
|
|
|
import com.dxhy.order.invoice.module.invoice.service.OrderInvoiceInfoService; |
|
|
|
import com.dxhy.order.invoice.utils.HttpInvoiceRequestUtilQd; |
|
|
|
import com.dxhy.order.invoice.utils.HttpInvoiceRequestUtilQd; |
|
|
|
import com.dxhy.order.model.InterfaceRequestData; |
|
|
|
import com.dxhy.order.model.InterfaceRequestData; |
|
|
|
import com.dxhy.order.model.OrderProcessInfo; |
|
|
|
import com.dxhy.order.model.OrderProcessInfo; |
|
|
@ -75,6 +76,8 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { |
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
private OrderProcessInfoMapper orderProcessInfoMapper; |
|
|
|
private OrderProcessInfoMapper orderProcessInfoMapper; |
|
|
|
@Resource |
|
|
|
@Resource |
|
|
|
|
|
|
|
private OrderInvoiceInfoService orderInvoiceInfoService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private OrderInfoService orderInfoService; |
|
|
|
private OrderInfoService orderInfoService; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
@Override |
|
|
@ -159,20 +162,34 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 { |
|
|
|
// return poCommonResponseParam;
|
|
|
|
// return poCommonResponseParam;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
List<OrderProcessInfo> collect1 = orderProcessInfos.stream().filter(t -> "3".equals(t.getDdly())).collect(Collectors.toList()); |
|
|
|
List<OrderProcessInfo> collect1 = orderProcessInfos.stream().filter(t -> "3".equals(t.getDdly())).collect(Collectors.toList()); |
|
|
|
if(orderProcessInfos.isEmpty()){ |
|
|
|
if(collect1.isEmpty()){ |
|
|
|
esOutput.setZMESSAGE("此账单为非接口数据,不允许驳回"); |
|
|
|
esOutput.setZMESSAGE("此账单为非接口数据,不允许驳回"); |
|
|
|
poCommonResponseParam.setES_OUTPUT(esOutput); |
|
|
|
poCommonResponseParam.setES_OUTPUT(esOutput); |
|
|
|
return poCommonResponseParam; |
|
|
|
return poCommonResponseParam; |
|
|
|
} |
|
|
|
} |
|
|
|
List<PageRequestVO> pageRequestList = collect1.stream().filter(t -> "0,1,3".contains(t.getDdzt())).map(t->{ |
|
|
|
List<String> collect = collect1.stream().map(t -> t.getOrderInfoId()).collect(Collectors.toList()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//需要查找哪些是开具成功作废或者冲红,哪些是未开订单
|
|
|
|
|
|
|
|
List<String> invalidList = orderInvoiceInfoService.countInoviceInfo(collect); |
|
|
|
|
|
|
|
// if(invalidList == null || invalidList.isEmpty() || invalidList.size() != collect.size()){
|
|
|
|
|
|
|
|
// esOutput.setZMESSAGE("账单号已在开具发票或开具中,不允许驳回");
|
|
|
|
|
|
|
|
// poCommonResponseParam.setES_OUTPUT(esOutput);
|
|
|
|
|
|
|
|
// return poCommonResponseParam;
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<PageRequestVO> pageRequestList = collect1.stream().filter(t -> "0,1,3,5,7".contains(t.getDdzt())).map(t->{ |
|
|
|
PageRequestVO pageRequestVO = new PageRequestVO(); |
|
|
|
PageRequestVO pageRequestVO = new PageRequestVO(); |
|
|
|
pageRequestVO.setOrderProcessId(t.getId()); |
|
|
|
pageRequestVO.setOrderProcessId(t.getId()); |
|
|
|
pageRequestVO.setOrderInfoId(t.getOrderInfoId()); |
|
|
|
pageRequestVO.setOrderInfoId(t.getOrderInfoId()); |
|
|
|
pageRequestVO.setXhfNsrsbh(t.getXhfNsrsbh()); |
|
|
|
pageRequestVO.setXhfNsrsbh(t.getXhfNsrsbh()); |
|
|
|
pageRequestVO.setFpqqlsh(t.getFpqqlsh()); |
|
|
|
pageRequestVO.setFpqqlsh(t.getFpqqlsh()); |
|
|
|
|
|
|
|
if(invalidList != null && !invalidList.isEmpty() && invalidList.contains(t.getOrderInfoId())){ |
|
|
|
|
|
|
|
pageRequestVO.setIssuedSign("0"); |
|
|
|
|
|
|
|
} |
|
|
|
return pageRequestVO; |
|
|
|
return pageRequestVO; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
if(pageRequestList.size() != collect1.size()){ |
|
|
|
List<OrderProcessInfo> collect2 = collect1.stream().filter(t -> "5,7".contains(t.getDdzt())).collect(Collectors.toList()); |
|
|
|
|
|
|
|
if(invalidList.size() != collect2.size() || pageRequestList.size() != collect1.size()){ |
|
|
|
esOutput.setZMESSAGE("账单号已在发票系统处理,不允许驳回"); |
|
|
|
esOutput.setZMESSAGE("账单号已在发票系统处理,不允许驳回"); |
|
|
|
poCommonResponseParam.setES_OUTPUT(esOutput); |
|
|
|
poCommonResponseParam.setES_OUTPUT(esOutput); |
|
|
|
return poCommonResponseParam; |
|
|
|
return poCommonResponseParam; |
|
|
|