|
@@ -1310,9 +1310,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
item.setDeliveryMaterialsFee(skuDeliveryMaterialsFee)
|
|
|
);
|
|
|
// 订单更新快递包材费
|
|
|
- orderInfo.setDeliveryMaterialsFee(skuDeliveryMaterialsFee.multiply(quantity).setScale(2, RoundingMode.HALF_UP));
|
|
|
- orderInfo.setTotalAmount(totalAmount.subtract(oldDeliveryMaterialsFee).add(orderInfo.getDeliveryMaterialsFee()));
|
|
|
- this.updateById(orderInfo);
|
|
|
+ OrderInfo updateOrderInfo = new OrderInfo();
|
|
|
+ updateOrderInfo.setId(orderInfo.getId());
|
|
|
+ updateOrderInfo.setDeliveryMaterialsFee(skuDeliveryMaterialsFee.multiply(quantity).setScale(2, RoundingMode.HALF_UP));
|
|
|
+ updateOrderInfo.setTotalAmount(totalAmount.subtract(oldDeliveryMaterialsFee).add(orderInfo.getDeliveryMaterialsFee()));
|
|
|
+ this.updateById(updateOrderInfo);
|
|
|
orderSkuService.updateBatchById(orderSkuList);
|
|
|
ObsFileUtil.editFile(dto.getOuterBoxSelfAdhesiveStickerFile(), dto.getId(), 1);
|
|
|
}
|
|
@@ -1468,7 +1470,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
.or()
|
|
|
.like("o", OrderInfo::getWlnCode, dto.getCode()));
|
|
|
|
|
|
- wrapper.ne("o", OrderInfo::getExceptionType, OrderExceptionTypeEnum.NORMAL.getKey().toString());
|
|
|
+ wrapper.eq("o", OrderInfo::getExceptionType, OrderExceptionTypeEnum.NORMAL.getKey().toString());
|
|
|
|
|
|
Page<OrderInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
return page;
|