feat(mall): 添加自定义打印功能并优化订单相关接口

Administrator

2025-07-16 46d9a52288d5c36985435e775a8433df4e12000b

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiClothesOrderServiceImpl.java

@@ -210,6 +210,8 @@
        ClothesOrderDraft clothesOrderDraft = clothesOrderDraftMapper.selectById(id);

        if (ObjectUtil.isNotNull(clothesOrderDraft)){
            Long draftId = clothesOrderDraft.getId();

            Long typeId = clothesOrderDraft.getTypeId();
            ClothesType clothesType = clothesTypeMapper.selectById(typeId);
            record.setTypeId(typeId);
@@ -226,6 +228,7 @@
                        record.setSizeId(sizeId);
                        record.setSizeName(clothesSize.getName());
                        record.setSizePrice(clothesSize.getPrice());
                        record.setSizeImage(clothesSize.getImage());
                    }
                }
            }
@@ -240,7 +243,7 @@
            BigDecimal totalPatternPrice = BigDecimal.ZERO;
            List<ClothesPatternRemark> clothesPatternRemarks = clothesPatternRemarkMapper.selectList(
                    Wrappers.lambdaQuery(ClothesPatternRemark.class)
                            .eq(ClothesPatternRemark::getSourceId, record.getId())
                            .eq(ClothesPatternRemark::getSourceId, draftId)
                            .eq(ClothesPatternRemark::getType, SocialPatternLocationTypeEnum.DRAFT.getValue())
            );
            if(CollUtil.isNotEmpty(clothesPatternRemarks)){
@@ -253,6 +256,7 @@
                    vo.setPatternName(clothesPattern.getName());
                    vo.setPatternPrice(clothesPattern.getPrice());
                    vo.setPatternRemark(entity.getRemark());
                    vo.setPatternImage(clothesPattern.getImage());
                    vos.add(vo);

                    totalPatternPrice = totalPatternPrice.add(clothesPattern.getPrice());
@@ -263,7 +267,7 @@
            BigDecimal totalLocationPrice = BigDecimal.ZERO;
            List<ClothesLocationRemark> clothesLocationRemarks = clothesLocationRemarkMapper.selectList(
                    Wrappers.lambdaQuery(ClothesLocationRemark.class)
                            .eq(ClothesLocationRemark::getSourceId, record.getId())
                            .eq(ClothesLocationRemark::getSourceId, draftId)
                            .eq(ClothesLocationRemark::getType, SocialPatternLocationTypeEnum.DRAFT.getValue())
            );
            if(CollUtil.isNotEmpty(clothesLocationRemarks)){
@@ -276,6 +280,7 @@
                    vo.setLocationName(location.getName());
                    vo.setLocationPrice(location.getPrice());
                    vo.setLocationRemark(entity.getRemark());
                    vo.setLocationImage(location.getImage());
                    vos.add(vo);

                    totalLocationPrice = totalLocationPrice.add(location.getPrice());
@@ -293,6 +298,7 @@
                        record.setArtId(artId);
                        record.setArtName(clothesArt.getName());
                        record.setArtPrice(clothesArt.getPrice());
                        record.setArtImage(clothesArt.getImage());
                    }
                }
            }
@@ -307,6 +313,7 @@
                        record.setClothId(clothId);
                        record.setClothName(clothesCloth.getName());
                        record.setClothPrice(clothesCloth.getPrice());
                        record.setClothImage(clothesCloth.getImage());
                    }
                }
            }
@@ -431,7 +438,7 @@
                orderItem.setItemId(cloth.getId());
                orderItem.setName(cloth.getName());
                orderItem.setPrice(cloth.getPrice());
                orderItem.setItemCnt(item.getCnt());
                orderItem.setItemCnt(orderItem.getItemCnt());
                orderItem.setAmount(cloth.getPrice().multiply(new BigDecimal(orderItem.getItemCnt())).setScale(2, RoundingMode.DOWN));
                clothesOrderItemMapper.insert(orderItem);

@@ -445,7 +452,7 @@
                orderItem.setItemId(size.getId());
                orderItem.setName(size.getName());
                orderItem.setPrice(size.getPrice());
                orderItem.setItemCnt(item.getCnt());
                orderItem.setItemCnt(orderItem.getItemCnt());
                orderItem.setAmount(orderItem.getPrice().multiply(new BigDecimal(orderItem.getItemCnt())).setScale(2, RoundingMode.DOWN));
                clothesOrderItemMapper.insert(orderItem);

@@ -459,7 +466,7 @@
                orderItem.setItemId(location.getId());
                orderItem.setName(location.getName());
                orderItem.setPrice(location.getPrice());
                orderItem.setItemCnt(item.getCnt());
                orderItem.setItemCnt(orderItem.getItemCnt());
                orderItem.setAmount(orderItem.getPrice().multiply(new BigDecimal(orderItem.getItemCnt())).setScale(2, RoundingMode.DOWN));
                orderItem.setRemark(item.getPatternRemark());
                clothesOrderItemMapper.insert(orderItem);
@@ -475,7 +482,7 @@
                orderItem.setRemark(item.getPatternRemark());
                orderItem.setName(pattern.getName());
                orderItem.setPrice(pattern.getPrice());
                orderItem.setItemCnt(item.getCnt());
                orderItem.setItemCnt(orderItem.getItemCnt());
                orderItem.setRemark(item.getPatternRemark());
                orderItem.setAmount(orderItem.getPrice().multiply(new BigDecimal(orderItem.getItemCnt())).setScale(2, RoundingMode.DOWN));
                clothesOrderItemMapper.insert(orderItem);
@@ -490,7 +497,7 @@
                orderItem.setItemId(art.getId());
                orderItem.setName(art.getName());
                orderItem.setPrice(art.getPrice());
                orderItem.setItemCnt(item.getCnt());
                orderItem.setItemCnt(orderItem.getItemCnt());
                orderItem.setAmount(orderItem.getPrice().multiply(new BigDecimal(orderItem.getItemCnt())).setScale(2, RoundingMode.DOWN));
                clothesOrderItemMapper.insert(orderItem);

@@ -501,7 +508,7 @@
                orderItem.setItemId(clothesMemberStature.getId());
                orderItem.setName(clothesMemberStature.getName());
                orderItem.setPrice(BigDecimal.ZERO);
                orderItem.setItemCnt(item.getCnt());
                orderItem.setItemCnt(orderItem.getItemCnt());
                orderItem.setAmount(orderItem.getPrice().multiply(new BigDecimal(orderItem.getItemCnt())).setScale(2, RoundingMode.DOWN));
                clothesOrderItemMapper.insert(orderItem);

@@ -747,6 +754,22 @@
        return new FebsResponse().success().data(voPage);
    }

    @Override
    public FebsResponse findMarkCnt() {
        Long memberId = LoginUserUtil.getLoginUser().getId();

        List<Map<String, Integer>> maps = clothesOrderMapper.selectOrderStatusCnt(memberId);
        Map<Integer, Integer> orderCnt = new HashMap<>();
        if (CollUtil.isNotEmpty(maps)) {
            for (Map<String, Integer> map : maps) {
                orderCnt.put(map.get("status"), map.get("cnt"));
            }
        }

        Map<String, Object> result = new HashMap<>();
        result.put("order", orderCnt);
        return new FebsResponse().success().data(result);
    }


    private List<ApiClothesOrderItemInfoVo> buildOrderItemInfo(Long id) {