From 80fadcfc253bc1251321401d4053346bbc61e604 Mon Sep 17 00:00:00 2001 From: xwb <717567226@qq.com> Date: Thu, 30 Apr 2020 13:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E9=80=9F=E5=BA=A6=EF=BC=8C=E6=B5=B7=E6=8A=A5=E4=B8=BA?= =?UTF-8?q?app=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/RedisKeyInitialization.java | 29 ++++++++++++++----- .../controller/StoreBargainController.java | 11 +++++-- .../StoreCombinationController.java | 10 +++++-- .../controller/StoreProductController.java | 9 +++++- 4 files changed, 46 insertions(+), 13 deletions(-) diff --git a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java index 321bc4d0..f75e6930 100644 --- a/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java +++ b/yshop-api/src/main/java/co/yixiang/listener/RedisKeyInitialization.java @@ -1,9 +1,11 @@ package co.yixiang.listener; import co.yixiang.enums.RedisKeyEnum; +import co.yixiang.modules.shop.entity.YxSystemConfig; import co.yixiang.modules.shop.service.YxSystemConfigService; import co.yixiang.utils.StringUtils; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; @@ -17,6 +19,7 @@ import java.util.stream.Stream; /** * api服务启动初始化reids */ +@Slf4j @Component @RequiredArgsConstructor(onConstructor = @__(@Autowired)) public class RedisKeyInitialization { @@ -28,13 +31,25 @@ public class RedisKeyInitialization { @PostConstruct public void redisKeyInitialization(){ - List redisKeyEnums = Stream.of(RedisKeyEnum.values()).collect(Collectors.toList()); - for (RedisKeyEnum redisKeyEnum : redisKeyEnums) { - Object redisKey = redisTemplate.opsForValue().get(redisKeyEnum.getValue()); - if(redisKey == null){ - String dbKey = systemConfigService.getData(redisKeyEnum.getValue()); - redisTemplate.opsForValue().set(redisKeyEnum.getValue(),dbKey); - } + try { + List redisKeyEnums = Stream.of(RedisKeyEnum.values()).collect(Collectors.toList()); + List systemConfigs = systemConfigService.list(); + for (RedisKeyEnum redisKeyEnum : redisKeyEnums) { + Object redisKey = redisTemplate.opsForValue().get(redisKeyEnum.getValue()); + if(redisKey == null){ + String dbKey = ""; + for (YxSystemConfig systemConfig : systemConfigs) { + if(systemConfig.getMenuName().equals(redisKeyEnum.getValue())){ + dbKey = systemConfig.getValue(); + } + } + redisTemplate.opsForValue().set(redisKeyEnum.getValue(),dbKey); + } + } + log.info("---------------redisKey初始化成功---------------"); + }catch (Exception e){ + log.info("redisKey初始化失败: {}",e); } + } } diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java index 620003ad..1778230c 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreBargainController.java @@ -259,10 +259,10 @@ public class StoreBargainController extends BaseController { } /** - * 拼团海报 + * 砍价海报 */ @PostMapping("/bargain/poster") - @ApiOperation(value = "拼团海报",notes = "拼团海报") + @ApiOperation(value = "砍价海报",notes = "砍价海报") public ApiResult poster(@RequestBody String jsonStr){ JSONObject jsonObject = JSON.parseObject(jsonStr); Integer bargainId = jsonObject.getInteger("bargainId"); @@ -310,7 +310,12 @@ public class StoreBargainController extends BaseController { File file = FileUtil.mkdir(new File(fileDir)); if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ siteUrl = siteUrl+"/bargain/"; - QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid, 180, 180, + QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, + FileUtil.file(fileDir+name)); + } + if(userType.equals(AppFromEnum.APP.getValue())){ + siteUrl = siteUrl+"/bargain/"; + QrCodeUtil.generate(siteUrl+"?bargainId="+bargainId+"&uid="+uid+"&spread="+uid+"&codeType="+AppFromEnum.APP.getValue(), 180, 180, FileUtil.file(fileDir+name)); }else{ QrCodeUtil.generate(siteUrl+"/activity/dargain_detail/"+bargainId+"/"+uid+"?spread="+uid, 180, 180, diff --git a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java index 678b3141..786be154 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/activity/web/controller/StoreCombinationController.java @@ -151,9 +151,15 @@ public class StoreCombinationController extends BaseController { File file = FileUtil.mkdir(new File(fileDir)); if(userType.equals(AppFromEnum.ROUNTINE.getValue())){ siteUrl = siteUrl+"/pink/"; - QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid, 180, 180, + QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, FileUtil.file(fileDir+name)); - }else{ + } + if(userType.equals(AppFromEnum.APP.getValue())){ + siteUrl = siteUrl+"/pink/"; + QrCodeUtil.generate(siteUrl+"?pinkId="+pinkId+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, + FileUtil.file(fileDir+name)); + } + else{ QrCodeUtil.generate(siteUrl+"/activity/group_rule/"+pinkId+"?spread="+uid, 180, 180, FileUtil.file(fileDir+name)); } diff --git a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java index dab5764e..d1a2955b 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java +++ b/yshop-api/src/main/java/co/yixiang/modules/shop/web/controller/StoreProductController.java @@ -148,7 +148,14 @@ public class StoreProductController extends BaseController { //h5地址 siteUrl = siteUrl+"/product/"; //生成二维码 - QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid, 180, 180, + QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid+"&codeType="+AppFromEnum.ROUNTINE.getValue(), 180, 180, + FileUtil.file(fileDir+name)); + } + if(userType.equals(AppFromEnum.APP.getValue())){ + //h5地址 + siteUrl = siteUrl+"/product/"; + //生成二维码 + QrCodeUtil.generate(siteUrl+"?productId="+id+"&spread="+uid+"&codeType="+AppFromEnum.APP.getValue(), 180, 180, FileUtil.file(fileDir+name)); }else{//如果类型是h5 //生成二维码