Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java

@@ -1,12 +1,19 @@
package com.matrix.system.hive.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.vo.OrderDetailAchieveItemVo;
import com.matrix.system.app.vo.RankingVo;
import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.dto.AchieveNewStatisticsDto;
import com.matrix.system.hive.vo.AchieveNewStatisticsVo;
import com.matrix.system.hive.vo.DailyBeautyListVo;
import org.apache.ibatis.annotations.Param;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -18,7 +25,7 @@
 */


public interface AchieveNewDao{
public interface AchieveNewDao extends BaseMapper<AchieveNew> {

   public int insert(@Param("item") AchieveNew achieveNew);
      
@@ -55,8 +62,8 @@

   public List<AchieveNew> findSumDailyInfoNew(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);

	
   List<AchieveNew> selectVipConsumeStatisticsList(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);

   List<Map<String, Object>> selectVipConsumeStatisticsList(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);

   int selectVipConsumeStatisticsTotal(@Param("record") AchieveNew achieveNew);

@@ -82,4 +89,14 @@

    int updateAchieveNumOfPeople(@Param("list") List<AchieveNew> list, @Param("num") Double num);

    IPage<AchieveNewStatisticsVo> achieveNewStatistics(Page<AchieveNewStatisticsVo> page,  @Param("record")AchieveNewStatisticsDto queryDto);

    void setPayMethod(@Param("paymethod") String paymethod, @Param("list")  ArrayList<Long> ids);

    List<RankingVo> selectNumOfPeopleAchieveRanking(@Param("record") AchieveNew achieveNew);

   List<DailyBeautyListVo> selectDailyBeautyList(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);
   int selectDailyBeautyListTotal(@Param("record") AchieveNew achieveNew);

   String selectPlInfoByVipIdAndDate(@Param("datatime") Date datatime, @Param("vipId") Long vipId);
}