Administrator
2025-08-04 a34b9a6418a8874dc0851cb4e19d189339dd5133
src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesSocialServiceImpl.java
@@ -197,17 +197,17 @@
                    apiSocialMuseVo.setTypeImg(clothesType.getImage());
                }
                ClothesSize clothesSize = clothesSizeMapper.selectById(clothesSocialMuse.getSizeId());
                if(ObjectUtil.isNotNull(clothesSize)){
                if(ObjectUtil.isNotNull(clothesSize) && clothesType.getSizeState() == 1){
                    apiSocialMuseVo.setSizeName(clothesSize.getName());
                    totalAmount = totalAmount.add(clothesSize.getPrice());
                }
                ClothesCloth clothesCloth = clothesClothMapper.selectById(clothesSocialMuse.getClothId());
                if(ObjectUtil.isNotNull(clothesCloth)){
                if(ObjectUtil.isNotNull(clothesCloth) && clothesType.getClothState() == 1){
                    apiSocialMuseVo.setClothName(clothesCloth.getName());
                    totalAmount = totalAmount.add(clothesCloth.getPrice());
                }
                ClothesArt clothesArt = clothesArtMapper.selectById(clothesSocialMuse.getArtId());
                if(ObjectUtil.isNotNull(clothesArt)){
                if(ObjectUtil.isNotNull(clothesArt) && clothesType.getArtState() == 1){
                    apiSocialMuseVo.setArtName(clothesArt.getName());
                    totalAmount = totalAmount.add(clothesArt.getPrice());
                }
@@ -220,7 +220,7 @@
                                .eq(ClothesPatternRemark::getSourceId, clothesSocialMuse.getId())
                                .eq(ClothesPatternRemark::getType, SocialPatternLocationTypeEnum.MUSE.getValue())
                );
                if(CollUtil.isNotEmpty(patternRemarks)){
                if(CollUtil.isNotEmpty(patternRemarks) && clothesType.getPatternState() == 1){
                    for (ClothesPatternRemark entity : patternRemarks){
                        ApiClothesPatternRemarkVo vo = new ApiClothesPatternRemarkVo();
                        ClothesPattern pattern = clothesPatternMapper.selectById(entity.getPatternId());
@@ -239,7 +239,7 @@
                                .eq(ClothesLocationRemark::getSourceId, clothesSocialMuse.getId())
                                .eq(ClothesLocationRemark::getType, SocialPatternLocationTypeEnum.MUSE.getValue())
                );
                if(CollUtil.isNotEmpty(locationRemarks)){
                if(CollUtil.isNotEmpty(locationRemarks)  && clothesType.getLocationState() == 1){
                    for (ClothesLocationRemark entity : locationRemarks){
                        ApiClothesLocationRemarkVo vo = new ApiClothesLocationRemarkVo();
                        ClothesLocation clothesLocation = clothesLocationMapper.selectById(entity.getLocationId());
@@ -252,12 +252,14 @@
                    apiSocialMuseVo.setLocationRemarkList(locationRemarkList);
                }
                apiSocialMuseVo.setTotalAmount(totalAmount.setScale(2, RoundingMode.DOWN));
                if(StrUtil.isNotBlank(apiSocialMuseVo.getArtName())
                && StrUtil.isNotBlank(apiSocialMuseVo.getSizeName())
                        && StrUtil.isNotBlank(apiSocialMuseVo.getClothName())
                ){
                    apiSocialInfoVo.setMuse(apiSocialMuseVo);
                }
//                if(
//                        ObjectUtil.isNotNull(clothesArt)
//                        && ObjectUtil.isNotNull(clothesSize)
//                        && ObjectUtil.isNotNull(clothesCloth)
//                ){
//                    apiSocialInfoVo.setMuse(apiSocialMuseVo);
//                }
                apiSocialInfoVo.setMuse(apiSocialMuseVo);
//                Integer likeCnt = clothesSocial.getLikeCnt();
@@ -531,6 +533,10 @@
                    vo.setPatternPrice(pattern.getPrice());
                    vo.setPatternId(pattern.getId());
                    vo.setPatternRemark(patternRemark.getRemark());
                    vo.setBoxHeight(pattern.getBoxHeight());
                    vo.setBoxWidth(pattern.getBoxWidth());
                    vo.setLeftPercent(pattern.getLeftPercent());
                    vo.setTopPercent(pattern.getTopPercent());
                    patternRemarkList.add( vo);
                    totalPatternAmount = totalPatternAmount.add(pattern.getPrice());
@@ -555,6 +561,10 @@
                    vo.setLocationImage(clothesLocation.getImage());
                    vo.setLocationPrice(clothesLocation.getPrice());
                    vo.setLocationId(clothesLocation.getId());
                    vo.setBoxHeight(clothesLocation.getBoxHeight());
                    vo.setBoxWidth(clothesLocation.getBoxWidth());
                    vo.setLeftPercent(clothesLocation.getLeftPercent());
                    vo.setTopPercent(clothesLocation.getTopPercent());
                    locationRemarkList.add(vo);
                    totalLocationAmount = totalLocationAmount.add(clothesLocation.getPrice());