From 81ce0f4682fc99cb2b0365b8ef3ccf9013dbab64 Mon Sep 17 00:00:00 2001 From: paulGao Date: Sun, 26 Sep 2021 17:13:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E8=BD=AC=E4=B9=89=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D=E9=99=90=E6=97=B6=E6=8A=A2?= =?UTF-8?q?=E8=B4=AD=E6=97=B6=EF=BC=8C=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java | 3 ++- .../lili/modules/promotion/serviceimpl/SeckillServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) 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);