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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java

@@ -2,6 +2,7 @@

import java.util.List;

import com.matrix.system.app.vo.UserAchieveVo;
import com.matrix.system.hive.bean.AchieveNew;
import com.matrix.system.hive.bean.SysOrder;
import com.matrix.system.hive.bean.SysProjServices;
@@ -108,5 +109,12 @@

   public void modifyAchieveTime(AchieveNew achieveNew);

   List<AchieveNew> findVipConsumeStatisticsList(AchieveNew achieveNew, PaginationVO pageVo);

   int findVipConsumeStatisticsTotal(AchieveNew achieveNew);

   public UserAchieveVo findUserAchieveByTime(int type);

   public List<AchieveNew> findOrderItemAchieve(Long orderid);

}