diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java index 9bca0c8f..2259b314 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageUtil.java @@ -89,7 +89,7 @@ public class WechatMessageUtil { QueryWrapper queryWrapper = new QueryWrapper(); 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); if (connect == null) { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index 8755dd2c..5902e630 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java @@ -161,7 +161,7 @@ public class WechatPlugin implements Payment { try { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); 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); if (connect == null) { return null; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java index 9154f28e..fc3de46f 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java @@ -96,7 +96,7 @@ public class PromotionGoodsServiceImpl extends ServiceImpl promotionGoods = new ArrayList<>(this.list(new LambdaQueryWrapper() .eq(PromotionGoods::getSkuId, skuId) - .le(PromotionGoods::getStartTime, System.currentTimeMillis()) +// .ge(PromotionGoods::getStartTime, new Date()) .eq(PromotionGoods::getPromotionStatus, PromotionStatusEnum.START.name())));