diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java index c63eeced..c3770c14 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java @@ -1,5 +1,6 @@ package cn.lili.modules.payment.kit.plugin.alipay; +import cn.hutool.http.HtmlUtil; import com.alibaba.fastjson.JSONObject; import com.alipay.api.*; import com.alipay.api.domain.*; @@ -950,7 +951,7 @@ public class AliPayApi { for (int i = 0; i < values.length; i++) { valueStr = (i == values.length - 1) ? valueStr + values[i] : valueStr + values[i] + ","; } - params.put(name, valueStr); + params.put(name, HtmlUtil.unescape(valueStr)); } return params; } diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java index 751559d8..21d04846 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java @@ -188,6 +188,9 @@ public class SeckillServiceImpl extends ServiceImpl impl if (PromotionStatusEnum.START.name().equals(seckillVO.getPromotionStatus())) { throw new ServiceException(ResultCode.PROMOTION_UPDATE_ERROR); } + if (seckillVO.getEndTime() == null) { + seckillVO.setEndTime(cn.hutool.core.date.DateUtil.endOfDay(seckillVO.getStartTime())); + } PromotionTools.checkPromotionTime(seckillVO.getStartTime().getTime(), seckillVO.getEndTime().getTime()); //更新到MYSQL中 boolean result = this.updateById(seckillVO);