irving/peipei-backend
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix

Browse Source
This commit is contained in:
admin
2024-08-28 21:12:05 +08:00
parent 8702e282a5
commit cadd0b6822
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java
View File

@@ -100,7 +100,7 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl<PlayCommodityInfoM
public List<PlayCommodityInfoEntity> selectByType() { public List<PlayCommodityInfoEntity> selectByType() {
LambdaQueryWrapper<PlayCommodityInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PlayCommodityInfoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getItemType, "服务类型"); lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getItemType, "服务类型");
lambdaQueryWrapper.orderByAsc(PlayCommodityInfoEntity::getSort); lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort);
return this.baseMapper.selectList(lambdaQueryWrapper); return this.baseMapper.selectList(lambdaQueryWrapper);
} }

3
play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java
View File

@@ -126,8 +126,7 @@ public class WxClerkCommodityController {
PlayCommodityReturnVo item = it.next(); PlayCommodityReturnVo item = it.next();
if ("00".equals(item.getPId()) && item.getChild().isEmpty()) { if ("00".equals(item.getPId()) && item.getChild().isEmpty()) {
it.remove(); it.remove();
} } else if (clerkCommodityEntities != null && "00".equals(item.getPId()) && !clerkCommodityEntities.containsKey(item.getId())) {
if (clerkCommodityEntities != null && "00".equals(item.getPId()) && !clerkCommodityEntities.containsKey(item.getId())) {
it.remove(); it.remove();
} }
formatPlayCommodityReturnVoTree(item.getChild(), clerkCommodityEntities); formatPlayCommodityReturnVoTree(item.getChild(), clerkCommodityEntities);