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

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao 2021-09-09 16:47:43 +08:00
commit 9b7be69c6c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java
View File

@ -89,7 +89,7 @@ public class WechatMessageUtil {
QueryWrapper<Connect> queryWrapper = new QueryWrapper(); QueryWrapper<Connect> queryWrapper = new QueryWrapper();
queryWrapper.eq("user_id", order.getMemberId()); queryWrapper.eq("user_id", order.getMemberId());
queryWrapper.eq("union_type", ConnectEnum.WECHAT_OPEN_ID.name()); queryWrapper.eq("union_type", ConnectEnum.WECHAT.name());
Connect connect = connectService.getOne(queryWrapper); Connect connect = connectService.getOne(queryWrapper);
if (connect == null) { if (connect == null) {

2
framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java
View File

@ -161,7 +161,7 @@ public class WechatPlugin implements Payment {
try { try {
LambdaQueryWrapper<Connect> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Connect> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Connect::getUserId, UserContext.getCurrentUser().getId()) queryWrapper.eq(Connect::getUserId, UserContext.getCurrentUser().getId())
.eq(Connect::getUnionType, ConnectEnum.WECHAT_OPEN_ID.name()); .eq(Connect::getUnionType, ConnectEnum.WECHAT.name());
Connect connect = connectService.getOne(queryWrapper); Connect connect = connectService.getOne(queryWrapper);
if (connect == null) { if (connect == null) {
return null; return null;

2
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java
View File

@ -96,7 +96,7 @@ public class PromotionGoodsServiceImpl extends ServiceImpl<PromotionGoodsMapper,
List<PromotionGoods> promotionGoods = new ArrayList<>(this.list(new LambdaQueryWrapper<PromotionGoods>() List<PromotionGoods> promotionGoods = new ArrayList<>(this.list(new LambdaQueryWrapper<PromotionGoods>()
.eq(PromotionGoods::getSkuId, skuId) .eq(PromotionGoods::getSkuId, skuId)
.le(PromotionGoods::getStartTime, System.currentTimeMillis()) // .ge(PromotionGoods::getStartTime, new Date())
.eq(PromotionGoods::getPromotionStatus, PromotionStatusEnum.START.name()))); .eq(PromotionGoods::getPromotionStatus, PromotionStatusEnum.START.name())));