Commit 42f7060f by huluobin

update

parent 02da5228
......@@ -46,6 +46,9 @@ public class OrderManageDTOAssembler implements Function<OrderManage, OrderManag
orderManageDTO.setTimesCardUsedRecordDTOList(orderManage.getListTimesCardRecord()
.stream().map(timesCardUsedRecordDTOAssembler).collect(Collectors.toList()));
}
orderManageDTO.setCustomer(orderManage.getCustomer());
orderManageDTO.setPayCustomer(orderManage.getPayCustomer());
return orderManageDTO;
}
......
......@@ -224,10 +224,6 @@ public class OrderManage implements Serializable {
private String receipt;
@TableField(exist = false)
@ApiModelProperty("开单人")
private StoreUser userManage;
@TableField(exist = false)
@ApiModelProperty("预约建立时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date scheduledTime;
......
package com.gogirl.shared.order.serve.query.dto.ordermanage;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gogirl.domain.user.customer.Customer;
import com.gogirl.shared.market.query.dto.CouponCustomerRelevanceDTO;
import com.gogirl.shared.market.query.dto.TimesCardUsedRecordDTO;
import com.gogirl.shared.order.serve.query.dto.ScheduleManageDTO;
......@@ -136,6 +138,14 @@ public class OrderManageDTO {
@ApiModelProperty("是否朋友代付 1-是 2-否")
private Integer isFriendPay;
@TableField(exist = false)
@ApiModelProperty("下单用户信息")
private Customer customer;
@TableField(exist = false)
@ApiModelProperty("支付用户信息")
private Customer payCustomer;
public void setImages() {
images = orderServeDTOList
.stream()
......
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