From ec4d91b37ff43e5db81b03727dbe51b21b4a83ea Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Fri, 31 Mar 2023 15:22:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 41d30105..a94031b2 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ##### 体验 公众号/小程序/APP 体验，扫描二维码 -![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png) +![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png) [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)   ![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717) @@ -56,7 +56,7 @@ PS：手机验证码为 ‘111111’ **商城 小程序/公众号/APP**：扫描二维码 -![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png) +![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png) ### 快速本地部署 @@ -75,24 +75,24 @@ PS：手机验证码为 ‘111111’ #### 平台管理端功能 -![平台管理端功能](https://pickmall.cn/assets/imgs/other/managerList1.jpg) +![平台管理端功能](https://static.pickmall.cn/images/other/managerList1.jpg) #### 卖家功能 -![商家端功能](https://pickmall.cn/assets/imgs/other/storeList.jpg) +![商家端功能](https://static.pickmall.cn/images/other/storeList.jpg) ### 商城前端功能展示 #### 商城移动端 -移动端功能展示 +移动端功能展示 #### 平台管理端 -![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif) +![管理端功能展示](https://static.pickmall.cn/images/other/manager.gif) ### 技术选型 From 81f47a7fb6ca54dc469e9a755ed57961ba75c612 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Tue, 4 Apr 2023 17:55:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/promotion/entity/dto/search/CouponSearchParams.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java index eddecde6..80227ee1 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java @@ -103,7 +103,7 @@ public class CouponSearchParams extends BasePromotionsSearchParams implements Se } if (this.getStartTime() != null) { - queryWrapper.ge("start_time", new Date(this.getEndTime())); + queryWrapper.ge("start_time", new Date(this.getStartTime())); } if (this.getEndTime() != null) { queryWrapper.le("end_time", new Date(this.getEndTime())); From 864701adfbd6fb21c4d87124e076a97fc90f408f Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Wed, 5 Apr 2023 10:28:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?wrapper=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java index eec23bbc..b886af48 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java @@ -177,7 +177,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements skuCountQueryWrapper.eq("auth_flag", GoodsAuthEnum.PASS.name()); skuCountQueryWrapper.eq("market_enable", GoodsStatusEnum.UPPER.name()); skuCountQueryWrapper.eq("delete_flag", false); - skuCountQueryWrapper.ge("gs.quantity", 0); + skuCountQueryWrapper.ge("quantity", 0); resultMap = new HashMap<>(); resultMap.put(KEY_SUCCESS, 0L); resultMap.put(KEY_FAIL, 0L); From 9294f77163b6c04804f2a00fa750ac94fa9b6b4d Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Thu, 6 Apr 2023 08:16:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/connect/serviceimpl/ConnectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 46c0c5b3..bd8d6c0e 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -187,8 +187,8 @@ public class ConnectServiceImpl extends ServiceImpl impl connectAuthUser.setAvatar(params.getImage()); connectAuthUser.setUsername("m" + phone); connectAuthUser.setPhone(phone); - connectAuthUser.setSource(ConnectEnum.WECHAT.name()); - connectAuthUser.setType(ClientTypeEnum.WECHAT_MP.name()); + connectAuthUser.setSource(ClientTypeEnum.WECHAT_MP.name()); + connectAuthUser.setType(ConnectEnum.WECHAT.name()); AuthToken authToken = new AuthToken(); authToken.setUnionId(unionId);