|
@@ -125,6 +125,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
@Override
|
|
|
public Page<OrderInfoVo> getPage(OrderSelectDto dto) {
|
|
|
IWrapper<OrderInfo> wrapper = getWrapper();
|
|
|
+ wrapper.orderByDesc("if(o.status = 60, 1, 0)");
|
|
|
wrapper.orderByDesc("o", OrderInfo::getId);
|
|
|
wrapper.eq("d", Department::getId, dto.getDepartmentId());
|
|
|
wrapper.like("d", Department::getName, dto.getDepartmentName());
|
|
@@ -857,6 +858,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
|
|
|
.eq(BaseIdPo::getId, dto.getId()));
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void suspendOrder(Long id) {
|
|
|
+ OrderInfo orderInfo = this.getById(id);
|
|
|
+ if (orderInfo == null) {
|
|
|
+ throw new ServiceException("未找到订单");
|
|
|
+ }
|
|
|
+ this.update(q -> q.set(OrderInfo::getStatus, OrderStatusEnum.SUSPEND.getKey())
|
|
|
+ .eq(BaseIdPo::getId, id));
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void cancelSuspendOrder(Long id) {
|
|
|
+ OrderInfo orderInfo = this.getById(id);
|
|
|
+ if (orderInfo == null) {
|
|
|
+ throw new ServiceException("未找到订单");
|
|
|
+ }
|
|
|
+ this.update(q -> q.set(OrderInfo::getStatus, OrderStatusEnum.STOCK_PREPARATION.getKey())
|
|
|
+ .eq(BaseIdPo::getId, id));
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 删除订单以及订单关联数据
|
|
|
*/
|