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) ### 技术选型 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); 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())); 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 972d0ebc..a8848ff8 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);