code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge code

Browse Source
This commit is contained in:
misworga831
2023-04-06 10:29:47 +08:00
parent 675830045d 9294f77163
commit 3716691366
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
View File

@@ -187,8 +187,8 @@ public class ConnectServiceImpl extends ServiceImpl<ConnectMapper, Connect> 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);

2
framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java
View File

@@ -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()));

2
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
View File

@@ -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);