Commit 02da5228 by huluobin

update

parent 05dd580d
......@@ -599,6 +599,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
.eq(OrderManage::getPayUser, customerId)))
.orderByDesc(OrderManage::getCreateTime));
// List<Integer> orderUserIdList = orderManageList.stream().map(OrderManage::getOrderUser).collect(Collectors.toList());
// List<Integer> payUserIdList = orderManageList.stream().map(OrderManage::getPayUser).collect(Collectors.toList());
//订单记录的图片
for (OrderManage orderManage : orderManageList) {
//订单详情
......@@ -620,6 +623,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
Customer customer = customerService.getById(orderManage.getOrderUser());
orderManage.setCustomer(customer);
//支付用户信息
Customer payCustomer = customerService.getById(orderManage.getPayUser());
orderManage.setPayCustomer(payCustomer);
orderServeList.forEach(orderServe -> {
//订单详情 款式sku
......@@ -633,6 +639,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
}
PageInfo<OrderManage> pageInfo = new PageInfo<>(orderManageList);
Map<String, Object> map = new HashMap<>();
map.put("pageInfo", pageInfo);
......
......@@ -199,10 +199,15 @@ public class OrderManage implements Serializable {
private String deleteOrder;
@TableField(exist = false)
@ApiModelProperty("预约用户信息")
@ApiModelProperty("下单用户信息")
private Customer customer;
@TableField(exist = false)
@ApiModelProperty("支付用户信息")
private Customer payCustomer;
@TableField(exist = false)
@ApiModelProperty("导出订单按月份")
private String exportTime;
......@@ -276,4 +281,5 @@ public class OrderManage implements Serializable {
@ApiModelProperty("是否发送评论服务通知 0-没有 1-是")
private Integer isSendCommentMsg;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment