task4516 sap报账单删除功能

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInvoiceController.java

@@ -459,11 +459,12 @@ public class OrderInvoiceController {
                     orderProcessInfo1.setFpqqlsh(baseService.getGenerateShotKey());
                     orderProcessInfo1.setXtly(orderProcessInfo.getXtly());
                 }
-                int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList);
+//                int success = orderProcessService.updateOrderProcessInfoByProcessId(orderProcessInfo1, shList);
-                if (success < 0) {
+                orderProcessService.deleteOrderProcessInfoAndOrderInfoByProcessId(orderProcessInfo1, shList);
-                    errorMsgList.append(preStr).append("数据删除失败").append("\r\n");
+//                if (success < 0) {
-                    continue;
+//                    errorMsgList.append(preStr).append("数据删除失败").append("\r\n");
-                }
+//                    continue;
+//                }
                 //如果是红票数据,并且是专票,需要更新红字信息表数据
                 // 红字专票 作废后修改申请单的状态为未开票
                 if (OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(orderProcessInfo.getFpzlDm()) || OrderInfoEnum.ORDER_INVOICE_TYPE_52.getKey().equals(orderProcessInfo.getFpzlDm())) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderProcessService.java

@@ -78,6 +78,12 @@ public interface OrderProcessService {
      */
     int updateOrderProcessInfoByProcessId(OrderProcessInfo orderProcessInfo, List<String> shList);
 
+    /**
+     * 删除开票申请单
+     * @param orderProcessInfo
+     */
+    void deleteOrderProcessInfoAndOrderInfoByProcessId(OrderProcessInfo orderProcessInfo, List<String> shList);
+
     /**
      * 根据销方税号,订单号,发票请求流水号进行查询orderprocess信息
      *

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderProcessServiceImpl.java

@@ -131,7 +131,12 @@ public class OrderProcessServiceImpl implements OrderProcessService {
     
     @Override
     public int updateOrderProcessInfoByProcessId(OrderProcessInfo orderProcessInfo, List<String> shList) {
-        if (OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())) {
+        return orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList);
+    }
+
+    @Override
+    public void deleteOrderProcessInfoAndOrderInfoByProcessId(OrderProcessInfo orderProcessInfo, List<String> shList) {
+        if (StringUtils.isNotBlank(orderProcessInfo.getXtly())&&OrderInfoEnum.SYS_SOURCE_SAP.getKey().equals(orderProcessInfo.getXtly())) {
             OrderInfo orderInfo = orderInfoMapper.queryOrderInfoByProcessId(orderProcessInfo.getId());
             if (orderInfo == null) {
                 throw new RuntimeException("删除SAP推送单据，数据异常");
@@ -142,7 +147,7 @@ public class OrderProcessServiceImpl implements OrderProcessService {
                 throw new RuntimeException("删除SAP推送单据，数据异常");
             }
         }
-        return orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList);
+        orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, shList);
     }
 
     /**