Compare commits
No commits in common. "8058773aacfaa90f6dcd978a8a4062bbf962288c" and "b60f4d92101f755bfd5e3e5c434439610e840551" have entirely different histories.
8058773aac
...
b60f4d9210
@ -391,7 +391,6 @@ public class ShopOrderBaseController extends BaseControllerImpl {
|
||||
return CommonResult.failed(ResultCode.FORBIDDEN);
|
||||
}
|
||||
|
||||
|
||||
// 5. 返回结果
|
||||
return CommonResult.success(mchOrderInfoDTO);
|
||||
} catch (Exception e) {
|
||||
|
||||
@ -9058,18 +9058,10 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
|
||||
// 格式化取货号
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 商家订单各个分类和状态的订单数量
|
||||
*
|
||||
|
||||
Loading…
Reference in New Issue
Block a user