|
|
@@ -131,7 +131,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
|
|
|
if (request.getUserPhone() == null) {
|
|
|
throw new ServiceException("用户电话不能为空");
|
|
|
}
|
|
|
- if (request.getUserAddress()== null) {
|
|
|
+ if (request.getUserAddress() == null) {
|
|
|
throw new ServiceException("用户地址不能为空");
|
|
|
}
|
|
|
if (request.getProductId() == null) {
|
|
|
@@ -437,7 +437,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
|
|
|
* @return AfterSaleInfoVo 售后信息
|
|
|
*/
|
|
|
private AfterSaleInfoVo buildAfterSaleInfo(Long orderId) {
|
|
|
- AfterSaleInfoVo afterSaleInfo = new AfterSaleInfoVo();
|
|
|
+ AfterSaleInfoVo afterSaleInfo = null;
|
|
|
// 查询售后订单
|
|
|
LambdaQueryWrapper<AfterSaleOrder> queryWrapper = new LambdaQueryWrapper<AfterSaleOrder>()
|
|
|
.eq(AfterSaleOrder::getOrderId, orderId)
|
|
|
@@ -445,7 +445,8 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
|
|
|
.last("LIMIT 1");
|
|
|
AfterSaleOrder afterSaleOrder = afterSaleOrderMapper.selectOne(queryWrapper);
|
|
|
|
|
|
- if (afterSaleOrder != null) {
|
|
|
+ if (ObjectUtil.isNotNull(afterSaleOrder)) {
|
|
|
+ afterSaleInfo = new AfterSaleInfoVo();
|
|
|
afterSaleInfo.setAfterSaleNo(afterSaleOrder.getAfterSaleNo());
|
|
|
afterSaleInfo.setOrderId(afterSaleOrder.getOrderId());
|
|
|
afterSaleInfo.setOrderNo(afterSaleOrder.getOrderNo());
|
|
|
@@ -670,7 +671,7 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
|
|
|
ProductOrderInfo productOrderInfo = getAndCheckOrder(dto.getOrderId(), null);
|
|
|
|
|
|
// 保证只有在待发货的状态才能修改
|
|
|
- if(ObjectUtil.notEqual(ProductOrderStatusEnum.WAIT_DELIVERY.getCode(), productOrderInfo.getOrderStatus())){
|
|
|
+ if (ObjectUtil.notEqual(ProductOrderStatusEnum.WAIT_DELIVERY.getCode(), productOrderInfo.getOrderStatus())) {
|
|
|
throw new ServiceException("订单状态不是待发货状态无权限操作");
|
|
|
}
|
|
|
|