From 22be665be2ae01b422046002d2e206c30fd04b4a Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 20 一月 2022 15:33:39 +0800
Subject: [PATCH] 商业街1/20更新
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsGameServiceImpl.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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 d64cf70..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;
@@ -37,9 +36,7 @@
import com.panzhihua.service_community.entity.McsGame;
import com.panzhihua.service_community.entity.McsMerchant;
import com.panzhihua.service_community.service.McsGameService;
-import com.panzhihua.service_community.util.NearbyUtil;
import com.panzhihua.service_community.util.QRCodeUtil;
-import com.spatial4j.core.shape.Rectangle;
/**
* (McsGame)表服务实现类
@@ -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);
}
--
Gitblit v1.7.1