BUGFIX:1. singleDesign颜色返回不对 2. 单品design通过优先级获取图层有误
This commit is contained in:
@@ -1487,7 +1487,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
response.getOthers().removeIf(o -> !minioUtil.doesObjectExist(o.getMinIOPath()));
|
response.getOthers().removeIf(o -> !minioUtil.doesObjectExist(o.getMinIOPath()));
|
||||||
return editDesignItemLayer(flag, designPythonOutfit,
|
return editDesignItemLayer(flag, designPythonOutfit,
|
||||||
minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
|
minioUtil.getPreSignedUrl(designPythonOutfit.getDesignUrl(), 24 * 60),
|
||||||
editResponseColor(designItemDetails, response));
|
editResponseColor(designItemDetails, response), design);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -1623,7 +1623,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
return designItemDetailVO;
|
return designItemDetailVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
private DesignItemDetailVO editDesignItemLayer(Boolean flag, TDesignPythonOutfit designPythonOutfit, String designItemUrl, DesignItemDetailVO designItemDetailVO) {
|
private DesignItemDetailVO editDesignItemLayer(Boolean flag, TDesignPythonOutfit designPythonOutfit, String designItemUrl, DesignItemDetailVO designItemDetailVO, Design design) {
|
||||||
ArrayList<DesignPythonOutfitVO> detailsVO = new ArrayList<>();
|
ArrayList<DesignPythonOutfitVO> detailsVO = new ArrayList<>();
|
||||||
|
|
||||||
if (flag) {
|
if (flag) {
|
||||||
@@ -1635,7 +1635,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 为没有优先级的图层添加优先级
|
// 为没有优先级的图层添加优先级
|
||||||
designPythonOutfitDetailService.setDesignPythonOutfitDetailPriority(details);
|
if (!StringUtil.isNullOrEmpty(design.getSingleOverall()) && design.getSingleOverall().equals("overall")){
|
||||||
|
designPythonOutfitDetailService.setDesignPythonOutfitDetailPriority(details);
|
||||||
|
}
|
||||||
|
|
||||||
details.forEach(detail -> {
|
details.forEach(detail -> {
|
||||||
detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail, null));
|
detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail, null));
|
||||||
|
|||||||
@@ -188,6 +188,9 @@ public class PanToneServiceImpl extends ServiceImpl<PanToneMapper, PanTone> impl
|
|||||||
if (Objects.isNull(pantoneVO)) {
|
if (Objects.isNull(pantoneVO)) {
|
||||||
pantoneVO = new PantoneVO(rgb[0], rgb[1], rgb[2], hsv[0], hsv[1], hsv[2]);
|
pantoneVO = new PantoneVO(rgb[0], rgb[1], rgb[2], hsv[0], hsv[1], hsv[2]);
|
||||||
}
|
}
|
||||||
|
pantoneVO.setR(rgb[0]);
|
||||||
|
pantoneVO.setG(rgb[1]);
|
||||||
|
pantoneVO.setB(rgb[2]);
|
||||||
return pantoneVO;
|
return pantoneVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user