|
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import cn.hutool.core.util.StrUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
+import com.baomidou.mybatisplus.core.injector.methods.UpdateById;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.hys.app.converter.erp.OrderConverter;
|
|
import com.hys.app.converter.erp.OrderConverter;
|
|
@@ -260,9 +261,9 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
break;
|
|
break;
|
|
case "to_be_return":
|
|
case "to_be_return":
|
|
wrapper.eq(OrderSendDO::getOrderType, OrderTypeEnum.TO_C);
|
|
wrapper.eq(OrderSendDO::getOrderType, OrderTypeEnum.TO_C);
|
|
- wrapper.and(item->item.eq(OrderSendDO::getStatus, SaleOrderSendStatusEnum.SENDING)
|
|
|
|
|
|
+ wrapper.and(item -> item.eq(OrderSendDO::getStatus, SaleOrderSendStatusEnum.SENDING)
|
|
.or()
|
|
.or()
|
|
- .eq(OrderSendDO::getStatus, SaleOrderSendStatusEnum.TO_BE_SINGE) );
|
|
|
|
|
|
+ .eq(OrderSendDO::getStatus, SaleOrderSendStatusEnum.TO_BE_SINGE));
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
Page<OrderSendDO> paged = orderSendManager.page(page, wrapper);
|
|
Page<OrderSendDO> paged = orderSendManager.page(page, wrapper);
|
|
@@ -341,7 +342,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
throw new ServiceException("未找到冻结记录");
|
|
throw new ServiceException("未找到冻结记录");
|
|
}
|
|
}
|
|
one.setUnLockedTime(new Date());
|
|
one.setUnLockedTime(new Date());
|
|
- if (one.getLockedNum() == (sendItemVO.getNum()+one.getUnLockedNum())){
|
|
|
|
|
|
+ if (one.getLockedNum() == (sendItemVO.getNum() + one.getUnLockedNum())) {
|
|
one.setStatus(true);
|
|
one.setStatus(true);
|
|
}
|
|
}
|
|
one.setUnLockedNum(one.getUnLockedNum() + sendItemVO.getNum());
|
|
one.setUnLockedNum(one.getUnLockedNum() + sendItemVO.getNum());
|
|
@@ -488,6 +489,9 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
if (ObjectUtil.isNull(aDo)) {
|
|
if (ObjectUtil.isNull(aDo)) {
|
|
throw new ServiceException("未找到订单");
|
|
throw new ServiceException("未找到订单");
|
|
}
|
|
}
|
|
|
|
+ if (!aDo.getType().equals(OrderTypeEnum.TO_C)) {
|
|
|
|
+ throw new ServiceException("租赁订单才能做延期");
|
|
|
|
+ }
|
|
//订单延期次数+1
|
|
//订单延期次数+1
|
|
aDo.setExtension(aDo.getExtension() + 1);
|
|
aDo.setExtension(aDo.getExtension() + 1);
|
|
aDo.setRealPrice(orderDTO.getRealPrice());
|
|
aDo.setRealPrice(orderDTO.getRealPrice());
|
|
@@ -568,5 +572,20 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
//保存序列号和子表的关系
|
|
//保存序列号和子表的关系
|
|
itemSnCodeManager.saveBatch(itemSnCodeDOS);
|
|
itemSnCodeManager.saveBatch(itemSnCodeDOS);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ public void returnOrder(Long id) {
|
|
|
|
+ OrderDO aDo = getById(id);
|
|
|
|
+ if (ObjectUtil.isNull(aDo)) {
|
|
|
|
+ throw new ServiceException("订单不存在");
|
|
|
|
+ }
|
|
|
|
+ if (!SaleOrderStatusEnum.TO_BE_SEND.equals(aDo.getStatus())) {
|
|
|
|
+ throw new ServiceException("订单已发货不可撤销,有问题做售后");
|
|
|
|
+ }
|
|
|
|
+ aDo.setStatus(SaleOrderStatusEnum.REVOKE);
|
|
|
|
+ updateById(aDo);
|
|
|
|
+ orderSendManager.remove(new LambdaQueryWrapper<OrderSendDO>().eq(OrderSendDO::getOrderId, id));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|