Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

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

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

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


    @ApiModelProperty(hidden = true)
    private Long shopId;

    @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;
    }

    public void setUserId(Long userId) {
        this.userId = userId;
    }

    public Long getShopId() {
        return shopId;
@@ -45,19 +79,22 @@
                this.status = "";
                break;
            case "1":
                this.status = "待确认";
                break;
            case "2":
                this.status = "待预约";
                break;
            case "2" :
                this.status = "带配料";
                break;
            case "3" :
                this.status = "待服务";
                this.status = "需配料";
                break;
            case "4" :
                this.status = "服务中";
                this.status = "配料完成";
                break;
            case "5" :
                this.status = "已完成";
                this.status = "服务中";
                break;
            case "6" :
                this.status = "服务完成";
                break;
            default:
                this.status = "";