Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -125,6 +125,9 @@ public class OrderService {
|
||||
@Resource
|
||||
private TbOrderPaymentMapper tbOrderPaymentMapper;
|
||||
|
||||
@Resource
|
||||
private MPOrderDetailMapper mpOrderDetailMapper;
|
||||
|
||||
|
||||
public OrderService(WxAccountUtil wxAccountUtil, MPCashierCartMapper mpCashierCartMapper,
|
||||
TbShopOpenIdMapper shopOpenIdMapper, MpShopTableMapper mpShopTableMapper,
|
||||
@@ -1888,5 +1891,38 @@ public class OrderService {
|
||||
}
|
||||
tbOrderPaymentMapper.updateByPrimaryKey(payment);
|
||||
}
|
||||
mpOrderDetailMapper.update(null, new LambdaUpdateWrapper<TbOrderDetail>()
|
||||
.eq(TbOrderDetail::getOrderId, entity.getId())
|
||||
.set(TbOrderDetail::getStatus, "closed")
|
||||
.set(TbOrderDetail::getUpdateTime, new Date())
|
||||
);
|
||||
mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>().
|
||||
eq(TbCashierCart::getOrderId, entity.getId())
|
||||
.set(TbCashierCart::getStatus, "final")
|
||||
.set(TbCashierCart::getUpdatedAt, System.currentTimeMillis())
|
||||
);
|
||||
if (StrUtil.isBlank(entity.getTableId())) {
|
||||
return;
|
||||
}
|
||||
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
|
||||
.eq(TbShopTable::getQrcode, entity.getTableId())
|
||||
.eq(TbShopTable::getAutoClear, 1)
|
||||
.set(TbShopTable::getStatus, "idle")
|
||||
.set(TbShopTable::getProductNum, 0)
|
||||
.set(TbShopTable::getTotalAmount, BigDecimal.ZERO)
|
||||
.set(TbShopTable::getRealAmount, BigDecimal.ZERO)
|
||||
.set(TbShopTable::getUseNum, 0)
|
||||
.set(TbShopTable::getUpdatedAt, System.currentTimeMillis())
|
||||
);
|
||||
mpShopTableMapper.update(null, new LambdaUpdateWrapper<TbShopTable>()
|
||||
.eq(TbShopTable::getQrcode, entity.getTableId())
|
||||
.eq(TbShopTable::getAutoClear, 0)
|
||||
.set(TbShopTable::getStatus, "cleaning")
|
||||
.set(TbShopTable::getProductNum, 0)
|
||||
.set(TbShopTable::getTotalAmount, BigDecimal.ZERO)
|
||||
.set(TbShopTable::getRealAmount, BigDecimal.ZERO)
|
||||
.set(TbShopTable::getUseNum, 0)
|
||||
.set(TbShopTable::getUpdatedAt, System.currentTimeMillis())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user