Commit df676e47fbbc1ea79ae54a61d05dd9f3d638d817
1 parent
8bbd1d9c
fix(wms): 代码风格统一
Showing
2 changed files
with
2 additions
and
5 deletions
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/item/WmsItemSkuServiceImpl.java
| @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.wms.service.md.item; | @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.wms.service.md.item; | ||
| 2 | 2 | ||
| 3 | import cn.hutool.core.collection.CollUtil; | 3 | import cn.hutool.core.collection.CollUtil; |
| 4 | import cn.hutool.core.collection.ListUtil; | 4 | import cn.hutool.core.collection.ListUtil; |
| 5 | +import cn.hutool.core.util.ObjectUtil; | ||
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 6 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; | 7 | import cn.iocoder.yudao.framework.common.util.object.BeanUtils; |
| 7 | import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.sku.WmsItemSkuPageReqVO; | 8 | import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.sku.WmsItemSkuPageReqVO; |
| @@ -23,7 +24,6 @@ import org.springframework.validation.annotation.Validated; | @@ -23,7 +24,6 @@ import org.springframework.validation.annotation.Validated; | ||
| 23 | import java.util.Collection; | 24 | import java.util.Collection; |
| 24 | import java.util.HashSet; | 25 | import java.util.HashSet; |
| 25 | import java.util.List; | 26 | import java.util.List; |
| 26 | -import java.util.Objects; | ||
| 27 | import java.util.Set; | 27 | import java.util.Set; |
| 28 | 28 | ||
| 29 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | 29 | import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; |
| @@ -75,7 +75,7 @@ public class WmsItemSkuServiceImpl implements WmsItemSkuService { | @@ -75,7 +75,7 @@ public class WmsItemSkuServiceImpl implements WmsItemSkuService { | ||
| 75 | List<WmsItemSkuDO> oldList = itemSkuMapper.selectListByItemId(itemId); | 75 | List<WmsItemSkuDO> oldList = itemSkuMapper.selectListByItemId(itemId); |
| 76 | List<WmsItemSkuDO> newList = BeanUtils.toBean(skus, WmsItemSkuDO.class); | 76 | List<WmsItemSkuDO> newList = BeanUtils.toBean(skus, WmsItemSkuDO.class); |
| 77 | List<List<WmsItemSkuDO>> diffList = diffList(oldList, newList, // id 不同,就认为是不同的记录 | 77 | List<List<WmsItemSkuDO>> diffList = diffList(oldList, newList, // id 不同,就认为是不同的记录 |
| 78 | - (oldVal, newVal) -> Objects.equals(oldVal.getId(), newVal.getId())); | 78 | + (oldVal, newVal) -> ObjectUtil.equal(oldVal.getId(), newVal.getId())); |
| 79 | 79 | ||
| 80 | // 第二步,批量添加、修改、删除 | 80 | // 第二步,批量添加、修改、删除 |
| 81 | if (CollUtil.isNotEmpty(diffList.get(2))) { | 81 | if (CollUtil.isNotEmpty(diffList.get(2))) { |
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/order/shipment/WmsShipmentOrderServiceImpl.java
| @@ -195,9 +195,6 @@ public class WmsShipmentOrderServiceImpl implements WmsShipmentOrderService { | @@ -195,9 +195,6 @@ public class WmsShipmentOrderServiceImpl implements WmsShipmentOrderService { | ||
| 195 | if (totalPrice != null) { | 195 | if (totalPrice != null) { |
| 196 | return totalPrice; | 196 | return totalPrice; |
| 197 | } | 197 | } |
| 198 | - if (quantity == null || price == null) { | ||
| 199 | - return null; | ||
| 200 | - } | ||
| 201 | return MoneyUtils.priceMultiply(price, quantity); | 198 | return MoneyUtils.priceMultiply(price, quantity); |
| 202 | } | 199 | } |
| 203 | 200 |