Merge branch 'dev-blfp' into test

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

@@ -172,19 +172,29 @@ public class OrderInfoController {
         }
     }
 
+    /**
+     *
+     * @param bzdh
+     * @param orderInfoId
+     * @param fpqqlsh
+     * @param xhfNsrsbh
+     * @param force 是否强制补录，0 不强制，1是强制补录
+     * @return
+     */
     @PostMapping("/updateBillNumber")
     @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号")
     @SysLog(operation = "发票列表", operationDesc = "补录报账单号", key = "订单发票管理")
     public R updateBillNumber(@RequestParam("bzdh") String bzdh,
                               @RequestParam("orderInfoId") String orderInfoId,
                               @RequestParam("fpqqlsh")String fpqqlsh,
-                              @RequestParam("xhfNsrsbh")String xhfNsrsbh
+                              @RequestParam("xhfNsrsbh")String xhfNsrsbh,
+                              @RequestParam("force") String force
     ) {
         if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){
             return R.error("请求参数有误");
         }
         try {
-            orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh);
+            orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh,force);
 
             return R.ok();
         } catch (Exception e) {

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
-    void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception;
+    void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh,String force) 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 void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh) throws Exception{
+    public void updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh,String force) throws Exception{
         //通过报账单查询订单，如果存在则删除
         List<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderProcessInfoByBzdh(bzdh,"", Arrays.asList(xhfNsrsbh));
         OrderProcessInfo orderProcessInfo = null;
@@ -1769,7 +1769,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_OPERATED);
             }
             if((OrderInfoEnum.ORDER_STATUS_5.getKey().equals(orderProcessInfo.getDdzt()) || OrderInfoEnum.ORDER_STATUS_7.getKey().equals(orderProcessInfo.getDdzt()))
-                    &&!OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly())){
+                    &&!OrderInfoEnum.ORDER_SOURCE_3.getKey().equals(orderProcessInfo.getDdly()) && ConfigureConstant.STRING_0.equals(force)){
                 throw new OrderReceiveException(OrderInfoContentEnum.INVOICE_BZDH_REPEAT_OPERATED);
             }