Merge branch 'api' into order_reform

Helius

2021-01-12 a88cf964159303c208d8a3a9d0b8dadef7b1388a

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

@@ -1,9 +1,13 @@
package com.matrix.system.hive.dao;

import java.util.Date;
import java.util.List;
import java.util.Map;

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 org.apache.ibatis.annotations.Param;

@@ -52,6 +56,17 @@
   public List<AchieveNew> findSumDailyInfoNew(@Param("record") AchieveNew achieveNew, @Param("pageVo") PaginationVO pageVo);

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

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

   UserAchieveVo selectUserAchieveByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime, @Param("userId") Long userId);

   List<OrderDetailAchieveItemVo> selectApiOrderItemAchieve(@Param("itemId") Long itemId);

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

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

   List<AchieveNew> selectOrderItemAchieveByOrderId(Long orderId);
}