mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：产品类型变更后的服务金额计算调整

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-04-13 18:08:14 +08:00
parent 086af70f22
commit 7f39e3029f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OmsInventoryInnerServiceImpl.java
View File

@ -117,7 +117,7 @@ public class OmsInventoryInnerServiceImpl implements IOmsInventoryInnerService {
if (CollUtil.isEmpty(inventoryInfoList)) { if (CollUtil.isEmpty(inventoryInfoList)) {
return 0; return 0;
} }
if (!Arrays.asList("11", "22").contains(omsInventoryInner.getProductType())) { if (!Arrays.asList("3", "22").contains(omsInventoryInner.getProductType())) {
omsInventoryInner.setQuantity((long) inventoryInfoList.size()); omsInventoryInner.setQuantity((long) inventoryInfoList.size());
} }
List<String> productCodeList = inventoryInfoList.stream().map(InventoryInfo::getProductCode).distinct().filter(StringUtils::isNotEmpty).collect(Collectors.toList()); 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())) { 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 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.multiply(new BigDecimal(omsInventoryInner.getQuantity())).setScale(2, RoundingMode.HALF_UP)
: reduce; : reduce;
//生成应付单 //生成应付单

2
ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml
View File

@ -255,7 +255,7 @@
t1.*,t2.* t1.*,t2.*
FROM FROM
order_list t1 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 WHERE
t1.order_id IN t1.order_id IN
<foreach collection="list" item="item" index="index" separator="," open="(" close=")"> <foreach collection="list" item="item" index="index" separator="," open="(" close=")">