feat:发票回推新增报账单号,修改原始接受map为dto实体

release
gongquanlin 2 years ago
parent e69a94794b
commit 0716f496ab
  1. 12
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/controller/InvoiceReceiveController.java
  2. 17
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/model/dto/ManualPushInvoiceDTO.java
  3. 14
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/model/dto/ManualPushInvoiceDetailDTO.java
  4. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/InvoiceDataService.java
  5. 26
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceDataServiceImpl.java

@ -3,7 +3,9 @@ package com.dxhy.order.consumer.modules.manager.controller;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
import com.dxhy.order.constant.*;
import com.dxhy.order.consumer.modules.manager.model.dto.ManualPushInvoiceDTO;
import com.dxhy.order.exception.OrderReceiveException;
import com.dxhy.order.model.*;
import com.dxhy.order.model.newsk.invoiceissue.InvoiceIssueFailDetail;
@ -46,8 +48,8 @@ import java.util.Map;
import java.util.Objects;
/**
* @Description 接收税控底层数据接口
* @author 杨士勇
* @Description 接收税控底层数据接口
* @ClassName InvocieReceiveController
* @date 2019年6月3日 下午2:54:23
*/
@ -413,16 +415,14 @@ public class InvoiceReceiveController {
@ApiOperation(value = "手动推送", notes = "开票结果接收-手动推送")
@PostMapping("/manualPushInvoice")
@SysLog(operation = "手动推送发票数据", operationDesc = "手动推送发票数据", key = "推送发票")
public R manualPushInvoice(HttpServletRequest request, @ApiParam(name = "ddqqlshArray", value = "订单流水号", required = true) @RequestBody String ddqqlshArray) {
public R manualPushInvoice(HttpServletRequest request, @ApiParam(name = "ddqqlshArray", value = "订单流水号", required = true) @RequestBody ManualPushInvoiceDTO dto) {
R r;
try {
if (StringUtils.isBlank(ddqqlshArray)) {
if (dto == null || CollectionUtils.isEmpty(dto.getList())) {
return R.error(OrderInfoContentEnum.INVOICE_PARAM_ERROR);
}
List<Map> idList = JSON.parseArray(ddqqlshArray, Map.class);
r = invoiceDataService.manualPushInvoice(idList);
r = invoiceDataService.manualPushInvoice(dto);
return r;
} catch (Exception e) {
log.error("{}手动回推发票异常:{}", LOGGER_MSG, e);

@ -0,0 +1,17 @@
package com.dxhy.order.consumer.modules.manager.model.dto;
import lombok.Data;
import java.util.List;
/**
* @Description
* @Author 巩权林
* @Date 2023/3/29 14:25
**/
@Data
public class ManualPushInvoiceDTO {
private List<ManualPushInvoiceDetailDTO> list;
private String bzdh;
}

@ -0,0 +1,14 @@
package com.dxhy.order.consumer.modules.manager.model.dto;
import lombok.Data;
/**
* @Description
* @Author 巩权林
* @Date 2023/3/29 14:28
**/
@Data
public class ManualPushInvoiceDetailDTO {
private String ddqqlsh;
private String xhfNsrsbh;
}

@ -1,5 +1,6 @@
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;
@ -19,7 +20,7 @@ public interface InvoiceDataService {
* @param orderInfoIds
* @return
*/
R manualPushInvoice(List<Map> orderInfoIds);
R manualPushInvoice(ManualPushInvoiceDTO orderInfoIds);
/**
* 更新订单和发票状态

@ -5,6 +5,8 @@ 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;
@ -54,15 +56,16 @@ public class InvoiceDataServiceImpl implements InvoiceDataService {
* 发票状态手动回推
*/
@Override
public R manualPushInvoice(List<Map> idList) {
@Transactional
public R manualPushInvoice(ManualPushInvoiceDTO dto) {
Set<String> set = new HashSet<>();
int successCount = 0;
for (Map map : idList) {
for (ManualPushInvoiceDetailDTO map : dto.getList()) {
OrderInvoiceInfo orderInvoiceInfo1 = new OrderInvoiceInfo();
String ddqqlsh = (String) map.get("ddqqlsh");
String nsrsbh = (String) map.get("xhfNsrsbh");
String ddqqlsh = map.getDdqqlsh();
String nsrsbh = map.getXhfNsrsbh();
List<String> shList = new ArrayList<>();
shList.add(nsrsbh);
orderInvoiceInfo1.setFpqqlsh(ddqqlsh);
@ -70,6 +73,21 @@ 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();
//推送地址为有效

Loading…
Cancel
Save