From be8875a1ff53a3c4211f5304ff32073e931b6e22 Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 13 Jun 2023 15:35:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?task4575=20PO=E9=9B=86=E6=88=90=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E8=B4=AD=E6=96=B9=E6=B2=A1=E6=9C=89=E7=A8=8E=E5=8F=B7?= =?UTF-8?q?=E7=9A=84=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BA=E4=B8=AA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/consumer/utils/BeanTransitionUtils.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java index 55c4da32..f1f26777 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java @@ -2100,6 +2100,10 @@ public class BeanTransitionUtils { if (StringUtils.isBlank(commonOrderInfo.getOrderInfo().getGhfQylx())) { commonOrderInfo.getOrderInfo().setGhfQylx(buyerEntity.getGhfQylx()); } + // task4575 购方税号为空设置为个人发票 + if (StringUtils.isBlank(buyerEntity.getTaxpayerCode())) { + commonOrderInfo.getOrderInfo().setGhfQylx(OrderInfoEnum.GHF_QYLX_03.getKey()); + } /** * 如果购方税号为空,补全税号 From 8c82c95c8ede6444c92277546f144a6c21d6636c Mon Sep 17 00:00:00 2001 From: WangQi <1021674882@qq.com> Date: Tue, 13 Jun 2023 17:13:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?task4631=20=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8D=95=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=AF=E5=90=A6=E6=A0=A1=E9=AA=8C=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/order/consumer/model/OderDetailInfo.java | 5 ++++- .../order/service/impl/OrderInfoServiceImpl.java | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) 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 74db2a95..9516226a 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 @@ -244,6 +244,9 @@ public class OderDetailInfo { */ private String xtly; - + /** + * 开票是否校验银行账号信息 0否 1是 + */ + private String checkBankFlag; } 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 b69f4ab2..e217c53a 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 @@ -10,6 +10,7 @@ import com.dxhy.base.constant.TaxSeparateConfig; import com.dxhy.base.utils.PriceTaxSeparationUtilNew; import com.dxhy.common.generatepdf.util.EwmUtil; import com.dxhy.order.baseservice.config.BaseServiceConfig; +import com.dxhy.order.baseservice.module.buyer.dao.BuyerMapper; import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity; import com.dxhy.order.baseservice.module.buyer.service.BuyerService; import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity; @@ -60,6 +61,7 @@ import com.dxhy.order.model.qdsk.taxpayerinfo.Qdjcxx; import com.dxhy.order.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -174,6 +176,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { @Resource private GsClientMapper gsClientMapper; + @Autowired + private BuyerMapper buyerMapper; + @Override public PageUtils selectOrderInfo(Map map, List shList, List entList) { return orderProcessService.selectOrderInfo(map, shList, entList); @@ -252,6 +257,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { oderDetailInfo = this.convertOderDetailInfo(orderProcessInfo, orderItemList, orderInfo, pageOrderExts, orderInvoiceInfo); + BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId()); + if (buyerEntity == null) { + log.error("{}查询原始订单客户信息为空，id为：{}", LOGGER_MSG, orderProcessInfo.getOrderInfoId()); + return null; + } + + oderDetailInfo.setCheckBankFlag(buyerEntity.getCheckBankFlag()); /** * 如果是机动车,返回机动车信息