Commit ff171913 by huluobin

update

parent b899164a
package com.gogirl.application.product.serve; package com.gogirl.application.product.serve;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.gogirl.domain.product.serve.TechniqueCategory;
import com.gogirl.domain.product.serve.TechniqueSku; import com.gogirl.domain.product.serve.TechniqueSku;
import java.util.List; import java.util.List;
...@@ -27,5 +26,5 @@ public interface ITechniqueSkuService extends IService<TechniqueSku> { ...@@ -27,5 +26,5 @@ public interface ITechniqueSkuService extends IService<TechniqueSku> {
* 查询所有款式技法分组 包括默认数量 单选多选 * 查询所有款式技法分组 包括默认数量 单选多选
* @return * @return
*/ */
Map<TechniqueCategory, List<TechniqueSku>> queryTechniqueSkuMap(); Map<String, List<TechniqueSku>> queryTechniqueSkuMap();
} }
...@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -5,11 +5,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gogirl.application.product.serve.ITechniqueSkuService; import com.gogirl.application.product.serve.ITechniqueSkuService;
import com.gogirl.domain.product.serve.TechniqueCategory; import com.gogirl.domain.product.serve.TechniqueCategory;
import com.gogirl.domain.product.serve.TechniqueSku; import com.gogirl.domain.product.serve.TechniqueSku;
import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
import com.gogirl.infrastructure.mapper.product.serve.TechniqueCategoryMapper; import com.gogirl.infrastructure.mapper.product.serve.TechniqueCategoryMapper;
import com.gogirl.infrastructure.mapper.product.serve.TechniqueSkuMapper; import com.gogirl.infrastructure.mapper.product.serve.TechniqueSkuMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -37,13 +39,17 @@ public class TechniqueSkuServiceImpl extends ServiceImpl<TechniqueSkuMapper, Tec ...@@ -37,13 +39,17 @@ public class TechniqueSkuServiceImpl extends ServiceImpl<TechniqueSkuMapper, Tec
} }
@Override @Override
public Map<TechniqueCategory, List<TechniqueSku>> queryTechniqueSkuMap() { public Map<String, List<TechniqueSku>> queryTechniqueSkuMap() {
List<TechniqueSku> techniqueSkuList = this.list(); List<TechniqueSku> techniqueSkuList = this.list();
List<TechniqueCategory> techniqueCategoryList = techniqueCategoryMapper.selectList(new LambdaQueryWrapper<>()); List<TechniqueCategory> techniqueCategoryList = techniqueCategoryMapper.selectList(new LambdaQueryWrapper<>());
Map<Integer, TechniqueCategory> techniqueCategoryMap = techniqueCategoryList.stream().collect(Collectors.toMap(TechniqueCategory::getId, a -> a, (k1, k2) -> k1));
techniqueSkuList.forEach(techniqueSku -> techniqueSku.setTechniqueCategory(techniqueCategoryMap.get(techniqueSku.getTechniqueCategoryId())));
return techniqueSkuList.stream().collect(Collectors.groupingBy(TechniqueSku::getTechniqueCategory)); Map<Integer, List<TechniqueSku>> integerListMap = techniqueSkuList.stream().collect(Collectors.groupingBy(TechniqueSku::getTechniqueCategoryId));
Map<String, List<TechniqueSku>> result = new HashMap<>();
techniqueCategoryList.forEach(techniqueCategory -> {
result.put(JsonUtilByFsJson.beanToJson(techniqueCategory), integerListMap.get(techniqueCategory.getId()));
});
return result;
} }
} }
...@@ -2,7 +2,6 @@ package com.gogirl.interfaces.product.serve; ...@@ -2,7 +2,6 @@ package com.gogirl.interfaces.product.serve;
import com.gogirl.application.product.serve.ITechniqueSkuService; import com.gogirl.application.product.serve.ITechniqueSkuService;
import com.gogirl.domain.product.serve.TechniqueCategory;
import com.gogirl.domain.product.serve.TechniqueSku; import com.gogirl.domain.product.serve.TechniqueSku;
import com.gogirl.infrastructure.common.base.JsonResult; import com.gogirl.infrastructure.common.base.JsonResult;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -48,8 +47,8 @@ public class TechniqueSkuController { ...@@ -48,8 +47,8 @@ public class TechniqueSkuController {
@ApiOperation("查询所有款式技法分组") @ApiOperation("查询所有款式技法分组")
@GetMapping("/technician/techniqueSku/queryTechniqueSkuMap") @GetMapping("/technician/techniqueSku/queryTechniqueSkuMap")
public JsonResult<Map<TechniqueCategory, List<TechniqueSku>>> queryTechniqueSkuMap() { public JsonResult<Map<String, List<TechniqueSku>>> queryTechniqueSkuMap() {
Map<TechniqueCategory, List<TechniqueSku>> map = techniqueSkuService.queryTechniqueSkuMap(); Map<String, List<TechniqueSku>> map = techniqueSkuService.queryTechniqueSkuMap();
return JsonResult.success(map); return JsonResult.success(map);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment