From 94782e82d05ae42e3fd59be93668b48bbb114a15 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 13:49:50 +0800
Subject: [PATCH] 仁和区bug提交
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 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 db83cb2..6431b73 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
@@ -2,7 +2,6 @@
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.isNotEmpty;
import java.util.ArrayList;
import java.util.Date;
@@ -11,15 +10,9 @@
import javax.annotation.Resource;
-import com.panzhihua.common.model.vos.community.microCommercialStreet.McsCouponVO;
-import com.panzhihua.common.utlis.Snowflake;
-import com.panzhihua.service_community.dao.McsEvaluateDAO;
-import com.panzhihua.service_community.entity.McsCoupon;
-import com.panzhihua.service_community.util.NearbyUtil;
-import com.panzhihua.service_community.util.QRCodeUtil;
-import com.spatial4j.core.shape.Rectangle;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -30,16 +23,20 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.microCommercialStreet.McsCouponVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.McsGameVO;
import com.panzhihua.common.model.vos.community.microCommercialStreet.TopStatisticsVO;
import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.Snowflake;
import com.panzhihua.service_community.dao.McsCouponDAO;
+import com.panzhihua.service_community.dao.McsEvaluateDAO;
import com.panzhihua.service_community.dao.McsGameDAO;
import com.panzhihua.service_community.dao.McsMerchantDAO;
+import com.panzhihua.service_community.entity.McsCoupon;
import com.panzhihua.service_community.entity.McsGame;
import com.panzhihua.service_community.entity.McsMerchant;
import com.panzhihua.service_community.service.McsGameService;
-import org.springframework.transaction.annotation.Transactional;
+import com.panzhihua.service_community.util.QRCodeUtil;
/**
* (McsGame)表服务实现类
@@ -330,7 +327,7 @@
TopStatisticsVO topStatisticsVO = new TopStatisticsVO();
topStatisticsVO.setExpireAt(mcsMerchant.getExpireAt());
if (nonNull(mcsMerchant.getExpireAt())) {
- int surplusLitDays = DateUtils.differentDays(new Date(), mcsMerchant.getExpireAt());
+ int surplusLitDays = DateUtils.retrieveRemainingDays(mcsMerchant.getExpireAt());
topStatisticsVO.setSurplusLitDays(surplusLitDays > 0 ? surplusLitDays : 0);
}
Integer appliedCount = this.baseMapper.selectAppliedCount(mcsMerchant.getId());
@@ -392,9 +389,13 @@
//体验游戏
Integer awardType = mcsGame.getAwardType();
if (awardType.equals(1)) {
- mcsCoupon.setAward("免费产品");
+ mcsCoupon.setAward("免费领");
+ } else if (awardType.equals(2)) {
+ mcsCoupon.setAward("产品试用");
+ } else if (awardType.equals(3)) {
+ mcsCoupon.setAward("消费赠礼");
} else {
- mcsCoupon.setAward("免费服务");
+ mcsCoupon.setAward("优惠券");
}
}
int num = mcsCouponDAO.insert(mcsCoupon);
@@ -421,19 +422,7 @@
Page page = new Page<>();
page.setSize(pageMcsGameDTO.getPageSize());
page.setCurrent(pageMcsGameDTO.getPageNum());
- String lat = pageMcsGameDTO.getLat();
- String lon = pageMcsGameDTO.getLon();
- Integer distance = pageMcsGameDTO.getDistance();
- IPage<McsGameVO> mcsGames;
- if (isNotEmpty(lat) && isNotEmpty(lon) && nonNull(distance)) {
- Rectangle rectangle = new NearbyUtil().getRectangle(pageMcsGameDTO.getDistance(),
- Double.parseDouble(pageMcsGameDTO.getLon()), Double.parseDouble(pageMcsGameDTO.getLat()));
- mcsGames = this.baseMapper.pageH5McsGame(page, rectangle.getMinX(), rectangle.getMaxX(),
- rectangle.getMinY(), rectangle.getMaxY(), pageMcsGameDTO);
- } else {
- mcsGames = this.baseMapper.pageH5McsGame(page, null, null, null, null, pageMcsGameDTO);
- }
-
+ IPage<McsGameVO> mcsGames = this.baseMapper.pageH5McsGame(page, pageMcsGameDTO);
return R.ok(mcsGames);
}
@@ -451,6 +440,20 @@
return R.ok(mcsGameVO);
}
+ /**
+ * 定时任务-每隔5分钟执行一次，将已到期的微商业街游戏结束
+ * @return
+ */
+ @Override
+ public R endStatusForMcsGame() {
+ List<McsGame> games = this.baseMapper.selectNeedDealExpire();
+ if (nonNull(games) && !games.isEmpty()) {
+ games.forEach(e -> e.setStatus(McsGame.Status.yjs));
+ this.updateBatchById(games);
+ }
+ return R.ok();
+ }
+
public static void main(String[] args) {
int total = 500;
int people = 10;
--
Gitblit v1.7.1