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

修改order代码

Browse Source
This commit is contained in:
fxh 2025-06-10 15:35:14 +08:00
parent 729ac67fea
commit 86750e61ea
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderController.java
View File

@ -57,7 +57,7 @@ public class OrderController extends BaseController {
@ApiOperation("查询订单售后列表") @ApiOperation("查询订单列表")
@PostMapping("/list") @PostMapping("/list")
public R<Page<OrderVO>> list(@RequestBody OrderBo query, Page<Order> page) { public R<Page<OrderVO>> list(@RequestBody OrderBo query, Page<Order> page) {
Page<Order> list = service.page(page,query.toWrapper() ); Page<Order> list = service.page(page,query.toWrapper() );

2
ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/controller/OrderDeliveryHistoryController.java
View File

@ -52,7 +52,7 @@ public class OrderDeliveryHistoryController extends BaseController {
// return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); // return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal()));
// } // }
@ApiOperation("查询订单表列表") @ApiOperation("查询订单发货列表")
@PostMapping("/list") @PostMapping("/list")
public R<IPage<OrderDeliveryHistoryVO>> list(@RequestBody OrderDeliveryHistoryBo query, Page<OrderDeliveryHistory> page) { public R<IPage<OrderDeliveryHistoryVO>> list(@RequestBody OrderDeliveryHistoryBo query, Page<OrderDeliveryHistory> page) {
Page<OrderDeliveryHistory> list = historyService.page(page,query.toWrapper() ); Page<OrderDeliveryHistory> list = historyService.page(page,query.toWrapper() );

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

@ -24,7 +24,8 @@ public class OrderItem extends BaseAudit {
@ApiModelProperty("ID") @ApiModelProperty("ID")
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
private Long id; private Long id;
@Excel(name = "商家备注")
private String merchantNote;
@ApiModelProperty("订单id") @ApiModelProperty("订单id")
@Excel(name = "订单id") @Excel(name = "订单id")
private Long orderId; private Long orderId;

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

@ -31,6 +31,7 @@ public class OrderVO extends BaseAudit {
/** 用户帐号 */ /** 用户帐号 */
@Excel(name = "用户帐号") @Excel(name = "用户帐号")
private String memberUsername; private String memberUsername;
/** 商家备注 */ /** 商家备注 */
@Excel(name = "商家备注") @Excel(name = "商家备注")
private String merchantNote; private String merchantNote;