design single submit bug修改
This commit is contained in:
@@ -12,7 +12,7 @@ import java.util.List;
|
|||||||
public class DesignItemClothesDetailVO {
|
public class DesignItemClothesDetailVO {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* designItemDetail对应的businessId
|
* designItemDetail对应的Id
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty("对应的上游id")
|
@ApiModelProperty("对应的上游id")
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|||||||
@@ -283,9 +283,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
, JSONObject outfit, String timeZone){
|
, JSONObject outfit, String timeZone){
|
||||||
|
|
||||||
DesignItem designItem = new DesignItem();
|
DesignItem designItem = new DesignItem();
|
||||||
String url = pythonObjects.getObjects().get(0).getBasic().getSave_name();
|
// String url = pythonObjects.getObjects().get(0).getBasic().getSave_name();
|
||||||
designItem.setUpdateDate(DateUtil.getByTimeZone(timeZone));
|
designItem.setUpdateDate(DateUtil.getByTimeZone(timeZone));
|
||||||
designItem.setDesignUrl(url);
|
designItem.setDesignUrl(outfit.getString("synthesis_url"));
|
||||||
designItem.setId(designItemId);
|
designItem.setId(designItemId);
|
||||||
|
|
||||||
//更新designItem
|
//更新designItem
|
||||||
@@ -316,7 +316,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
designItemDetail.setPrintJson(JSON.toJSONString(printObject));
|
designItemDetail.setPrintJson(JSON.toJSONString(printObject));
|
||||||
designItemDetails.add(designItemDetail);
|
designItemDetails.add(designItemDetail);
|
||||||
});
|
});
|
||||||
// todo businessId来源
|
// todo businessId 来自t_sys_file或者t_library
|
||||||
designItemDetailService.saveBatch(designItemDetails);
|
designItemDetailService.saveBatch(designItemDetails);
|
||||||
|
|
||||||
// 覆盖designPythonOutfit表中的模特全身图
|
// 覆盖designPythonOutfit表中的模特全身图
|
||||||
@@ -376,8 +376,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
Assert.notNull(designItem,"design item does not exists!");
|
Assert.notNull(designItem,"design item does not exists!");
|
||||||
Design design = designService.getById(designItem.getDesignId());
|
Design design = designService.getById(designItem.getDesignId());
|
||||||
Assert.notNull(design,"design does not exists!");
|
Assert.notNull(design,"design does not exists!");
|
||||||
TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId());
|
|
||||||
Assert.notNull(designItem,"design item detail layers does not exists!");
|
|
||||||
DesignLibraryModelPointVO designLibraryModelPointVO = null;
|
DesignLibraryModelPointVO designLibraryModelPointVO = null;
|
||||||
// 设置模特
|
// 设置模特
|
||||||
if (Objects.nonNull(design.getTemplateId())){
|
if (Objects.nonNull(design.getTemplateId())){
|
||||||
@@ -414,6 +413,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail));
|
detailsVO.add(designPythonOutfitDetailService.convertToDesignPythonOutfitVO(detail));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
TDesignPythonOutfit designPythonOutfit = designPythonOutfitService.getByDesignItemId(designSingleIncludeLayersDTO.getDesignItemId());
|
||||||
|
Assert.notNull(designItem,"design item detail layers does not exists!");
|
||||||
|
|
||||||
return assembleDesignSingleResponse(designItem.getId(),minioUtil.splitThenGetPreviewUrl(designPythonOutfit.getDesignUrl(),480),
|
return assembleDesignSingleResponse(designItem.getId(),minioUtil.splitThenGetPreviewUrl(designPythonOutfit.getDesignUrl(),480),
|
||||||
designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),detailsVO);
|
designSingleIncludeLayersDTO.getDesignSingleItemDTOList(),detailsVO);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -809,7 +809,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
.filter(f -> OUTWEAR_DRESS_BLOUSE.contains(f.getType()) || SKIRT_TROUSERS.contains(f.getType()))
|
.filter(f -> OUTWEAR_DRESS_BLOUSE.contains(f.getType()) || SKIRT_TROUSERS.contains(f.getType()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
response.setClothes(CopyUtil.copyList(filterDetail,DesignItemClothesDetailVO.class,(o,d)->{
|
response.setClothes(CopyUtil.copyList(filterDetail,DesignItemClothesDetailVO.class,(o,d)->{
|
||||||
d.setId(o.getBusinessId());
|
d.setId(o.getId());
|
||||||
d.setLevel1Type(converTypeToLevel1(o.getType()));
|
d.setLevel1Type(converTypeToLevel1(o.getType()));
|
||||||
String printJson = o.getPrintJson();
|
String printJson = o.getPrintJson();
|
||||||
if (StringUtils.isEmpty(printJson)) {
|
if (StringUtils.isEmpty(printJson)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user