From 006218e15a5f02a6c02dbe110807a94374be42fb Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 8 Sep 2021 15:15:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../promotion/serviceimpl/PromotionGoodsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()))); From 8784da3449f0b6a03a5458356b6843fef62e54e5 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 9 Sep 2021 14:01:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?h5=20=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E5=90=8E=E6=94=AF=E4=BB=98=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/message/util/WechatMessageUtil.java | 2 +- .../cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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;