Merge remote-tracking branch 'origin/master'

src/main/java/org/springblade/gateway/common_gateway/util/PlatformSettingUtil.java

@@ -33,37 +33,41 @@ public class PlatformSettingUtil {
 
 	/**
 	 * 公共设置
+	 *
 	 * @return
 	 */
-	public static CommonSettingDto getCommonSetting(){
-		return getPlatformSettingByCache(PlatformSettingEnum.COMMON_SETTING,null);
+	public static CommonSettingDto getCommonSetting() {
+		return getPlatformSettingByCache(PlatformSettingEnum.COMMON_SETTING, null);
 	}
 
 	/**
 	 * 获取活动配置
+	 *
 	 * @return
 	 */
-	public static ActiveSettingDto getActiveSetting(Long activeId){
-		return getPlatformSettingByCache(PlatformSettingEnum.ACTIVE_SETTING,activeId);
+	public static ActiveSettingDto getActiveSetting(Long activeId) {
+		return getPlatformSettingByCache(PlatformSettingEnum.ACTIVE_SETTING, activeId);
 	}
 
 	/**
 	 * 获取积分商场设置
+	 *
 	 * @return
 	 */
-	public static PointGoodsSettingDto getPointGoodsSetting(){
-		return getPlatformSettingByCache(PlatformSettingEnum.POINT_GOODS_SETTING,null);
+	public static PointGoodsSettingDto getPointGoodsSetting() {
+		return getPlatformSettingByCache(PlatformSettingEnum.POINT_GOODS_SETTING, null);
 	}
 
 	/**
 	 * 获取平台设置
+	 *
 	 * @return
 	 */
-	public static <T> T getPlatformSettingByCache(PlatformSettingEnum platformSettingEnum,Long activeId){
-		String platformSettingByCache = getPlatformSettingByCache(platformSettingEnum.name(),activeId);
-		if(StringUtils.isNotEmpty(platformSettingByCache)){
+	public static <T> T getPlatformSettingByCache(PlatformSettingEnum platformSettingEnum, Long activeId) {
+		String platformSettingByCache = getPlatformSettingByCache(platformSettingEnum.name(), activeId);
+		if (StringUtils.isNotEmpty(platformSettingByCache)) {
 			try {
-				return JSON.parseObject(platformSettingByCache,platformSettingEnum.getType());
+				return JSON.parseObject(platformSettingByCache, platformSettingEnum.getType());
 			} catch (Exception e) {
 				log.error(e.getMessage());
 			}
@@ -73,13 +77,14 @@ public class PlatformSettingUtil {
 
 	/**
 	 * 获取平台设置
+	 *
 	 * @return
 	 */
-	public static <T> T getPlatformSettingByCache(String key,@NotNull Class<T> tClass,Long activeId){
-		String platformSettingByCache = getPlatformSettingByCache(key,activeId);
-		if(StringUtils.isNotEmpty(platformSettingByCache)){
+	public static <T> T getPlatformSettingByCache(String key, @NotNull Class<T> tClass, Long activeId) {
+		String platformSettingByCache = getPlatformSettingByCache(key, activeId);
+		if (StringUtils.isNotEmpty(platformSettingByCache)) {
 			try {
-				return JSON.parseObject(platformSettingByCache,tClass);
+				return JSON.parseObject(platformSettingByCache, tClass);
 			} catch (Exception e) {
 				log.error(e.getMessage());
 			}
@@ -89,19 +94,20 @@ public class PlatformSettingUtil {
 
 	/**
 	 * 获取平台设置
+	 *
 	 * @return
 	 */
-	public static String getPlatformSettingByCache(String key,Long activeId){
-		String value = bladeRedis.hGet(PlatformSettingConstant.getCacheKey(activeId),key);
-		if(ObjectUtils.isEmpty(value)){
+	public static String getPlatformSettingByCache(String key, Long activeId) {
+		String value = bladeRedis.hGet(PlatformSettingConstant.getCacheKey(activeId), key);
+		if (ObjectUtils.isEmpty(value)) {
 			LambdaQueryWrapper<PlatformSetting> lambdaQueryWrapper = Wrappers.<PlatformSetting>lambdaQuery()
 				.eq(PlatformSetting::getKey, key);
-			if(ObjectUtils.isNotEmpty(activeId)){
-				lambdaQueryWrapper.eq(PlatformSetting::getActiveId,activeId);
+			if (ObjectUtils.isNotEmpty(activeId)) {
+				lambdaQueryWrapper.eq(PlatformSetting::getActiveId, activeId);
 			}
 			PlatformSetting platformSetting = platformSettingService.getOne(lambdaQueryWrapper);
 			//返回值
-			if(ObjectUtils.isNotEmpty(platformSetting)){
+			if (ObjectUtils.isNotEmpty(platformSetting)) {
 				//添加到缓存
 				setPlatformSettingToCache(platformSetting);
 				return platformSetting.getValue();
@@ -112,13 +118,25 @@ public class PlatformSettingUtil {
 
 	/**
 	 * 设置平台设置缓存
+	 *
 	 * @param platformSetting
 	 */
-	public static void setPlatformSettingToCache(PlatformSetting platformSetting){
-		if(ObjectUtils.isEmpty(platformSetting)){
+	public static void setPlatformSettingToCache(PlatformSetting platformSetting) {
+		if (ObjectUtils.isEmpty(platformSetting)) {
 			return;
 		}
 		bladeRedis.hSet(PlatformSettingConstant.getCacheKey(platformSetting.getActiveId()),
-			platformSetting.getKey(),platformSetting.getValue());
+			platformSetting.getKey(), platformSetting.getValue());
+	}
+
+	/**
+	 * 删除平台设置缓存
+	 *
+	 * @param activeId
+	 * @param platformSettingEnum
+	 */
+	public static void delPlatformSettingToCache(Long activeId, PlatformSettingEnum platformSettingEnum) {
+		bladeRedis.hDel(PlatformSettingConstant.getCacheKey(activeId),
+			platformSettingEnum.name());
 	}
 }

src/main/java/org/springblade/gateway/goods_gateway/constant/HelpGoodsConstant.java

@@ -7,5 +7,33 @@ package org.springblade.gateway.goods_gateway.constant;
  * @Modified By:
  */
 public interface HelpGoodsConstant {
+	/**
+	 * 道具缓存
+	 */
 	String HELP_GOODS_CACHE = "SING:HELP_GOODS:CACHE";
+
+	/**
+	 * 验证码缓存
+	 */
+	String HELP_GOODS_VERIFICATION_CODE = "SING:HELP_GOODS_VERIFICATION_CODE:CACHE";
+
+	/**
+	 * 验证码缓存
+	 */
+	Long HELP_GOODS_VERIFICATION_CODE_EXIST_TIME = 60L;
+
+	/**
+	 * 获取缓存Key
+	 *
+	 * @param userId
+	 * @param productId
+	 * @param helpGoodsId
+	 * @return
+	 */
+	static String getVerificationCodeKey(Long userId, Long productId, Long helpGoodsId) {
+		return new StringBuilder(HELP_GOODS_VERIFICATION_CODE)
+			.append(":").append(userId)
+			.append(":").append(productId)
+			.append(":").append(helpGoodsId).toString();
+	}
 }

src/main/java/org/springblade/gateway/goods_gateway/controller/AppHelpGoodsController.java

@@ -1,5 +1,8 @@
 package org.springblade.gateway.goods_gateway.controller;
 
+import cn.hutool.captcha.CaptchaUtil;
+import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.captcha.generator.RandomGenerator;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
@@ -9,7 +12,9 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.log.logger.BladeLogger;
+import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
+import org.springblade.gateway.goods_gateway.constant.HelpGoodsConstant;
 import org.springblade.gateway.goods_gateway.service.AppHelpGoodsService;
 import org.springblade.gateway.goods_gateway.util.HelpGoodsUtil;
 import org.springblade.payment.cmcc.request.CmccDectOrderRequest;
@@ -46,6 +51,7 @@ public class AppHelpGoodsController {
 	private final IHelpGoodsService helpGoodsService;
 	private final IActiveRecordService activeRecordService;
 	private final BladeLogger bladeLogger;
+	private final BladeRedis bladeRedis;
 
 
 	/**
@@ -59,6 +65,7 @@ public class AppHelpGoodsController {
 								   @ApiParam(value = "用户ID", required = true) @RequestParam Long userId,
 								   @ApiParam(value = "购买数量", required = true) @RequestParam BigDecimal num,
 								   @ApiParam(value = "作品ID", required = true) @RequestParam Long productId,
+								   @ApiParam(value = "验证码") @RequestParam(required = false) String code,
 								   CmccDectOrderRequest cmccDectOrderRequest) {
 		try {
 			CmccPointRecord cmccPointRecord = new CmccPointRecord();
@@ -67,7 +74,7 @@ public class AppHelpGoodsController {
 			cmccPointRecord.setNum(num);
 			//加锁
 			synchronized (cmccPointRecord.getUserId().toString().intern()) {
-				appHelpGoodsService.exchangeProps(cmccPointRecord, cmccDectOrderRequest, productId, null);
+				appHelpGoodsService.exchangeProps(cmccPointRecord, cmccDectOrderRequest, productId, null, code);
 			}
 			return R.success("兑换成功");
 		} catch (Exception e) {
@@ -76,12 +83,34 @@ public class AppHelpGoodsController {
 		}
 	}
 
+
+	/**
+	 * 创建道具验证码
+	 */
+	@ApiLog("创建道具验证码")
+	@GetMapping("/createPropsVerificationCode")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "创建道具验证码")
+	public R<String> createPropsVerificationCode(@ApiParam(value = "道具ID", required = true) @RequestParam Long helpGoodsId,
+												 @ApiParam(value = "用户ID", required = true) @RequestParam Long userId,
+												 @ApiParam(value = "作品ID", required = true) @RequestParam Long productId) {
+		// 自定义纯数字的验证码（随机4位数字，可重复）
+		RandomGenerator randomGenerator = new RandomGenerator("0123456789", 4);
+		LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(200, 100);
+		lineCaptcha.setGenerator(randomGenerator);
+		// 重新生成code
+		lineCaptcha.createCode();
+		//创建验证码，并放到缓存中，有效期60秒
+		bladeRedis.setEx(HelpGoodsConstant.getVerificationCodeKey(userId, productId, helpGoodsId), lineCaptcha.getCode(), HelpGoodsConstant.HELP_GOODS_VERIFICATION_CODE_EXIST_TIME);
+		return R.data(lineCaptcha.getImageBase64Data());
+	}
+
 	/**
 	 * 创建现金道具订单
 	 */
 	@ApiLog("创建现金道具订单")
 	@PostMapping("/createCashPropsOrder")
-	@ApiOperationSupport(order = 1)
+	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "创建现金道具订单")
 	public R<YeepayOrder> createCashPropsOrder(@ApiParam(value = "道具ID", required = true) @RequestParam Long helpGoodsId,
 											   @ApiParam(value = "用户ID", required = true) @RequestParam Long userId,
@@ -112,7 +141,7 @@ public class AppHelpGoodsController {
 	 */
 	@ApiLog("现金支付回调地址")
 	@RequestMapping(value = "/callbackUrl", method = {RequestMethod.GET, RequestMethod.POST})
-	@ApiOperationSupport(order = 1)
+	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "现金支付回调地址")
 	public String callbackUrl(HttpServletRequest request) {
 		bladeLogger.info("道具订单支付回调", request.getParameterMap().toString());
@@ -128,7 +157,7 @@ public class AppHelpGoodsController {
 	 */
 	@ApiLog("创建道具订单")
 	@PostMapping("/createPropsOrder")
-	@ApiOperationSupport(order = 1)
+	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "创建道具订单")
 	public R<String> createPropsOrder(@ApiParam(value = "道具ID", required = true) @RequestParam Long helpGoodsId,
 									  @ApiParam(value = "用户ID", required = true) @RequestParam Long userId,
@@ -162,7 +191,7 @@ public class AppHelpGoodsController {
 	 */
 	@ApiLog("发送验证码")
 	@PostMapping("/sendCmccSms")
-	@ApiOperationSupport(order = 1)
+	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "发送验证码")
 	public R<String> sendCmccSms(@ApiParam(value = "手机号码", required = true) @RequestParam String mobile,
 								 @ApiParam(value = "订单号ID", required = true) @RequestParam String outOrderId) {
@@ -196,7 +225,7 @@ public class AppHelpGoodsController {
 	 * 获取道具助力列表
 	 */
 	@GetMapping("/getHelpGoodsList")
-	@ApiOperationSupport(order = 2)
+	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "获取道具助力列表")
 	public R<List<HelpGoodsVO>> getHelpGoodsList(@ApiParam(value = "活动ID", required = true) @RequestParam Long activeId,
 												 @ApiParam(value = "用户ID", required = true) @RequestParam Long userId,

src/main/java/org/springblade/gateway/goods_gateway/service/AppHelpGoodsService.java

@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
  * @Modified By:
  */
 public interface AppHelpGoodsService {
-	void exchangeProps(CmccPointRecord cmccPointRecord, CmccDectOrderRequest cmccDectOrderRequest, Long productId, YeepayOrder yeepayOrder);
+	void exchangeProps(CmccPointRecord cmccPointRecord, CmccDectOrderRequest cmccDectOrderRequest, Long productId, YeepayOrder yeepayOrder, String code);
 
 	void cmccPointExchange(CmccPointRecord cmccPointRecord, CmccDectOrderRequest cmccDectOrderRequest, ActiveHelpRecord activeHelpRecord, HelpGoods helpGoods, LoginUser loginUser);
 

src/main/java/org/springblade/gateway/goods_gateway/service/impl/AppHelpGoodsServiceImpl.java

@@ -14,8 +14,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.springblade.common.utils.BeanPropertyUtil;
 import org.springblade.common.utils.IPUtils;
 import org.springblade.core.log.logger.BladeLogger;
+import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.gateway.active_gateway.service.AppActiveProductService;
+import org.springblade.gateway.goods_gateway.constant.HelpGoodsConstant;
 import org.springblade.gateway.goods_gateway.exception.HelpGoodsException;
 import org.springblade.gateway.goods_gateway.service.AppHelpGoodsService;
 import org.springblade.gateway.point_gateway.enums.CmccPayStatus;
@@ -89,6 +91,8 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 	private YeePayService yeePayService;
 	@Autowired
 	private ConfigForOfficial configForOfficial;
+	@Autowired
+	private BladeRedis bladeRedis;
 
 	/**
 	 * 移动积分兑换道具
@@ -98,7 +102,7 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public void exchangeProps(CmccPointRecord cmccPointRecord, CmccDectOrderRequest cmccDectOrderRequest, Long productId, YeepayOrder yeepayOrder) {
+	public void exchangeProps(CmccPointRecord cmccPointRecord, CmccDectOrderRequest cmccDectOrderRequest, Long productId, YeepayOrder yeepayOrder, String code) {
 		//获取道具商品
 		HelpGoods helpGoods = helpGoodsService.getById(cmccPointRecord.getHelpGoodsId());
 		Assert.notNull(helpGoods, "没有找到该道具");
@@ -108,6 +112,15 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 			throw new HelpGoodsException("该道具需使用现金支付");
 		}
 
+		//判断验证码
+		if (HelpGoodsType.POINT_EXCHANGE_GOODS.equals(helpGoods.getPayType()) && helpGoods.getPoint().compareTo(BigDecimal.ZERO) == 0) {
+			String codeCache = bladeRedis.get(HelpGoodsConstant.getVerificationCodeKey(cmccPointRecord.getUserId(), productId, cmccPointRecord.getHelpGoodsId()));
+			if (StringUtils.isEmpty(codeCache) || StringUtils.isEmpty(code) || !StringUtils.equals(codeCache, code)) {
+				throw new HelpGoodsException("验证码错误");
+			}
+			bladeRedis.del(HelpGoodsConstant.getVerificationCodeKey(cmccPointRecord.getUserId(), productId, cmccPointRecord.getHelpGoodsId()));
+		}
+
 		//判断兑换数量(判断兑换次数大于零)
 		Assert.isTrue(Integer.valueOf(-1).equals(BigDecimal.ZERO.compareTo(cmccPointRecord.getNum())), "兑换数量必须大于零");
 
@@ -123,7 +136,7 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 
 		//先助力
 		ActiveHelpRecord activeHelpRecord = new ActiveHelpRecord();
-		if(ObjectUtils.isNotEmpty(yeepayOrder)){
+		if (ObjectUtils.isNotEmpty(yeepayOrder)) {
 			activeHelpRecord.setYeepayOrderId(yeepayOrder.getId());
 		}
 		activeHelpRecord.setProductId(productId);
@@ -185,7 +198,7 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 	@Override
 	public void cmccPointExchange(CmccPointRecord cmccPointRecord, CmccDectOrderRequest cmccDectOrderRequest, ActiveHelpRecord activeHelpRecord, HelpGoods helpGoods, LoginUser loginUser) {
 		//对接移动积分接口
-		if (HelpGoodsType.POINT_EXCHANGE_GOODS.equals(helpGoods.getPayType()) && ObjectUtils.isNotEmpty(helpGoods.getPoint()) && helpGoods.getPoint().longValue() > 0L) {
+		if (HelpGoodsType.POINT_EXCHANGE_GOODS.equals(helpGoods.getPayType()) && ObjectUtils.isNotEmpty(helpGoods.getPoint()) && helpGoods.getPoint().compareTo(BigDecimal.ZERO) > 0) {
 			Assert.notNull(cmccDectOrderRequest.getOutOrderId(), "订单号不能为空");
 
 			//查询移动订单记录
@@ -425,6 +438,6 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 		cmccPointRecord.setUserId(yeepayOrder.getUserId());
 		cmccPointRecord.setNum(BigDecimal.valueOf(yeepayOrder.getNum()));
 		//投票
-		exchangeProps(cmccPointRecord, null, yeepayOrder.getProductId(), yeepayOrder);
+		exchangeProps(cmccPointRecord, null, yeepayOrder.getProductId(), yeepayOrder, null);
 	}
 }

src/main/java/org/springblade/sing/active/controller/ActiveRecordController.java

@@ -16,7 +16,6 @@
  */
 package org.springblade.sing.active.controller;
 
-import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -31,13 +30,16 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.gateway.common_gateway.enums.PlatformSettingEnum;
+import org.springblade.gateway.common_gateway.util.PlatformSettingUtil;
 import org.springblade.sing.active.entity.ActiveRecord;
 import org.springblade.sing.active.service.IActiveRecordService;
 import org.springblade.sing.active.vo.ActiveRecordVO;
 import org.springblade.sing.active.wrapper.ActiveRecordWrapper;
+import org.springblade.sing.desk.entity.PlatformSetting;
+import org.springblade.sing.desk.service.IPlatformSettingService;
 import org.springblade.sing.goods.entity.ActiveIdAndGoodsId;
 import org.springblade.sing.goods.service.IActiveIdAndGoodsIdService;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
@@ -58,6 +60,7 @@ public class ActiveRecordController extends BladeController {
 
 	private final IActiveRecordService activeRecordService;
 	private final IActiveIdAndGoodsIdService activeIdAndGoodsIdService;
+	private final IPlatformSettingService platformSettingService;
 
 	/**
 	 * 详情
@@ -69,6 +72,7 @@ public class ActiveRecordController extends BladeController {
 		ActiveRecord detail = activeRecordService.getOne(Condition.getQueryWrapper(activeRecord));
 		return R.data(ActiveRecordWrapper.build().entityVO(detail));
 	}
+
 	/**
 	 * 分页 活动记录
 	 */
@@ -79,20 +83,21 @@ public class ActiveRecordController extends BladeController {
 
 		LambdaQueryWrapper<ActiveRecord> wrapper = new LambdaQueryWrapper<>();
 
-		wrapper.eq(activeRecord.getId() != null,ActiveRecord::getId,activeRecord.getId());
+		wrapper.eq(activeRecord.getId() != null, ActiveRecord::getId, activeRecord.getId());
 
-		wrapper.like(StringUtil.hasLength(activeRecord.getTitle()),ActiveRecord::getTitle,activeRecord.getTitle());
+		wrapper.like(StringUtil.hasLength(activeRecord.getTitle()), ActiveRecord::getTitle, activeRecord.getTitle());
 
-		wrapper.like(StringUtil.hasLength(activeRecord.getSponsor()),ActiveRecord::getSponsor,activeRecord.getSponsor());
+		wrapper.like(StringUtil.hasLength(activeRecord.getSponsor()), ActiveRecord::getSponsor, activeRecord.getSponsor());
 
 		wrapper.between(activeRecord.getBeginTime() != null && activeRecord.getLastTime() != null
-			,ActiveRecord::getStartTime,activeRecord.getBeginTime(),activeRecord.getLastTime());
+			, ActiveRecord::getStartTime, activeRecord.getBeginTime(), activeRecord.getLastTime());
 
 		wrapper.orderByDesc(ActiveRecord::getStartTime);
 
 		IPage<ActiveRecord> pages = activeRecordService.page(Condition.getPage(query), wrapper);
 		return R.data(ActiveRecordWrapper.build().pageVO(pages));
 	}
+
 	/**
 	 * 自定义分页 活动记录
 	 */
@@ -146,16 +151,23 @@ public class ActiveRecordController extends BladeController {
 		List<Long> longs = Func.toLongList(ids);
 		for (Long aLong : longs) {
 			deletePointGoodsAndActiveId(aLong);
+			//删除平台设置缓存
+			PlatformSettingUtil.delPlatformSettingToCache(aLong, PlatformSettingEnum.ACTIVE_SETTING);
 		}
+		//删除平台设置
+		platformSettingService.remove(Wrappers.<PlatformSetting>lambdaQuery()
+			.eq(PlatformSetting::getKey, PlatformSettingEnum.ACTIVE_SETTING.name())
+			.in(PlatformSetting::getActiveId, longs));
 		return R.status(activeRecordService.deleteLogic(longs));
 	}
 
 	/**
 	 * 删除积分商品的活动
+	 *
 	 * @param activeId
 	 */
-	private boolean deletePointGoodsAndActiveId(Long activeId){
+	private boolean deletePointGoodsAndActiveId(Long activeId) {
 		return activeIdAndGoodsIdService.remove(Wrappers.<ActiveIdAndGoodsId>lambdaUpdate()
-			.eq(ActiveIdAndGoodsId::getActiveId,activeId));
+			.eq(ActiveIdAndGoodsId::getActiveId, activeId));
 	}
 }