From 811138e451588ff73afcc128a864a6c6c2433392 Mon Sep 17 00:00:00 2001
From: liufeilong <liufeilong@ele-cloud.com>
Date: Tue, 4 Apr 2023 10:50:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9B=86=E5=9B=A2=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/dxhy/order/model/OrderItemInfo.java   | 5 +++++
 .../com/dxhy/order/consumer/utils/PageDataDealUtil.java     | 6 ++++++
 .../resources/mybatis/mapper/GroupCommodityCodeMapper.xml   | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java b/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java
index ab887fd2..4b8b0e78 100644
--- a/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java
+++ b/order-management-common/src/main/java/com/dxhy/order/model/OrderItemInfo.java
@@ -185,4 +185,9 @@ public class OrderItemInfo implements Serializable {
      */
     private String tswl;
 
+    /**
+     * 价税合计
+     */
+    private String jshj;
+
 }
diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/PageDataDealUtil.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/PageDataDealUtil.java
index db3f986a..c64d4753 100644
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/PageDataDealUtil.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/PageDataDealUtil.java
@@ -83,6 +83,12 @@ public class PageDataDealUtil {
                 orderItemInfo.setSl(orderItemInfo.getSl().contains("%") ? orderItemInfo.getSl() : CommonUtils.formatPercentSl(orderItemInfo.getSl()));
             }
 
+            if(ConfigureConstant.STRING_0.equals(orderItemInfo.getHsbz())){
+                orderItemInfo.setJshj(new BigDecimal(orderItemInfo.getXmje()).add(new BigDecimal(orderItemInfo.getSe())).toString());
+            }else {
+                orderItemInfo.setJshj(orderItemInfo.getXmje());
+            }
+
         }
 
     }
diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
index 79faafce..0e98cd0c 100644
--- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
+++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml
@@ -110,10 +110,10 @@
                 AND cc.wlflmc LIKE CONCAT('%',#{wlflmc},'%')
             </if>
             <if test="zxbm != null and zxbm != ''">
-                AND cc.zxbm LIKE CONCAT('%',#{zxbm},'%')
+                AND cc.encoding LIKE CONCAT('%',#{zxbm},'%')
             </if>
             <if test="xmmc != null and xmmc != ''">
-                AND cc.xmmc LIKE CONCAT('%',#{xmmc},'%')
+                AND cc.merchandise_name LIKE CONCAT('%',#{xmmc},'%')
             </if>
             AND cc.xhf_nsrsbh = '-1'
         </where>