fix: 发票回推还用标品的

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

@@ -415,14 +415,16 @@ public class InvoiceReceiveController {
     @ApiOperation(value = "手动推送", notes = "开票结果接收-手动推送")
     @PostMapping("/manualPushInvoice")
     @SysLog(operation = "手动推送发票数据", operationDesc = "手动推送发票数据", key = "推送发票")
-    public R manualPushInvoice(HttpServletRequest request, @ApiParam(name = "ddqqlshArray", value = "订单流水号", required = true) @RequestBody ManualPushInvoiceDTO dto) {
+    public R manualPushInvoice(HttpServletRequest request, @ApiParam(name = "ddqqlshArray", value = "订单流水号", required = true) @RequestBody String ddqqlshArray) {
         R r;
         try {
-            if (dto == null || CollectionUtils.isEmpty(dto.getList())) {
+            if (StringUtils.isBlank(ddqqlshArray)) {
                 return R.error(OrderInfoContentEnum.INVOICE_PARAM_ERROR);
             }
 
-            r = invoiceDataService.manualPushInvoice(dto);
+            List<Map> idList = JSON.parseArray(ddqqlshArray, Map.class);
+
+            r = invoiceDataService.manualPushInvoice(idList);
             return r;
         } catch (Exception e) {
             log.error("{}手动回推发票异常:{}", LOGGER_MSG, e);

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

@@ -1,6 +1,5 @@
 package com.dxhy.order.consumer.modules.manager.service;
 
-import com.dxhy.order.consumer.modules.manager.model.dto.ManualPushInvoiceDTO;
 import com.dxhy.order.model.OrderInvoiceInfo;
 import com.dxhy.order.model.R;
 
@@ -20,7 +19,7 @@ public interface InvoiceDataService {
      * @param orderInfoIds
      * @return
      */
-    R manualPushInvoice(ManualPushInvoiceDTO orderInfoIds);
+    R manualPushInvoice(List<Map> orderInfoIds);
 
     /**
      * 更新订单和发票状态

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

@@ -5,8 +5,6 @@ import com.dxhy.order.constant.ConfigureConstant;
 import com.dxhy.order.constant.NsrQueueEnum;
 import com.dxhy.order.constant.OrderInfoEnum;
 import com.dxhy.order.constant.OrderManagementConstant;
-import com.dxhy.order.consumer.modules.manager.model.dto.ManualPushInvoiceDTO;
-import com.dxhy.order.consumer.modules.manager.model.dto.ManualPushInvoiceDetailDTO;
 import com.dxhy.order.model.*;
 import com.dxhy.order.model.queue.CommonTsMqData;
 import com.dxhy.order.model.queue.FpTsMqData;
@@ -56,16 +54,15 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
      * 发票状态手动回推
      */
     @Override
-    @Transactional
-    public R manualPushInvoice(ManualPushInvoiceDTO dto) {
+    public R manualPushInvoice(List<Map> idList) {
 
 
         Set<String> set = new HashSet<>();
         int successCount = 0;
-        for (ManualPushInvoiceDetailDTO map : dto.getList()) {
+        for (Map map : idList) {
             OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo();
-            String ddqqlsh = map.getDdqqlsh();
-            String nsrsbh = map.getXhfNsrsbh();
+            String ddqqlsh = (String) map.get("ddqqlsh");
+            String nsrsbh = (String) map.get("xhfNsrsbh");
             List<String> shList = new ArrayList<>();
             shList.add(nsrsbh);
             orderInvoiceInfo1.setFpqqlsh(ddqqlsh);
@@ -73,21 +70,6 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
             if (orderInvoiceInfo == null) {
                 continue;
             }
-
-            try {
-                List<String> xhfNsrsbhList = Collections.singletonList(map.getXhfNsrsbh());
-                // 新增回写报账单号
-                OrderProcessInfo orderProcessInfo = orderProcessInfoMapper.selectByOrderId(orderInvoiceInfo.getOrderInfoId(), xhfNsrsbhList);
-                if (ObjectUtil.isNull(orderProcessInfo)) {
-                    return R.error("找不到订单处理业务");
-                }
-                orderProcessInfo.setBzdh(dto.getBzdh());
-                orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfo, xhfNsrsbhList);
-            } catch (Exception e) {
-                e.printStackTrace();
-                log.error("{}回写报账单号异常", LOGGER_MSG, e);
-            }
-
             //查询当前税号的销方信息是否配置推送地址
             PushInfo queryPushInfo = new PushInfo();
             //推送地址为有效