abu/wzj-boot
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix]修改订单列表

Browse Source
This commit is contained in:
wangqx 2025-09-12 14:40:29 +08:00
parent c9ff830a56
commit 9fbe5561cc
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/entity/OrderItem.java
View File

@ -86,4 +86,12 @@ public class OrderItem extends BaseAudit {
@Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
@Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
private String spData;
@Schema(description = "租户id")
@Excel(name = "租户id")
private String tenantId;
@Schema(description = "租户名称")
@Excel(name = "租户名称")
private String tenantName;
}

4
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/vo/OrderItemVO.java
View File

@ -88,4 +88,8 @@ public class OrderItemVO extends BaseAudit {
@Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
@Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
private String spData;
private String tenantId;
private String tenantName;
}

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/service/impl/OrderServiceImpl.java
View File

@ -268,7 +268,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
LoginUser loginUser = LoginHelper.getLoginUser();
Assert.isTrue(Objects.equals(loginUser.getUserId(), order.getMemberId()), () -> new ServiceException("无权限取消非本人订单"));
Assert.isTrue(OrderStatusEnum.UNPAID.getValue().equals(order.getStatus()), () -> new ServiceException("订单已支付，不能取消"));
orderMapper.updateById(Order.builder().id(orderId).status(OrderStatusEnum.CLOSED.getValue()).build());
orderMapper.updateById(Order.builder().id(orderId).status(OrderStatusEnum.CANCELLED.getValue()).build());
}
@Override