diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java index 491d361..9290b73 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5MemberCartService.java @@ -1,6 +1,5 @@ package com.cyl.h5.service; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,7 +7,6 @@ import com.cyl.h5.config.SecurityUtil; import com.cyl.manager.pms.domain.Sku; import com.cyl.manager.pms.mapper.ProductMapper; import com.cyl.manager.pms.mapper.SkuMapper; -import com.cyl.manager.pms.pojo.dto.MemberCartDTO; import com.cyl.manager.ums.convert.MemberCartConvert; import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.MemberCart; @@ -192,25 +190,6 @@ public class H5MemberCartService { return c.getQuantity(); } - public void injectSku(List resList) { - List skuIds = resList.stream().map(MemberCartDTO::getSkuId).distinct().collect(Collectors.toList()); - if (CollUtil.isEmpty(skuIds)) { - return; - } - List skus = skuMapper.selectBatchIds(skuIds); - Map map = new HashMap<>(); - skus.forEach(it -> { - map.put(it.getId(), it); - }); - resList.forEach(it -> { - Sku s = map.get(it.getSkuId()); - if (s == null) { - return; - } - it.setPrice(s.getPrice()); - }); - } - public List mineCartIds() { QueryWrapper qw = new QueryWrapper<>(); qw.eq("member_id", SecurityUtils.getUserId()); diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java deleted file mode 100644 index 0d99ae8..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/manager/oms/pojo/dto/SaveOrderItemDTO.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.cyl.manager.oms.pojo.dto; - -public class SaveOrderItemDTO { -} diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/dto/MemberCartDTO.java b/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/dto/MemberCartDTO.java deleted file mode 100644 index cdc41e6..0000000 --- a/ruoyi-mall/src/main/java/com/cyl/manager/pms/pojo/dto/MemberCartDTO.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.cyl.manager.pms.pojo.dto; - -import com.cyl.manager.ums.domain.MemberCart; -import lombok.Data; - -import java.math.BigDecimal; - -@Data -public class MemberCartDTO extends MemberCart { - private BigDecimal price; -} diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java index 1d6ea6b..fed5f5b 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/FeedbackConvert.java @@ -5,7 +5,7 @@ import com.cyl.manager.ums.domain.Feedback; import com.cyl.manager.ums.pojo.vo.FeedbackVO; import java.util.List; /** - * 意见反馈 DO <=> DTO <=> VO / BO / Query + * 意见反馈 DO <=> VO / BO * * @author zcc */ diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java index cbfc0ae..0019768 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/convert/MemberCartConvert.java @@ -2,7 +2,6 @@ package com.cyl.manager.ums.convert; import com.cyl.manager.pms.domain.Product; import com.cyl.manager.pms.domain.Sku; -import com.cyl.manager.pms.pojo.dto.MemberCartDTO; import org.mapstruct.BeanMapping; import org.mapstruct.Mapper; import com.cyl.manager.ums.domain.MemberCart; @@ -29,6 +28,4 @@ public interface MemberCartConvert { @BeanMapping(ignoreByDefault = true) @Mapping(source = "name", target = "productName") void injectProduct(@MappingTarget MemberCart memberCart, Product p); - - List dos2Dtos(List list); } diff --git a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java index 8b1b533..74cd6f1 100644 --- a/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java +++ b/ruoyi-mall/src/main/java/com/cyl/manager/ums/service/MemberCartService.java @@ -1,6 +1,5 @@ package com.cyl.manager.ums.service; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,7 +8,6 @@ import com.cyl.h5.config.SecurityUtil; import com.cyl.manager.pms.domain.Sku; import com.cyl.manager.pms.mapper.ProductMapper; import com.cyl.manager.pms.mapper.SkuMapper; -import com.cyl.manager.pms.pojo.dto.MemberCartDTO; import com.cyl.manager.ums.convert.MemberCartConvert; import com.cyl.manager.ums.domain.Member; import com.cyl.manager.ums.domain.MemberCart; @@ -18,7 +16,6 @@ import com.cyl.manager.ums.mapper.MemberMapper; import com.cyl.manager.ums.pojo.query.MemberCartQuery; import com.cyl.manager.ums.pojo.vo.MemberCartVO; import com.cyl.manager.ums.pojo.vo.form.UpdateMemberCartForm; -import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.base.BaseException; @@ -26,7 +23,6 @@ import com.ruoyi.common.utils.AesCryptoUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SortUtil; import com.ruoyi.framework.config.LocalDataUtil; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.domain.PageImpl; @@ -35,7 +31,10 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /**