Merge branch 'dev-blbzd' into test

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

@@ -184,14 +184,13 @@ public class OrderInfoController {
             return R.error("请求参数有误");
         }
         try {
-            int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh);
-            if(i > 0){
-                return R.ok();
-            }
+            orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh);
+
+            return R.ok();
         } catch (Exception e) {
             log.error(e.getMessage());
+            return R.error(e.getMessage());
         }
-        return R.error("更新失败，请稍后重试");
     }
     
     /**

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

@@ -223,7 +223,7 @@ public interface OrderInfoService {
     R ratioConversion(List<String> orderInfoIds,String ratio,String xhfNsrsbh,String originUnit,String newUnit);
 
     @Transactional
-    int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception;
+    void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception;
 
     @Transactional
     R logicalDeleteByOrderInfoId(List<PageRequestVO> pageRequestList);

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

@@ -1752,7 +1752,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     }
 
     @Override
-    public int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception{
+    public void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception{
         //通过报账单查询订单，如果存在则删除
         List<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh, Arrays.asList(xhfNsrsbh));
         OrderProcessInfo orderProcessInfo = null;
@@ -1783,7 +1783,6 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             map.put("xhfNsrsbh",xhfNsrsbh);
             invoiceDataService.manualPushInvoice(Arrays.asList(map));
         }
-        return i;
     }
 
     @Override