From 2186fd97f870ff97685ae34b737e9b2e9da77ac9 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 18 Mar 2022 15:06:21 +0800 Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea --- src/main/resources/mapper/walletCoinOrder/ZhiYaRecordDao.xml | 2 +- src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java | 4 ++-- src/main/java/com/xcong/excoin/modules/coin/entity/ZhiYaTeam.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiYaTeam.java b/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiYaTeam.java index 2c4dc23..8880a13 100644 --- a/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiYaTeam.java +++ b/src/main/java/com/xcong/excoin/modules/coin/entity/ZhiYaTeam.java @@ -7,7 +7,7 @@ import java.math.BigDecimal; @Data -@TableName("zhiya_Team") +@TableName("zhiya_team") public class ZhiYaTeam extends BaseEntity { /** * diff --git a/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java b/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java index 8f17490..ab84432 100644 --- a/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java +++ b/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java @@ -23,8 +23,8 @@ /** * 质押奖励计算 */ - @Scheduled(cron = "0 * * * * ? ") -// @Scheduled(cron = "0 0 0 * * ? ") +// @Scheduled(cron = "0 * * * * ? ") + @Scheduled(cron = "0 0 0 * * ? ") public void updateDoingPrice() { log.info("#质押奖励计算#"); try { diff --git a/src/main/resources/mapper/walletCoinOrder/ZhiYaRecordDao.xml b/src/main/resources/mapper/walletCoinOrder/ZhiYaRecordDao.xml index 7c7fde4..8fd57d4 100644 --- a/src/main/resources/mapper/walletCoinOrder/ZhiYaRecordDao.xml +++ b/src/main/resources/mapper/walletCoinOrder/ZhiYaRecordDao.xml @@ -56,7 +56,7 @@ </select> <select id="selectZhiyaTeamRecordByMemberId" resultType="com.xcong.excoin.modules.coin.entity.ZhiYaTeam"> - SELECT a.* FROM zhiya_Team a where a.member_id= #{memberId} + SELECT a.* FROM zhiya_team a where a.member_id= #{memberId} </select> -- Gitblit v1.9.1