diff --git a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java index 9e20761..6dadee7 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java +++ b/play-admin/src/main/java/com/starry/admin/modules/shop/service/impl/PlayCommodityInfoServiceImpl.java @@ -100,7 +100,7 @@ public class PlayCommodityInfoServiceImpl extends ServiceImpl selectByType() { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PlayCommodityInfoEntity::getItemType, "服务类型"); - lambdaQueryWrapper.orderByAsc(PlayCommodityInfoEntity::getSort); + lambdaQueryWrapper.orderByDesc(PlayCommodityInfoEntity::getSort); return this.baseMapper.selectList(lambdaQueryWrapper); } diff --git a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java index 9146499..023b737 100644 --- a/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java +++ b/play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkCommodityController.java @@ -126,8 +126,7 @@ public class WxClerkCommodityController { PlayCommodityReturnVo item = it.next(); if ("00".equals(item.getPId()) && item.getChild().isEmpty()) { it.remove(); - } - if (clerkCommodityEntities != null && "00".equals(item.getPId()) && !clerkCommodityEntities.containsKey(item.getId())) { + } else if (clerkCommodityEntities != null && "00".equals(item.getPId()) && !clerkCommodityEntities.containsKey(item.getId())) { it.remove(); } formatPlayCommodityReturnVoTree(item.getChild(), clerkCommodityEntities);