diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java index 9c777ecd..1263138d 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseServiceConfig.java @@ -18,6 +18,12 @@ import org.springframework.context.annotation.Configuration; @RefreshScope public class BaseServiceConfig{ + /** + * 销项后台URL + */ + @Value("${kcp}") + private String kcp; + /** * 销项后台URL */ @@ -517,4 +523,8 @@ public class BaseServiceConfig{ return interfaceSkUrl + "/accept/invoice/V1.0/queryTaxpayerStockInfo"; } + + public String getKcpspbm(){ + return kcp; + } } diff --git a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java index d5a45e71..1ff45208 100644 --- a/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java +++ b/order-management-common/src/main/java/com/dxhy/order/constant/OrderInfoEnum.java @@ -23,6 +23,8 @@ public enum OrderInfoEnum { QDBZ_CODE_4("4", "成品油发票"), QDBZ_CODE_5("5", "机动车专票"), QDBZ_CODE_6("6", "机动车专票(清单)"), + QDBZ_CODE_7("7", "矿产品"), + QDBZ_CODE_8("8", "矿产品(清单)"), /** * 发票行性质 0正常行,1折扣行,2被折扣行,6 清单红字发票 @@ -837,6 +839,7 @@ public enum OrderInfoEnum { TSPZ_07("07", "其它通行费"), TSPZ_08("08", "成品油销售"), TSPZ_09("09", "机动车专票"), + TSPZ_16("16", "矿产品发票"), /** diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index a61ad0ff..10ecb433 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -20,7 +20,6 @@ import com.dxhy.order.constant.OrderManagementConstant; import com.dxhy.order.consumer.dao.OrderProcessInfoMapper; import com.dxhy.order.consumer.modules.order.service.GenerateReadyOpenOrderService; import com.dxhy.order.consumer.modules.order.service.OrderCommonService; -import com.dxhy.order.consumer.modules.order.service.OrderProcessService; import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService; import com.dxhy.order.consumer.openapi.service.CommonInterfaceService; import com.dxhy.order.consumer.utils.BeanTransitionUtils; @@ -294,6 +293,13 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder // 补全明细信息 List orderItemList = commonOrderInfo.getOrderItemInfo(); + boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); + if(kcp){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey()); + if(orderItemList.size() > ConfigureConstant.INT_8){ + orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_8.getKey()); + } + } commonInterfaceService.dealOrderItem(orderItemList, orderInfo.getXhfNsrsbh(), orderInfo.getQdBz(), orderInfo.getFpzlDm(), terminalCode, ""); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java index 5415802d..c865b953 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/utils/HttpInvoiceRequestUtil.java @@ -1247,6 +1247,8 @@ public class HttpInvoiceRequestUtil { } else if (OrderInfoEnum.QDBZ_CODE_5.getKey().equals(commonInvoiceHead.getQD_BZ()) || OrderInfoEnum.QDBZ_CODE_6.getKey().equals(commonInvoiceHead.getQD_BZ())) { tsbz = OrderInfoEnum.TSPZ_09.getKey(); + } else if (OrderInfoEnum.QDBZ_CODE_7.getKey().equals(commonInvoiceHead.getQD_BZ()) || OrderInfoEnum.QDBZ_CODE_8.getKey().equals(commonInvoiceHead.getQD_BZ())) { + tsbz = OrderInfoEnum.TSPZ_16.getKey(); } } invoiceIssueInfo.setTSPZ(tsbz);