From 4ca94b155b77422d91707e91df9da80d3e59e713 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 8 May 2023 16:56:36 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consumer/modules/order/controller/BuyerController.java | 6 +++--- .../src/main/resources/mybatis/mapper/OrderInfoMapper.xml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) 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 5ba23c16..dced5317 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 @@ -36,7 +36,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 购方信息控制层 @@ -195,8 +194,9 @@ public class BuyerController { }); } orderInfo.setEntId(buyerEntity.getDeptId()); - orderInfo.setGhfSj(StringUtils.isBlank(buyerEntity.getSjh())?null:buyerEntity.getSjh()); - orderInfo.setGhfEmail(StringUtils.isBlank(buyerEntity.getEmail())?null:buyerEntity.getEmail()); + orderInfo.setGhfId(buyerEntity.getBuyerCode()); +// orderInfo.setGhfSj(StringUtils.isBlank(buyerEntity.getSjh())?null:buyerEntity.getSjh()); +// orderInfo.setGhfEmail(StringUtils.isBlank(buyerEntity.getEmail())?null:buyerEntity.getEmail()); orderInfoService.updateOrderBuyerInfo(orderInfo,null); } } 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 67b90317..7ceca33a 100644 --- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml +++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml @@ -541,7 +541,9 @@ oii.ghf_sj = #{orderInfo.ghfSj,jdbcType=VARCHAR}, - where oi.ent_id = #{orderInfo.entId,jdbcType=VARCHAR} and op.ddzt in ('0','1','2','3') and op.order_status = '0' + where oi.ent_id = #{orderInfo.entId,jdbcType=VARCHAR} + and oi.ghf_id = #{orderInfo.ghfId,jdbcType=VARCHAR} + and op.ddzt in ('0','1','2','3') and op.order_status = '0'