feature:FI841接口返回逻辑调整

release
gaorl 2 years ago
parent 9e7fa0a32e
commit b0b52c2330
  1. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java
  2. 52
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java

@ -445,6 +445,9 @@ public class OrderInvoiceController {
OrderProcessInfo orderProcessInfo1 = new OrderProcessInfo(); OrderProcessInfo orderProcessInfo1 = new OrderProcessInfo();
orderProcessInfo1.setId(id); orderProcessInfo1.setId(id);
orderProcessInfo1.setOrderStatus(ConfigureConstant.STRING_1); orderProcessInfo1.setOrderStatus(ConfigureConstant.STRING_1);
if("back".equals(ly)){
orderProcessInfo1.setBhzt(ConfigureConstant.STRING_1);
}
int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList); int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList);
if (success < 0) { if (success < 0) {
errorMsgList.append(preStr).append("数据删除失败").append("\r\n"); errorMsgList.append(preStr).append("数据删除失败").append("\r\n");

@ -42,6 +42,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
@ -142,29 +143,40 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
Map<String,String> queryMap = new HashMap<>(); Map<String,String> queryMap = new HashMap<>();
queryMap.put("bzdh",bzdh); queryMap.put("bzdh",bzdh);
List<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(queryMap, null, null); List<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(queryMap, null, null);
if(orderProcessInfos.size()!=1){ //过滤留下有效订单,且判断有效订单是否存在开票中、已开票
esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey()); esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey());
if(orderProcessInfos == null || orderProcessInfos.isEmpty()){
esOutput.setZMESSAGE("根据报账单号未查询到唯一结算单"); esOutput.setZMESSAGE("根据报账单号未查询到唯一结算单");
}else { poCommonResponseParam.setES_OUTPUT(esOutput);
OrderProcessInfo orderProcessInfo = orderProcessInfos.get(0); return poCommonResponseParam;
List<PageRequestVO> pageRequestList = new ArrayList<>(); }
List<OrderProcessInfo> collect = orderProcessInfos.stream().filter(t -> "0".equals(t.getOrderStatus())).collect(Collectors.toList());
if(collect.isEmpty()){
esOutput.setZMESSAGE("账单号已被删除");
poCommonResponseParam.setES_OUTPUT(esOutput);
return poCommonResponseParam;
}
List<PageRequestVO> pageRequestList = collect.stream().filter(t -> "0".contains(t.getDdzt())).map(t->{
PageRequestVO pageRequestVO = new PageRequestVO(); PageRequestVO pageRequestVO = new PageRequestVO();
pageRequestVO.setOrderProcessId(orderProcessInfo.getId()); pageRequestVO.setOrderProcessId(t.getId());
pageRequestVO.setXhfNsrsbh(orderProcessInfo.getXhfNsrsbh()); pageRequestVO.setXhfNsrsbh(t.getXhfNsrsbh());
pageRequestList.add(pageRequestVO); return pageRequestVO;
R back = orderInvoiceController.updateOrderStatus(pageRequestList, "back"); }).collect(Collectors.toList());
if("0000".equals(back.get(OrderManagementConstant.CODE))){ if(pageRequestList.size() != collect.size()){
OrderProcessInfo updateOrderProcessInfo = new OrderProcessInfo(); esOutput.setZMESSAGE("账单号已在发票系统处理,不允许驳回");
updateOrderProcessInfo.setId(orderProcessInfo.getId()); poCommonResponseParam.setES_OUTPUT(esOutput);
updateOrderProcessInfo.setBhzt(ConfigureConstant.STRING_1); return poCommonResponseParam;
int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(updateOrderProcessInfo, null);
esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey());
esOutput.setZMESSAGE("驳回状态更新成功");
}else{
esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey());
esOutput.setZMESSAGE(back.get(OrderManagementConstant.MESSAGE).toString());
}
} }
R back = orderInvoiceController.updateOrderStatus(pageRequestList, "back");
if(!"0000".equals(back.get(OrderManagementConstant.CODE))){
esOutput.setZMESSAGE(back.get(OrderManagementConstant.MESSAGE).toString());
poCommonResponseParam.setES_OUTPUT(esOutput);
return poCommonResponseParam;
}
esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey());
esOutput.setZMESSAGE("驳回状态更新成功");
poCommonResponseParam.setES_OUTPUT(esOutput); poCommonResponseParam.setES_OUTPUT(esOutput);
return poCommonResponseParam; return poCommonResponseParam;
} }

Loading…
Cancel
Save