Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/org/springblade/gateway/point_gateway/service/impl/PointExchangeServiceImpl.java
#	src/main/java/org/springblade/sing/goods/entity/PointGoods.java

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

@@ -115,10 +115,10 @@ public class AppHelpGoodsServiceImpl implements AppHelpGoodsService {
 		//判断验证码
 		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()));
+			bladeRedis.del(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()));
 		}
 
 		//判断兑换数量(判断兑换次数大于零)

src/main/java/org/springblade/gateway/point_gateway/service/impl/PointExchangeServiceImpl.java

@@ -12,7 +12,6 @@ import org.springblade.common.utils.BeanPropertyUtil;
 import org.springblade.common.utils.IPUtils;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.gateway.goods_gateway.exception.HelpGoodsException;
 import org.springblade.gateway.point_gateway.enums.PointTypeEnum;
 import org.springblade.gateway.point_gateway.exception.PointExchangeException;
@@ -261,6 +260,7 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 			goodsOrder.setCash(yeepayOrder.getAmount());
 		}
 		goodsOrder.setUsePoint(yeepayOrder.getUsePoint());
+
 		Assert.isTrue(goodsOrderService.save(goodsOrder), "兑换失败");
 
 		//更新商品库存
@@ -431,8 +431,8 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 		Assert.notNull(address, "请添加收货地址");
 		Assert.notNull(yeepayOrder.getActiveId(), "兑换失败");
 
-		int isLimit = Optional.ofNullable(goods.getIsLimit()).orElse(0);
-		if (isLimit == 1) {
+		Boolean isLimit = Integer.valueOf(1).equals(goods.getIsLimit());
+		if (isLimit) {
 			int size = goodsOrderService.list(new LambdaQueryWrapper<GoodsOrder>()
 				.eq(GoodsOrder::getPhone, yeepayOrder.getPhone()).eq(GoodsOrder::getPointGoodsId, yeepayOrder.getPointGoodsId())).size();
 			System.out.println(size);
@@ -491,15 +491,6 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 				//需要的现金
 				BigDecimal usePoint = exchangePoint.subtract(yeepayOrder.getUsePoint());
 				amount = usePoint.divide(BigDecimal.valueOf(100));
-
-				PointRecord pointRecord = new PointRecord();
-				pointRecord.setPoint(yeepayOrder.getUsePoint());
-				pointRecord.setUserId(user.getUserId());
-				pointRecord.setPointGoodsId(yeepayOrder.getPointGoodsId());
-				pointRecord.setPointType(PointTypeEnum.PUFA_POINT_EXCHANGE);
-				pointRecord.setPhone(yeepayOrder.getPhone());
-				pointRecord.setActiveId(yeepayOrder.getActiveId());
-				Assert.isTrue(pointRecordService.save(pointRecord), "兑换失败");
 			}else {
 				amount = exchangePoint.divide(BigDecimal.valueOf(100));
 			}
@@ -517,11 +508,6 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 			yeepayOrder.setCallbackUrl(callbackUrl);
 			yeepayOrder.setCreateTime(new Date());
 			yeepayOrder.setUserId(user.getUserId());
-			if (StringUtil.isEmpty(yeepayOrder.getUsePoint())){
-				yeepayOrder.setUsePoint(BigDecimal.ZERO);
-			}else {
-				yeepayOrder.setUsePoint(yeepayOrder.getUsePoint());
-			}
 			yeepayOrder.setUsePoint(BigDecimal.ZERO);
 			yeepayOrder.setPointGoodsName(goods.getName());
 			yeepayOrder.setIp(IPUtils.getRealIp(request));

src/main/java/org/springblade/sing/goods/entity/PointGoods.java

@@ -81,7 +81,8 @@ public class PointGoods extends BaseEntity {
 	 * 是否限购
 	 */
 	@ApiModelProperty(value = "是否限购")
-	private int isLimit;
+	private Integer isLimit;
+
 	/**
 	 * 活动id
 	 */

src/main/resources/log/logback-prod.xml

@@ -25,7 +25,7 @@
     <appender name="INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>/data/local/webserver/music/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>/www/webserver/sing-for-me/service/log/info-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>
@@ -42,7 +42,7 @@
     <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件输出的文件名 -->
-            <FileNamePattern>/data/local/webserver/music/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>/www/webserver/sing-for-me/service/log/error-%d{yyyy-MM-dd}.log</FileNamePattern>
         </rollingPolicy>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>%n%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] [%X{traceId}] [%logger{50}] %n%-5level: %msg%n</pattern>