caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!35 修复支付宝支付回调转义问题；修复限时抢购时，结束时间为空的问题

Browse Source 
Merge pull request !35 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-09-26 09:15:30 +00:00 committed by Gitee
commit 7fafdc087e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java
View File

@ -1,5 +1,6 @@
package cn.lili.modules.payment.kit.plugin.alipay; package cn.lili.modules.payment.kit.plugin.alipay;
import cn.hutool.http.HtmlUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alipay.api.*; import com.alipay.api.*;
import com.alipay.api.domain.*; import com.alipay.api.domain.*;
@ -950,7 +951,7 @@ public class AliPayApi {
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
valueStr = (i == values.length - 1) ? valueStr + values[i] : valueStr + values[i] + ","; valueStr = (i == values.length - 1) ? valueStr + values[i] : valueStr + values[i] + ",";
} }
params.put(name, valueStr); params.put(name, HtmlUtil.unescape(valueStr));
} }
return params; return params;
} }

3
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
View File

@ -188,6 +188,9 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
if (PromotionStatusEnum.START.name().equals(seckillVO.getPromotionStatus())) { if (PromotionStatusEnum.START.name().equals(seckillVO.getPromotionStatus())) {
throw new ServiceException(ResultCode.PROMOTION_UPDATE_ERROR); 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()); PromotionTools.checkPromotionTime(seckillVO.getStartTime().getTime(), seckillVO.getEndTime().getTime());
//更新到MYSQL中 //更新到MYSQL中
boolean result = this.updateById(seckillVO); boolean result = this.updateById(seckillVO);