修复每日业绩bug和优化赠送业绩计算方式

935090232@qq.com

2021-06-18 e423d56d730db1baed24f3f7dbbc4141038776b6

 zq-erp/src/main/java/com/matrix/system/app/dto/ServiceOrderListDto.java

@@ -13,8 +13,9 @@
    @ApiModelProperty(value = "查询参数")
    private String queryKey;

    @ApiModelProperty(value = "状态 0/全部 1/待确认 2/待排班 3/待配料 4/待服务 5/服务中 6/已完成")
    @ApiModelProperty(value = "状态 0/全部 1/待确认 2/待排班 3/待配料 4/待服务 5/服务中 6/已完成 ")
    private String status;


    @ApiModelProperty(hidden = true)
    private Long shopId;
@@ -22,6 +23,28 @@
    @ApiModelProperty(hidden = true)
    private Long userId;

    @ApiModelProperty(value = "客户ID")
    private Long vipId;

    @ApiModelProperty(hidden = true)
    private Long companyId;

    public Long getCompanyId() {
        return companyId;
    }

    public void setCompanyId(Long companyId) {
        this.companyId = companyId;
    }

    public Long getVipId() {
        return vipId;
    }

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

    public Long getUserId() {
        return userId;
    }