fix 过滤

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/BaseFilterController.java

@@ -0,0 +1,91 @@
+package com.zhongzheng.controller.base;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.base.bo.BaseFilterAddBo;
+import com.zhongzheng.modules.base.bo.BaseFilterEditBo;
+import com.zhongzheng.modules.base.bo.BaseFilterQueryBo;
+import com.zhongzheng.modules.base.service.IBaseFilterService;
+import com.zhongzheng.modules.base.vo.BaseFilterVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 业务层次过滤器Controller
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+@Api(value = "业务层次过滤器控制器", tags = {"业务层次过滤器管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/base/filter")
+public class BaseFilterController extends BaseController {
+
+    private final IBaseFilterService iBaseFilterService;
+
+    /**
+     * 查询业务层次过滤器列表
+     */
+    @ApiOperation("查询业务层次过滤器列表")
+    @PreAuthorize("@ss.hasPermi('system:filter:list')")
+    @GetMapping("/list")
+    public TableDataInfo<BaseFilterVo> list(BaseFilterQueryBo bo) {
+        startPage();
+        List<BaseFilterVo> list = iBaseFilterService.queryList(bo);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取业务层次过滤器详细信息
+     */
+    @ApiOperation("获取业务层次过滤器详细信息")
+    @PreAuthorize("@ss.hasPermi('system:filter:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<BaseFilterVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iBaseFilterService.queryById(id));
+    }
+
+    /**
+     * 新增业务层次过滤器
+     */
+    @ApiOperation("新增业务层次过滤器")
+    @PreAuthorize("@ss.hasPermi('system:filter:add')")
+    @Log(title = "业务层次过滤器", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult<Void> add(@RequestBody BaseFilterAddBo bo) {
+        return toAjax(iBaseFilterService.insertByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改业务层次过滤器
+     */
+   /* @ApiOperation("修改业务层次过滤器")
+    @PreAuthorize("@ss.hasPermi('system:filter:edit')")
+    @Log(title = "业务层次过滤器", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody BaseFilterEditBo bo) {
+        return toAjax(iBaseFilterService.updateByEditBo(bo) ? 1 : 0);
+    }*/
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/BaseFilterAddBo.java

@@ -0,0 +1,48 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 业务层次过滤器添加对象 base_filter
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+@Data
+@ApiModel("业务层次过滤器添加对象")
+public class BaseFilterAddBo {
+
+    /** 教育层次ID */
+    @ApiModelProperty("教育层次ID")
+    private Long educationId;
+    /** 项目类型ID */
+    @ApiModelProperty("项目类型ID")
+    private Long projectId;
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
+    /** 类型 1课程 2题库 6直播 */
+    @ApiModelProperty("类型 1课程 2题库 6直播")
+    private Integer type;
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+    /** 添加时间 */
+    @ApiModelProperty("添加时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+    /** 别名 */
+    @ApiModelProperty("别名")
+    private String aliasName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/BaseFilterEditBo.java

@@ -0,0 +1,55 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 业务层次过滤器编辑对象 base_filter
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+@Data
+@ApiModel("业务层次过滤器编辑对象")
+public class BaseFilterEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 教育层次ID */
+    @ApiModelProperty("教育层次ID")
+    private Long educationId;
+
+    /** 项目类型ID */
+    @ApiModelProperty("项目类型ID")
+    private Long projectId;
+
+    /** 业务层次ID */
+    @ApiModelProperty("业务层次ID")
+    private Long businessId;
+
+    /** 科目ID，拼接 */
+    @ApiModelProperty("科目ID，拼接")
+    private String subjectIds;
+
+    /** 类型 1课程 2题库 6直播 */
+    @ApiModelProperty("类型 1课程 2题库 6直播")
+    private Integer type;
+
+    /** 0 未启用 1启用 -1删除 */
+    @ApiModelProperty("0 未启用 1启用 -1删除")
+    private Integer status;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+
+    /** 别名 */
+    @ApiModelProperty("别名")
+    private String aliasName;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/bo/BaseFilterQueryBo.java

@@ -0,0 +1,57 @@
+package com.zhongzheng.modules.base.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 业务层次过滤器分页查询对象 base_filter
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("业务层次过滤器分页查询对象")
+public class BaseFilterQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 教育层次ID */
+	@ApiModelProperty("教育层次ID")
+	private Long educationId;
+	/** 项目类型ID */
+	@ApiModelProperty("项目类型ID")
+	private Long projectId;
+	/** 业务层次ID */
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+	/** 科目ID，拼接 */
+	@ApiModelProperty("科目ID，拼接")
+	private String subjectIds;
+	/** 类型 1课程 2题库 6直播 */
+	@ApiModelProperty("类型 1课程 2题库 6直播")
+	private Integer type;
+	/** 0 未启用 1启用 -1删除 */
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/domain/BaseFilter.java

@@ -0,0 +1,47 @@
+package com.zhongzheng.modules.base.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 业务层次过滤器对象 base_filter
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("base_filter")
+public class BaseFilter implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 教育层次ID */
+    private Long educationId;
+    /** 项目类型ID */
+    private Long projectId;
+    /** 业务层次ID */
+    private Long businessId;
+    /** 科目ID，拼接 */
+    private String subjectIds;
+    /** 类型 1课程 2题库 6直播 */
+    private Integer type;
+    /** 0 未启用 1启用 -1删除 */
+    private Integer status;
+    /** 添加时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** 修改时间 */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/BaseFilterMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.base.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.base.domain.BaseFilter;
+
+/**
+ * 业务层次过滤器Mapper接口
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+public interface BaseFilterMapper extends BaseMapper<BaseFilter> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IBaseFilterService.java

@@ -0,0 +1,52 @@
+package com.zhongzheng.modules.base.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.base.bo.BaseFilterAddBo;
+import com.zhongzheng.modules.base.bo.BaseFilterEditBo;
+import com.zhongzheng.modules.base.bo.BaseFilterQueryBo;
+import com.zhongzheng.modules.base.domain.BaseFilter;
+import com.zhongzheng.modules.base.vo.BaseFilterVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 业务层次过滤器Service接口
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+public interface IBaseFilterService extends IService<BaseFilter> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	BaseFilterVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<BaseFilterVo> queryList(BaseFilterQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入业务层次过滤器
+	 * @param bo 业务层次过滤器新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(BaseFilterAddBo bo);
+
+	/**
+	 * 根据编辑业务对象修改业务层次过滤器
+	 * @param bo 业务层次过滤器编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(BaseFilterEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/BaseFilterServiceImpl.java

@@ -0,0 +1,118 @@
+package com.zhongzheng.modules.base.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.base.bo.BaseFilterAddBo;
+import com.zhongzheng.modules.base.bo.BaseFilterEditBo;
+import com.zhongzheng.modules.base.bo.BaseFilterQueryBo;
+import com.zhongzheng.modules.base.domain.BaseFilter;
+import com.zhongzheng.modules.base.mapper.BaseFilterMapper;
+import com.zhongzheng.modules.base.service.IBaseFilterService;
+import com.zhongzheng.modules.base.vo.BaseFilterVo;
+import com.zhongzheng.modules.course.domain.CourseBusiness;
+import com.zhongzheng.modules.course.service.ICourseBusinessService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 业务层次过滤器Service业务层处理
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+@Service
+public class BaseFilterServiceImpl extends ServiceImpl<BaseFilterMapper, BaseFilter> implements IBaseFilterService {
+
+    @Autowired
+    private  ICourseBusinessService iCourseBusinessService;
+
+    @Override
+    public BaseFilterVo queryById(Long id){
+        BaseFilter db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, BaseFilterVo.class);
+    }
+
+    @Override
+    public List<BaseFilterVo> queryList(BaseFilterQueryBo bo) {
+        LambdaQueryWrapper<BaseFilter> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getEducationId() != null, BaseFilter::getEducationId, bo.getEducationId());
+        lqw.eq(bo.getProjectId() != null, BaseFilter::getProjectId, bo.getProjectId());
+        lqw.eq(bo.getBusinessId() != null, BaseFilter::getBusinessId, bo.getBusinessId());
+        lqw.eq(StrUtil.isNotBlank(bo.getSubjectIds()), BaseFilter::getSubjectIds, bo.getSubjectIds());
+        lqw.eq(bo.getType() != null, BaseFilter::getType, bo.getType());
+        lqw.eq(bo.getStatus() != null, BaseFilter::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<BaseFilterVo> entity2Vo(Collection<BaseFilter> collection) {
+        List<BaseFilterVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, BaseFilterVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<BaseFilter> page = (Page<BaseFilter>)collection;
+            Page<BaseFilterVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(BaseFilterAddBo bo) {
+        BaseFilter add = BeanUtil.toBean(bo, BaseFilter.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        if(Validator.isNotEmpty(bo.getAliasName())&&Validator.isNotEmpty(bo.getBusinessId())){
+            CourseBusiness business = new CourseBusiness();
+            business.setAliasName(bo.getAliasName());
+            business.setUpdateTime(DateUtils.getNowTime());
+            business.setId(bo.getBusinessId());
+            iCourseBusinessService.updateById(business);
+        }
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean updateByEditBo(BaseFilterEditBo bo) {
+        BaseFilter update = BeanUtil.toBean(bo, BaseFilter.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(BaseFilter entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/vo/BaseFilterVo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.base.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 业务层次过滤器视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2022-06-22
+ */
+@Data
+@ApiModel("业务层次过滤器视图对象")
+public class BaseFilterVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 教育层次ID */
+	@Excel(name = "教育层次ID")
+	@ApiModelProperty("教育层次ID")
+	private Long educationId;
+	/** 项目类型ID */
+	@Excel(name = "项目类型ID")
+	@ApiModelProperty("项目类型ID")
+	private Long projectId;
+	/** 业务层次ID */
+	@Excel(name = "业务层次ID")
+	@ApiModelProperty("业务层次ID")
+	private Long businessId;
+	/** 科目ID，拼接 */
+	@Excel(name = "科目ID，拼接")
+	@ApiModelProperty("科目ID，拼接")
+	private String subjectIds;
+	/** 类型 1课程 2题库 6直播 */
+	@Excel(name = "类型 1课程 2题库 6直播")
+	@ApiModelProperty("类型 1课程 2题库 6直播")
+	private Integer type;
+	/** 0 未启用 1启用 -1删除 */
+	@Excel(name = "0 未启用 1启用 -1删除")
+	@ApiModelProperty("0 未启用 1启用 -1删除")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessAddBo.java

@@ -33,7 +33,7 @@ public class CourseBusinessAddBo {
     private String encoder;
     /** 项目id */
     @ApiModelProperty("项目id")
-    private Integer projectId;
+    private Long projectId;
     /** 学年 */
     @ApiModelProperty("学年")
     private BigDecimal schoolYear;
@@ -75,4 +75,7 @@ public class CourseBusinessAddBo {
     /** 商品配置字段JSON */
     @ApiModelProperty("商品配置字段JSON")
     private String goodsFieldJson;
+    /** 别名 */
+    @ApiModelProperty("别名")
+    private String aliasName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessEditBo.java

@@ -87,4 +87,7 @@ public class CourseBusinessEditBo {
     /** 商品配置字段JSON */
     @ApiModelProperty("商品配置字段JSON")
     private String goodsFieldJson;
+    /** 别名 */
+    @ApiModelProperty("别名")
+    private String aliasName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -66,4 +66,6 @@ private static final long serialVersionUID=1L;
     private Integer sort;
     /** 商品配置字段JSON */
     private String goodsFieldJson;
+    /** 别名 */
+    private String aliasName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseBusinessVo.java

@@ -120,4 +120,8 @@ public class CourseBusinessVo {
 	@Excel(name = "商品配置字段JSON")
 	@ApiModelProperty("商品配置字段JSON")
 	private String goodsFieldJson;
+	/** 别名 */
+	@Excel(name = "别名")
+	@ApiModelProperty("别名")
+	private String aliasName;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -184,5 +184,7 @@ GoodsQueryBo extends BaseEntity {
 	/** 证书模板ID */
 	@ApiModelProperty("证书模板ID")
 	private Long certificateTpId;
+	@ApiModelProperty("是否返回商品购买用户数量 1带 0不带")
+	private Long getUserNum;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="refundConfirmUserIds" column="refund_confirm_user_ids"/>
         <result property="sort" column="sort"/>
         <result property="goodsFieldJson" column="goods_field_json"/>
+        <result property="aliasName" column="alias_name"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseBusinessVo" id="CourseBusinessVoResult">
@@ -43,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="refundConfirmUserIds" column="refund_confirm_user_ids"/>
         <result property="sort" column="sort"/>
         <result property="goodsFieldJson" column="goods_field_json"/>
+        <result property="aliasName" column="alias_name"/>
     </resultMap>
 
 

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -123,6 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="certificateId" column="certificate_id"/>
         <result property="certificateTpId" column="certificate_tp_id"/>
         <result property="subjectNames" column="subject_names"/>
+        <result property="buyUserNum" column="buy_user_num"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -167,6 +168,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="getOrderNum != null and getOrderNum == 1" >
             ,ou.goods_live_num
         </if>
+        <if test="getUserNum != null and getUserNum == 1" >
+            ,(SELECT count(*) from order_goods og where og.goods_id = g.goods_id and o.`status` = 1
+            AND og.refund_status in (0,1,3)
+            AND og.pay_status in (2,3,4)) as buy_user_num
+        </if>
         FROM
         goods g
         LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id