Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

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

@@ -10,7 +10,10 @@
@ApiModel(value = "OrderListDto", description = "订单列表接收参数类")
public class OrderListDto extends BasePageDto {

    @ApiModelProperty(value = "订单状态", example = "已付款 全部默认传空字符串")
    @ApiModelProperty(value = "订单状态 0-全部 1-待付款 2-已付款 3-欠款 全部默认传空字符串", example = "1")
    private Integer orderStatus;

    @ApiModelProperty(hidden = true)
    private String status;

    @ApiModelProperty(value = "查询字段")
@@ -18,6 +21,17 @@

    @ApiModelProperty(hidden = true)
    private Long shopId;

    @ApiModelProperty(hidden = true)
    private Long companyId;

    public Long getCompanyId() {
        return companyId;
    }

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

    public Long getShopId() {
        return shopId;
@@ -43,4 +57,28 @@
        this.queryKey = queryKey;
    }

    public Integer getOrderStatus() {
        return orderStatus;
    }

    public void setOrderStatus(Integer orderStatus) {
        this.orderStatus = orderStatus;
        switch (orderStatus) {
            case 0 :
                this.status = "";
                break;
            case 1:
                this.status = "待付款";
                break;
            case 2:
                this.status = "已付款";
                break;
            case 3:
                this.status = "欠款";
                break;
            default:
                this.status = "";
                break;
        }
    }
}