Merge branch 'dev-snyx' into test

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

@@ -238,7 +238,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
 
             //推送票池
             try {
-                if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) {
+                if (StringUtils.isNotBlank(commonTsMqData.getFpTsMqData().getFphm())) {
                     pushTicketPoolService.pushTicketPool(commonTsMqData.getFpTsMqData().getFpdm(), commonTsMqData.getFpTsMqData().getFphm(), commonTsMqData.getNsrsbh());
                 }
 
@@ -259,7 +259,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             }
             //推送票池
             try {
-                if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFpdm()) && StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) {
+                if (StringUtils.isNotBlank(commonTsMqData.getZfTsMqData().getFphm())) {
                     pushTicketPoolService.pushTicketPool(commonTsMqData.getZfTsMqData().getFpdm(), commonTsMqData.getZfTsMqData().getFphm(), commonTsMqData.getNsrsbh());
                 }
 
@@ -1587,7 +1587,13 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
         log.info("{}推送接口orderProcessInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderProcessInfo));
         if(OrderInfoEnum.SYS_SOURCE_SNYXX.getKey().equals(orderProcessInfo.getXtly())){
             List<OrderProcessInfo> orderProcessInfos = orderProcessService.queryOrderProcessInfoByBzdh(orderProcessInfo.getBzdh(), shList);
-            int count = (int)orderProcessInfos.stream().filter(t -> OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt())).count();
+            int count = (int)orderProcessInfos.stream().filter(t ->{
+                if(new BigDecimal(orderProcessInfo.getKphjje()).compareTo(BigDecimal.ZERO) > 0){
+                    return OrderInfoEnum.ORDER_STATUS_5.getKey().equals(t.getDdzt());
+                }else{
+                    return OrderInfoEnum.ORDER_STATUS_7.getKey().equals(t.getDdzt());
+                }
+            }).count();
             if(orderProcessInfos.size() != count){
                 return null;
             }

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

@@ -166,12 +166,15 @@ public class OrderInfoController {
     @PostMapping("/updateBillNumber")
     @ApiOperation(value = "发票列表", notes = "发票列表修改报账单号")
     @SysLog(operation = "发票列表", operationDesc = "发票列表修改报账单号", key = "订单发票管理")
-    public R updateBillNumber(@RequestParam("bzdh") String bzdh, @RequestParam("orderInfoId") String orderInfoId) {
+    public R updateBillNumber(@RequestParam("bzdh") String bzdh,
+                              @RequestParam("orderInfoId") String orderInfoId,
+                              @RequestParam("fpqqlsh")String fpqqlsh,
+                              @RequestParam("xhfNsrsbh")String xhfNsrsbh) {
         if(StringUtils.isBlank(bzdh)||StringUtils.isBlank(orderInfoId)){
             return R.error("请求参数有误");
         }
         try {
-            int i = orderInfoService.updateBillNumber(bzdh, orderInfoId);
+            int i = orderInfoService.updateBillNumber(bzdh, orderInfoId,fpqqlsh,xhfNsrsbh);
             if(i > 0){
                 return R.ok();
             }

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

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

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

@@ -27,17 +27,17 @@ import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils;
 import com.dxhy.order.constant.*;
 import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
 import com.dxhy.order.consumer.dao.GsClientMapper;
-import com.dxhy.order.consumer.dao.OrderBatchRequestMapper;
 import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
 import com.dxhy.order.consumer.model.OderDetailInfo;
 import com.dxhy.order.consumer.model.PageOrderExt;
 import com.dxhy.order.consumer.model.page.PageRequestVO;
+import com.dxhy.order.consumer.modules.manager.service.InvoiceDataService;
 import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem;
 import com.dxhy.order.consumer.modules.order.model.PageKySlReq;
 import com.dxhy.order.consumer.modules.order.model.PageKySlRsp;
 import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO;
-import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo;
 import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO;
+import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo;
 import com.dxhy.order.consumer.modules.order.service.*;
 import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService;
 import com.dxhy.order.consumer.openapi.service.CommonInterfaceService;
@@ -189,6 +189,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Resource
     private OrderMergeService orderMergeService;
 
+    @Resource
+    private InvoiceDataService invoiceDataService;
+
     DecimalFormat format = new DecimalFormat("#.###");
 
     @Override
@@ -1744,11 +1747,18 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     }
 
     @Override
-    public int updateBillNumber(String bzdh,String orderInfoId){
+    public int updateBillNumber(String bzdh,String orderInfoId,String fpqqlsh,String xhfNsrsbh){
         OrderProcessInfo orderProcessInfo = new OrderProcessInfo();
         orderProcessInfo.setBzdh(bzdh);
         orderProcessInfo.setOrderInfoId(orderInfoId);
-        return orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo,null);
+        int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null);
+        if(i > 0) {
+            Map map = new HashMap();
+            map.put("ddqqlsh","");
+            map.put("xhfNsrsbh","");
+            invoiceDataService.manualPushInvoice(Arrays.asList(map));
+        }
+        return i;
     }
 
     @Override

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

@@ -85,10 +85,10 @@ public class PushTicketPoolServiceImpl implements PushTicketPoolService {
             OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoMapper.selectOrderInvoiceInfo(orderInvoiceInfo1, shList);
             log.info("{}推送接口orderInvoiceInfo数据：{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(orderInvoiceInfo));
 
-            if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) {
+//            if (ObjectUtil.isEmpty(orderInvoiceInfo) || !OrderInfoEnum.INVOICE_STATUS_2.getKey().equals(orderInvoiceInfo.getKpzt())) {
-                log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG);
+//                log.warn("{}发票数据不存在,或者发票状态不是开票中,数据不进行推送", LOGGER_MSG);
-                return R.ok();
+//                return R.ok();
-            }
+//            }
 
             if (ConfigureConstant.STRING_Y.equals(openApiConfig.configPushTicketPoolStatus())) {