|
@@ -1287,6 +1287,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
public Boolean updateByEditBo(OrderEditBo bo) {
|
|
public Boolean updateByEditBo(OrderEditBo bo) {
|
|
Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId, bo.getOrderId()));
|
|
Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderId, bo.getOrderId()));
|
|
if (order.getOrderStatus() > 0) {
|
|
if (order.getOrderStatus() > 0) {
|
|
@@ -1302,7 +1303,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
//手动关闭订单
|
|
//手动关闭订单
|
|
OrderVo orderVo = this.queryById(bo.getOrderId());
|
|
OrderVo orderVo = this.queryById(bo.getOrderId());
|
|
OrderGoodsQueryBo bo1 = new OrderGoodsQueryBo();
|
|
OrderGoodsQueryBo bo1 = new OrderGoodsQueryBo();
|
|
- bo.setOrderSn(orderVo.getOrderSn());
|
|
|
|
|
|
+ bo1.setOrderSn(orderVo.getOrderSn());
|
|
List<OrderGoodsVo> orderGoodsVoList = iOrderGoodsService.selectList(bo1);
|
|
List<OrderGoodsVo> orderGoodsVoList = iOrderGoodsService.selectList(bo1);
|
|
for (OrderGoodsVo g : orderGoodsVoList) {
|
|
for (OrderGoodsVo g : orderGoodsVoList) {
|
|
//关闭锁定班级
|
|
//关闭锁定班级
|