From 3ac28ac2181b2fb91a966e27fdaf0baf692de96e Mon Sep 17 00:00:00 2001
From: yangkang <kang.yang@beantechs.com>
Date: Mon, 6 Dec 2021 15:18:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dstore/promotion/pintuan?=
 =?UTF-8?q?=E8=BF=99=E4=B8=AA=E6=8E=A5=E5=8F=A3=E4=B8=AD=EF=BC=8C=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=8B=BC=E5=9B=A2=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?bug=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili/modules/promotion/entity/vos/PintuanSearchParams.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java
index 79da0d01..ecff3c29 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java
@@ -55,7 +55,7 @@ public class PintuanSearchParams {
             queryWrapper.like("store_name", storeName);
         }
         if (!StringUtils.isEmpty(storeId)) {
-            queryWrapper.eq("store_id", storeName);
+            queryWrapper.eq("store_id", storeId);
         }
         if (startTime != null) {
             queryWrapper.ge("start_time", new Date(startTime));

From ff757d215169ab3ba8301bd47461fcd22c84be96 Mon Sep 17 00:00:00 2001
From: yangkang <kang.yang@beantechs.com>
Date: Sat, 11 Dec 2021 16:07:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=81=BF=E5=85=8Dredis=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=AF=BB=E5=8F=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statistics/serviceimpl/PlatformViewServiceImpl.java       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
index d0db1cb9..9b0e69c7 100644
--- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewServiceImpl.java
@@ -70,7 +70,7 @@ public class PlatformViewServiceImpl extends ServiceImpl<PlatformViewMapper, Pla
         Object object = cache.get(CachePrefix.ONLINE_NUM.getPrefix());
 
         if (null != object) {
-            return (Long) cache.get(CachePrefix.ONLINE_NUM.getPrefix());
+            return (Long) object;
         }
         //这里统计的是有效的accessToken ，如果需要数据精确，需要调整accessToken的有效时间，开发人员建议2小时误差较为合适
         Long num = Long.valueOf(cache.keys(CachePrefix.ACCESS_TOKEN.getPrefix(UserEnums.MEMBER) + "*").size());
@@ -83,7 +83,7 @@ public class PlatformViewServiceImpl extends ServiceImpl<PlatformViewMapper, Pla
         Object object = cache.get(CachePrefix.MEMBER_DISTRIBUTION.getPrefix());
 
         if (null != object) {
-            return (List<MemberDistributionVO>) cache.get(CachePrefix.MEMBER_DISTRIBUTION.getPrefix());
+            return (List<MemberDistributionVO>) object;
         }
         List<MemberDistributionVO> memberDistributionVOS = memberStatisticsService.distribution();
 

From ef8615cfe5ab57047d9dfa2db6ea056e58c35f4e Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 13 Dec 2021 09:32:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
index c0c9c04b..6597bf56 100644
--- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java
@@ -192,6 +192,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements Bi
         }
         LambdaUpdateWrapper<Bill> lambdaUpdateWrapper = Wrappers.lambdaUpdate();
         lambdaUpdateWrapper.eq(Bill::getId, id);
+        lambdaUpdateWrapper.set(Bill::getPayTime, new Date());
         lambdaUpdateWrapper.set(Bill::getBillStatus, BillStatusEnum.COMPLETE.name());
         return this.update(lambdaUpdateWrapper);
     }

From 947fc457f27476518434b222801b02dbc9cb3b19 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 13 Dec 2021 16:21:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9im=E5=B9=B3=E5=8F=B0id?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E4=B8=BAstring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/lili/modules/system/entity/dto/ImSetting.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java
index 87ca2b74..4ba51a1e 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/ImSetting.java
@@ -20,7 +20,7 @@ public class ImSetting implements Serializable {
 
 
     @ApiModelProperty(value = "平台ID")
-    private Integer tenantId;
+    private String tenantId;
 
 
 }