From a0f33f915dd4128d98111f67a3c75b1676adae32 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 11:20:39 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java
index 6431b73..67f7d1c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java
@@ -316,10 +316,11 @@
/**
* 戳戳游戏顶部统计数据
* @param userId
+ * @param type
* @return
*/
@Override
- public R getTopStatistics(Long userId) {
+ public R getTopStatistics(Long userId, Integer type) {
McsMerchant mcsMerchant = mcsMerchantDAO.selectOne(new QueryWrapper<McsMerchant>().lambda().eq(McsMerchant::getUserId, userId));
if (isNull(mcsMerchant)) {
return R.fail("未查询到商家信息");
@@ -330,9 +331,9 @@
int surplusLitDays = DateUtils.retrieveRemainingDays(mcsMerchant.getExpireAt());
topStatisticsVO.setSurplusLitDays(surplusLitDays > 0 ? surplusLitDays : 0);
}
- Integer appliedCount = this.baseMapper.selectAppliedCount(mcsMerchant.getId());
+ Integer appliedCount = this.baseMapper.selectAppliedCount(mcsMerchant.getId(), type);
topStatisticsVO.setAppliedTotal(appliedCount);
- Integer verifiedCount = this.baseMapper.selectVerifiedCount(mcsMerchant.getId());
+ Integer verifiedCount = this.baseMapper.selectVerifiedCount(mcsMerchant.getId(), type);
topStatisticsVO.setVerifiedTotal(verifiedCount);
Integer publishLimit = mcsMerchant.getPublishLimit();
@@ -435,7 +436,8 @@
public R getMcsGame(Long gameId) {
McsGameVO mcsGameVO = this.baseMapper.selectDetailById(gameId);
Integer gameCount = this.baseMapper.selectCount(new QueryWrapper<McsGame>().lambda()
- .eq(McsGame::getMerchantId, mcsGameVO.getMerchantId()).eq(McsGame::getStatus, McsGame.Status.jxz).eq(McsGame::getIsDel, false));
+ .eq(McsGame::getMerchantId, mcsGameVO.getMerchantId()).eq(McsGame::getStatus, McsGame.Status.jxz)
+ .eq(McsGame::getType, mcsGameVO.getType()).eq(McsGame::getIsDel, false));
mcsGameVO.setGameCount(gameCount);
return R.ok(mcsGameVO);
}
--
Gitblit v1.7.1