diff --git a/src/main/java/com/ycwl/basic/biz/OrderBiz.java b/src/main/java/com/ycwl/basic/biz/OrderBiz.java index 7d4b1d3f..48e95aaf 100644 --- a/src/main/java/com/ycwl/basic/biz/OrderBiz.java +++ b/src/main/java/com/ycwl/basic/biz/OrderBiz.java @@ -287,14 +287,14 @@ public class OrderBiz { } break; case 1: - List imageSource = sourceMapper.listImageByFaceRelation(order.getMemberId(), orderItemVO.getGoodsId()); + List imageSource = sourceMapper.listImageByFaceRelation(orderItemVO.getGoodsId()); Optional min = imageSource.stream().min(Comparator.comparing(SourceEntity::getCreateTime)); if (min.isPresent()) { goodsCreateTime = min.get().getCreateTime(); } break; case 2: - List videoSource = sourceMapper.listImageByFaceRelation(order.getMemberId(), orderItemVO.getGoodsId()); + List videoSource = sourceMapper.listImageByFaceRelation(orderItemVO.getGoodsId()); Optional minTime = videoSource.stream().min(Comparator.comparing(SourceEntity::getCreateTime)); if (minTime.isPresent()) { goodsCreateTime = minTime.get().getCreateTime(); diff --git a/src/main/java/com/ycwl/basic/repository/SourceRepository.java b/src/main/java/com/ycwl/basic/repository/SourceRepository.java index dbd06d8d..177dc680 100644 --- a/src/main/java/com/ycwl/basic/repository/SourceRepository.java +++ b/src/main/java/com/ycwl/basic/repository/SourceRepository.java @@ -78,13 +78,13 @@ public class SourceRepository { } switch (type) { case 1: - List videoSourceList = sourceMapper.listVideoByFaceRelation(userId, faceId); + List videoSourceList = sourceMapper.listVideoByFaceRelation(faceId); if (videoSourceList == null || videoSourceList.isEmpty()) { return false; } return videoSourceList.stream().filter(Objects::nonNull).anyMatch(item -> Integer.valueOf(1).equals(item.getIsBuy())); case 2: - List imageSourceList = sourceMapper.listImageByFaceRelation(userId, faceId); + List imageSourceList = sourceMapper.listImageByFaceRelation(faceId); if (imageSourceList == null || imageSourceList.isEmpty()) { return false; } diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java index 4805f576..757a28a6 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java @@ -282,16 +282,8 @@ public class AppScenicServiceImpl implements AppScenicService { ScenicAppVO scenicAppVO = new ScenicAppVO(); scenicAppVO.setId(scenicEntity.getId()); scenicAppVO.setName(scenicEntity.getName()); - scenicAppVO.setPhone(scenicEntity.getPhone()); - scenicAppVO.setIntroduction(scenicEntity.getIntroduction()); scenicAppVO.setCoverUrl(scenicEntity.getCoverUrl()); - scenicAppVO.setLongitude(scenicEntity.getLongitude()); - scenicAppVO.setLatitude(scenicEntity.getLatitude()); scenicAppVO.setRadius(scenicEntity.getRadius()); - scenicAppVO.setProvince(scenicEntity.getProvince()); - scenicAppVO.setCity(scenicEntity.getCity()); - scenicAppVO.setArea(scenicEntity.getArea()); - scenicAppVO.setAddress(scenicEntity.getAddress()); scenicAppVO.setDistance(distance); // 获取设备数量