Compare commits

...

2 Commits

2 changed files with 10 additions and 1 deletions

View File

@ -391,6 +391,7 @@ public class ShopOrderBaseController extends BaseControllerImpl {
return CommonResult.failed(ResultCode.FORBIDDEN); return CommonResult.failed(ResultCode.FORBIDDEN);
} }
// 5. 返回结果 // 5. 返回结果
return CommonResult.success(mchOrderInfoDTO); return CommonResult.success(mchOrderInfoDTO);
} catch (Exception e) { } catch (Exception e) {

View File

@ -9058,10 +9058,18 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
// 格式化取货号 // 格式化取货号
orderDetail.setOrder_pickup_num_str(fmtPickNum(orderDetail.getOrder_pickup_num())); orderDetail.setOrder_pickup_num_str(fmtPickNum(orderDetail.getOrder_pickup_num()));
// 订单是否禁止退款
int isOrderDenyReturn = shopOrderReturnService.isOrderDenyReturn(orderId) ? 1 : 2;
orderDetail.setIs_deny_return(isOrderDenyReturn);
// 订单商品列表是否禁止退款
orderDetail.getOrder_items().forEach(item -> {
item.setIs_deny_return(isOrderDenyReturn);
});
return orderDetail; return orderDetail;
} }
/** /**
* 商家订单各个分类和状态的订单数量 * 商家订单各个分类和状态的订单数量
* *