提交 9383aa1d authored 作者: huyufan's avatar huyufan

修改Bug

上级 11231271
...@@ -66,7 +66,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> { ...@@ -66,7 +66,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
OrderGoodsVO findOrderGoodsById(Integer id); OrderGoodsVO findOrderGoodsById(Integer id);
@UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoods") @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoods")
Integer updateOrderGoods(@Param(value = "param") OrderGoodsEditParams orderGoodsEditParams); Integer updateOrderGoods(@Param(value = "params") OrderGoodsEditParams orderGoodsEditParams);
@UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus") @UpdateProvider(type = OrderGoodsSqlProvider.class, method = "updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus")
Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id); Integer updateOrderGoodsSetResidueWeightAndAlreadyWeightAndStatus(@Param(value = "residueWeight") BigDecimal residueWeight,@Param(value = "alreadyWeight") BigDecimal alreadyWeight,@Param(value = "status") Integer status,@Param(value = "id") Integer id);
......
...@@ -402,7 +402,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -402,7 +402,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
ids.add(orderChild.getId()); ids.add(orderChild.getId());
} }
Map<String, List<OrderChild>> orderChildMap = null; Map<String, List<OrderChild>> orderChildMap = new HashMap<>();
if (CollectionUtil.isNotEmpty(ids)) { if (CollectionUtil.isNotEmpty(ids)) {
orderChildDao.batchUpdateOrderChildStatus( orderChildDao.batchUpdateOrderChildStatus(
OrderChildEnum.Status.OWNER_CANCEL.getCode(), OrderChildEnum.Status.OWNER_CANCEL.getCode(),
...@@ -417,7 +417,7 @@ public class OrderCancelServiceImpl implements OrderCancelService { ...@@ -417,7 +417,7 @@ public class OrderCancelServiceImpl implements OrderCancelService {
for (OrderGoods orderGoods : orderGoodsList) { for (OrderGoods orderGoods : orderGoodsList) {
OrderGoods update = new OrderGoods(); OrderGoods update = new OrderGoods();
update.setId(orderGoods.getId()); update.setId(orderGoods.getId());
if (orderChildMap != null && CollectionUtil.isEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) { if (CollectionUtil.isEmpty(orderChildMap.get(orderGoods.getOrderGoodsNo()))) {
update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode()); update.setOrderGoodsStatus(OrderGoodsStatusEnum.Status.CANCEL.getCode());
} else { } else {
BigDecimal reduce = orderChildMap.get(orderGoods.getOrderGoodsNo()) BigDecimal reduce = orderChildMap.get(orderGoods.getOrderGoodsNo())
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论