diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java index bab3c16b..8d2dd881 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java @@ -185,6 +185,9 @@ public class BuyerController { OrderInfo orderInfo = new OrderInfo(); orderInfo.setGhfMc(StringUtils.isBlank(buyerEntity.getPurchaseName())?null:buyerEntity.getPurchaseName()); orderInfo.setGhfNsrsbh(StringUtils.isBlank(buyerEntity.getTaxpayerCode())?null:buyerEntity.getTaxpayerCode()); + if (StringUtils.isNotBlank(orderInfo.getGhfNsrsbh())) { + orderInfo.setGhfQylx(OrderInfoEnum.GHF_QYLX_04.getKey()); + } if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){ buyerEntity.getBuyerEntityDetail().forEach(t->{ if("0".equals(t.getDefaultMark())){ 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 1e460713..b268daa4 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 @@ -2103,6 +2103,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()); + } /** * 如果购方税号为空,补全税号 diff --git a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml index 8b83fe38..2524f90e 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml @@ -526,6 +526,10 @@ oi.ghf_email = #{orderInfo.ghfEmail,jdbcType=VARCHAR}, + + oi.ghf_qylx = #{orderInfo.ghfQylx,jdbcType=VARCHAR}, + + op.ghf_mc = #{orderInfo.ghfMc,jdbcType=VARCHAR},