Merge branch 'api' into order_reform

Helius

2021-01-12 5cb9253ec5ca86587a154226998ccc4eae3a14fd

Merge branch 'api' into order_reform

 zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "订单ID")
    private String orderId;

    @ApiModelProperty(value = "会员ID")
    private String vipId;

    @ApiModelProperty(value = "会员姓名")
    private String vipName;

@@ -59,6 +62,13 @@
    @ApiModelProperty(value = "下单时间")
    private Date orderTime;

    public String getVipId() {
        return vipId;
    }

    public void setVipId(String vipId) {
        this.vipId = vipId;
    }

    public Date getOrderTime() {
        return orderTime;

 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java

@@ -18,6 +18,9 @@
    @ApiModelProperty(value = "服务单Id")
    private Long id;

    @ApiModelProperty(value = "会员ID")
    private Long vipId;

    @ApiModelProperty(value = "下单顾问ID")
    private Long createStaffId;

@@ -43,6 +46,14 @@
    @ApiModelProperty(value = "服务项目信息")
    private List<ServiceOrderListProjVo> projs;

    public Long getVipId() {
        return vipId;
    }

    public void setVipId(Long vipId) {
        this.vipId = vipId;
    }

    public Long getCreateStaffId() {
        return createStaffId;
    }

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -481,6 +481,7 @@
    <select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">
        select
           a.id orderId,
           a.VIP_ID vipId,
           a.ORDER_NO orderNo,
           a.ORDER_TIME orderTime,
           a.STATU orderStatus,

 zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml

@@ -464,6 +464,7 @@
        <result property="time" column="time"/>
        <result property="bed" column="bed" />
        <result property="vipName" column="vipName" />
        <result property="vipId" column="vipId" />
        <result property="timeLength" column="timeLength" />
        <result property="status" column="status" />
        <result property="createStaffId" column="createStaffId" />
@@ -485,6 +486,7 @@
           a.create_staff_id createStaffId,
           d.BED_NAME bed,
           e.VIP_NAME vipName,
           e.id vipId,
           b.staff_id staffId,
           f.su_name beautyName,
           g.proj_name projName