feature 1.还原代码

release
zhenghaiyang@ele-cloud.com 2 years ago
parent 15ea77fc28
commit b2dbfd87ba
  1. 16
      order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/controller/SpecialInvoiceReversalController.java
  2. 6
      order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoicespecial/service/impl/SpecialInvoiceServiceImpl.java

@ -395,8 +395,8 @@ public class SpecialInvoiceReversalController {
specialInvoiceReversalEntity.setSqdscqqlsh(baseService.getGenerateShotKey()); specialInvoiceReversalEntity.setSqdscqqlsh(baseService.getGenerateShotKey());
} else { } else {
//调用税盘编号生成code //调用税盘编号生成code
// Map<String, String> resultMap = specialInvoiceService.querySpecialInvoiceReversalCode("", specialInvoiceReversalEntity.getFpzlDm(), nsrsbh, terminalCode); Map<String, String> resultMap = specialInvoiceService.querySpecialInvoiceReversalCode("", specialInvoiceReversalEntity.getFpzlDm(), nsrsbh, terminalCode);
// specialInvoiceReversalEntity.setSqdscqqlsh(resultMap.get(OrderManagementConstant.CODE)); specialInvoiceReversalEntity.setSqdscqqlsh(resultMap.get(OrderManagementConstant.CODE));
} }
} }
@ -727,12 +727,12 @@ public class SpecialInvoiceReversalController {
} }
// if (OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(specialInvoiceReversalEntity.getFpzlDm())) { if (OrderInfoEnum.ORDER_INVOICE_TYPE_0.getKey().equals(specialInvoiceReversalEntity.getFpzlDm())) {
// if (StringUtils.isBlank(specialInvoiceReversalEntity.getJqbh()) && StringUtils.isBlank(specialInvoiceReversalEntity.getFjh())) { if (StringUtils.isBlank(specialInvoiceReversalEntity.getJqbh()) && StringUtils.isBlank(specialInvoiceReversalEntity.getFjh())) {
// return R.error(ResponseStatusCodes.ACCESS_POINT_ID_IS_BLANK, "分机号不能为空"); return R.error(ResponseStatusCodes.ACCESS_POINT_ID_IS_BLANK, "分机号不能为空");
// } }
//
// } }
//审核状态 //审核状态
if (StringUtils.isNotBlank(specialInvoiceReversalEntity.getStatusCode()) && ArrayUtils.contains(notAllowedEditSubmitStatus, specialInvoiceReversalEntity.getStatusCode())) { if (StringUtils.isNotBlank(specialInvoiceReversalEntity.getStatusCode()) && ArrayUtils.contains(notAllowedEditSubmitStatus, specialInvoiceReversalEntity.getStatusCode())) {

@ -743,9 +743,9 @@ public class SpecialInvoiceServiceImpl implements SpecialInvoiceService {
} }
} }
// if (StringUtils.isBlank(resultJqbh)) { if (StringUtils.isBlank(resultJqbh)) {
// throw new OrderReceiveException("9999", "获取机器编码异常!"); throw new OrderReceiveException("9999", "获取机器编码异常!");
// } }
specialInvoiceReversalCode = resultJqbh + DateUtil.format(new Date(), ConfigureConstant.DATE_FORMAT_DATE_YMDHMS).substring(2); specialInvoiceReversalCode = resultJqbh + DateUtil.format(new Date(), ConfigureConstant.DATE_FORMAT_DATE_YMDHMS).substring(2);

Loading…
Cancel
Save