From 7f39e3029f66df883417f189aa93b72c19fa37df Mon Sep 17 00:00:00 2001
From: "UNISINSIGHT\\rdpnr_jiangpeng" <Cq258258>
Date: Mon, 13 Apr 2026 18:08:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BA=A7=E5=93=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=98=E6=9B=B4=E5=90=8E=E7=9A=84=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java  | 4 ++--
 .../src/main/resources/mapper/manage/OrderInfoMapper.xml      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
index 23a142e8..5661e6f7 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
@@ -117,7 +117,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
         if (CollUtil.isEmpty(inventoryInfoList)) {
             return 0;
         }
-        if (!Arrays.asList("11", "22").contains(omsInventoryInner.getProductType())) {
+        if (!Arrays.asList("3", "22").contains(omsInventoryInner.getProductType())) {
             omsInventoryInner.setQuantity((long) inventoryInfoList.size());
         }
         List<String> productCodeList = inventoryInfoList.stream().map(InventoryInfo::getProductCode).distinct().filter(StringUtils::isNotEmpty).collect(Collectors.toList());
@@ -149,7 +149,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
         if ((vendorInfo != null && VendorInfo.PayTypeEnum.INNER_PAY.getCode().equals(vendorInfo.getPayType())) || !Arrays.asList("1", "2").contains(omsInventoryInner.getProductType())) {
             BigDecimal reduce = inventoryInfoList.stream().map(InventoryInfo::getInnerPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
             //服务金额为单价* 数量  没有具体的详情
-            BigDecimal totalPriceWithTax = Arrays.asList("11", "22").contains(omsInventoryInner.getProductType()) ?
+            BigDecimal totalPriceWithTax = Arrays.asList("3", "22").contains(omsInventoryInner.getProductType()) ?
                     reduce.multiply(new BigDecimal(omsInventoryInner.getQuantity())).setScale(2, RoundingMode.HALF_UP)
                     : reduce;
             //生成应付单
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
index 9e59a854..c071847a 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
@@ -255,7 +255,7 @@
         t1.*,t2.*
         FROM
         order_list t1
-        inner join product_info t2 on t1.product_code=t2.product_code and t2.type in (11,22)
+        inner join product_info t2 on t1.product_code=t2.product_code and t2.type in (3,22)
         WHERE
         t1.order_id IN
         <foreach collection="list" item="item" index="index" separator="," open="(" close=")">