diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java index 30b73420..74db2a95 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java @@ -57,6 +57,8 @@ public class OderDetailInfo { private String ghfZh; + private String ghfStatus; + private String xhfMc; private String xhfNsrsbh; diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index cb914d6b..75b0ca96 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.StrUtil; import com.dxhy.base.constant.OrderSeparationException; import com.dxhy.base.constant.TaxSeparateConfig; import com.dxhy.base.utils.PriceTaxSeparationUtilNew; @@ -322,6 +323,18 @@ public class OrderInfoServiceImpl implements OrderInfoService { oderDetailInfo.setGhfDh(orderInfo.getGhfDh()); oderDetailInfo.setGhfYh(orderInfo.getGhfYh()); oderDetailInfo.setGhfZh(orderInfo.getGhfZh()); + BuyerEntity buyerEntity = null; + if (StrUtil.isNotBlank(orderInfo.getGhfId())) { + buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId()); + if (ObjectUtil.isNull(buyerEntity)) { + buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId()); + } + } + if (ObjectUtil.isNotNull(buyerEntity) && ConfigureConstant.STRING_0.equals(buyerEntity.getStatus())) { + oderDetailInfo.setGhfStatus(ConfigureConstant.STRING_0); + }else { + oderDetailInfo.setGhfStatus(ConfigureConstant.STRING_1); + } // 添加销方信息 diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java index ad03716b..d96d38b0 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java @@ -875,13 +875,13 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt for (int i = 0; i < mbnrList.size(); i++) { String s = mbnrList.get(i); if (OrderInfoEnum.INVOICE_REMARK_SET_BZDH.getValue().equals(s)) { - insertOrder.get(0).setBz(insertOrder.get(0).getBz() + OrderInfoEnum.INVOICE_REMARK_SET_BZDH.getValue() + ":" + insertProcessInfo.get(0).getBzdh() + (i == mbnrList.size() - 1 ? "" : ",")); + insertOrder.get(0).setBz((ObjectUtil.isNull(insertOrder.get(0).getBz())?"":insertOrder.get(0).getBz()) + OrderInfoEnum.INVOICE_REMARK_SET_BZDH.getValue() + ":" + insertProcessInfo.get(0).getBzdh() + (i == mbnrList.size() - 1 ? "" : ",")); } if (OrderInfoEnum.INVOICE_REMARK_SET_JSDH.getValue().equals(s)) { - insertOrder.get(0).setBz(insertOrder.get(0).getBz() + OrderInfoEnum.INVOICE_REMARK_SET_JSDH.getValue() + ":" + insertProcessInfo.get(0).getDdh() + (i == mbnrList.size() - 1 ? "" : ",")); + insertOrder.get(0).setBz((ObjectUtil.isNull(insertOrder.get(0).getBz())?"":insertOrder.get(0).getBz()) + OrderInfoEnum.INVOICE_REMARK_SET_JSDH.getValue() + ":" + insertProcessInfo.get(0).getDdh() + (i == mbnrList.size() - 1 ? "" : ",")); } if (OrderInfoEnum.INVOICE_REMARK_SET_KB.getValue().equals(s)) { - insertOrder.get(0).setBz(insertOrder.get(0).getBz() + OrderInfoEnum.INVOICE_REMARK_SET_KB.getValue() + ":" + insertProcessInfo.get(0).getKb() + (i == mbnrList.size() - 1 ? "" : ",")); + insertOrder.get(0).setBz((ObjectUtil.isNull(insertOrder.get(0).getBz())?"":insertOrder.get(0).getBz()) + OrderInfoEnum.INVOICE_REMARK_SET_KB.getValue() + ":" + insertProcessInfo.get(0).getKb() + (i == mbnrList.size() - 1 ? "" : ",")); } } } @@ -1146,6 +1146,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt if (StringUtils.isNotBlank(commonOrderInfo.getOrderInfo().getGhfId())) { String zxbm = commonOrderInfo.getOrderInfo().getGhfId(); zxbm = StringUtils.right(zxbm, 6); // 见下dealOrderItem中 line:550左右注释 + commonOrderInfo.getOrderInfo().setGhfId(zxbm); BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), zxbm); if (buyerEntity != null && StringUtils.isNotBlank(buyerEntity.getTaxpayerCode())) { BeanTransitionUtils.transitionOrderBuyerInfo(commonOrderInfo, buyerEntity);