From 9c9f127df6e36f1728aa24db4ff9f99173728464 Mon Sep 17 00:00:00 2001 From: zhuyiyi <649091362@qq.com> Date: Wed, 20 May 2026 11:01:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B7=98=E5=AE=9D=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lingtao/net/service/ProductService.java | 276 +++++++++++------- 1 file changed, 163 insertions(+), 113 deletions(-) diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 730c218..fe6e53d 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -307,10 +307,10 @@ public class ProductService { kind = "3"; } else if ("封口贴铜版纸不干胶".equals(kind)) { priceList = new PriceUtils().getFktPrice(number, priceList); - return priceList; + return chucklePrice(role, priceList); } else if ("双面印刷不干胶".equals(dto.getStickerKind())) { priceList = StickersDoublePrice.getPrice(length, width, count, number); - return priceList; + return chucklePrice(role, priceList); } else if ("插旗".equals(dto.getStickerKind())) { if ("铜版纸不干胶".equals(kind)) { dto.setKindValue("0"); @@ -395,7 +395,7 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); } // return priceList; @@ -406,7 +406,7 @@ public class ProductService { product.setPrice(Math.ceil(product.getPrice() * number)); } } - return priceList; + return chucklePrice(role, priceList); } else if ("13".equals(kind)) { oldKind = "13"; dto.setKindValue("2"); @@ -426,7 +426,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.25)); } - return priceList; + return chucklePrice(role, priceList); } else if ("15".equals(kind) || "16".equals(kind)) { List craft_list = dto.getCraft() != null ? Arrays.asList(dto.getCraft()) : new ArrayList<>(); @@ -459,7 +459,7 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); } // 查询出来的价格集合 List stickersList = new ArrayList(); @@ -485,7 +485,7 @@ public class ProductService { } stickersList = normalSticker(dto, kind, number, area, width, length, count, oldKind, stickersList); if (stickersList == null) { - return stickersList; + return chucklePrice(role, stickersList); } } // 把查出来的集合添加到priceList中 @@ -635,12 +635,12 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); case "1": dto.setWidth(width); dto.setLength(length); priceList = productMapper.getThanPrice(dto); - return priceList; + return chucklePrice(role, priceList); // 卷装标签 case "2": // 单个产品的面积 @@ -651,7 +651,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); product.setWeight(df.format(number * length / 100 * width / 100 * product.getCount() * 0.25)); } - return priceList; + return chucklePrice(role, priceList); // 插卡 case "3": // 菱形单面直角插牌 @@ -717,7 +717,7 @@ public class ProductService { priceList.add(product); } - return priceList; + return chucklePrice(role, priceList); } // 根据款数重新算价格/计算重量 for (Product product : priceList) { @@ -730,7 +730,7 @@ public class ProductService { } product.setWeight(df.format(number * length * width * product.getCount() * 0.00003)); } - return priceList; + return chucklePrice(role, priceList); // 优惠券 case "4": if ("11".equals(dto.getKind())) {// 圣诞卡 @@ -921,7 +921,7 @@ public class ProductService { priceList.add(product); } - return priceList; + return chucklePrice(role, priceList); } int min = getNum(length, width); String[] kind_list = {"3", "4", "5", "7"}; @@ -1173,7 +1173,7 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); // 吊牌300/600/800克 case "吊牌": // 自定义尺寸 @@ -1226,7 +1226,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 服装吊牌 case "服装吊牌": // 自定义尺寸 @@ -1441,7 +1441,7 @@ public class ProductService { for (Product product : priceList) { product.setWeight(String.valueOf(weight * area * product.getCount() * number)); } - return priceList; + return chucklePrice(role, priceList); // 特价名片 case "特价名片": // 选了【自定义尺寸】 @@ -1479,7 +1479,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 名片-特种纸名片 case "特种纸名片": double addPrice = 5; @@ -1689,7 +1689,7 @@ public class ProductService { product.setPrice(Math.ceil(product.getPrice() + 0.2 * product.getCount() * number)); } } - return priceList; + return chucklePrice(role, priceList); } else if ("草香".equals(kind) || "芳怡".equals(kind)) { int[] count_list = {200, 500, 1000, 2000, 5000, 10000}; // 出血（一边2毫米） @@ -1881,7 +1881,7 @@ public class ProductService { for (Product product : priceList) { product.setWeight(df.format(tzWei / 1000.0 * length * width * product.getCount() / 10000.0 * number)); } - return priceList; + return chucklePrice(role, priceList); // 合版封套 case "6": double lengthSize = dto.getLengthSize(); @@ -1930,7 +1930,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 房卡套 case "7": lengthSize = dto.getLengthSize(); @@ -1975,7 +1975,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 档案袋 case "8": priceList = productMapper.getThanPrice(dto); @@ -1991,10 +1991,11 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 彩色信封 case "9": - return getXinFengPrice(dto, width, length, kind, kind2); + priceList = getXinFengPrice(dto, width, length, kind, kind2); + return chucklePrice(role, priceList); // 杯套 case "10": if ("5".equals(kind)) { @@ -2016,7 +2017,7 @@ public class ProductService { product.setWeight(df.format(number * 0.3 * product.getCount() / 10000 * length * width)); product.setPrice(Math.ceil(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); } else if ("6".equals(kind)) {// 盲盒杯套价格 dto.setPrice(1800.0); priceList.add(dto); @@ -2024,7 +2025,7 @@ public class ProductService { product.setWeight(df.format(number * 0.3 * product.getCount() * 0.29 * 0.07)); product.setPrice(Math.ceil(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); } else if ("2".equals(kind)) {// 异形杯套价格计算 priceList = new PriceUtils().getCupSetPrice(count); } else { @@ -2059,7 +2060,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() + number * 50)); } } - return priceList; + return chucklePrice(role, priceList); // 牛皮纸手提袋 case "11": List hanbagList = new ArrayList(); @@ -2176,7 +2177,7 @@ public class ProductService { product.setWeight(df.format((width + height) * length * 2 * 0.25 * 1.5 * product.getCount() / 10000)); } - return priceList; + return chucklePrice(role, priceList); } double sizeLength = 0.0; double sizeWidth = 0.0; @@ -2189,8 +2190,8 @@ public class ProductService { double price = 0.0; int ikai = 0; String kai = ""; - String kaiDa = new PriceUtils().getDa(length, height); - String kaiZheng = new PriceUtils().getZheng(length, height); + String kaiDa = PriceUtils.getDa(length, height); + String kaiZheng = PriceUtils.getZheng(length, height); int intDa = Integer.parseInt(kaiDa); int intZheng = Integer.parseInt(kaiZheng); int maxDa = intDa > intZheng ? intDa : intZheng; @@ -2267,7 +2268,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 250克白牛皮纸 case "12": priceList = productMapper.getThanPrice(dto); @@ -2308,7 +2309,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); product.setWeight(df.format(length / 1000 * height / 1000 * product.getCount() * 0.25 * 1.25)); } - return priceList; + return chucklePrice(role, priceList); // 吊旗 case "13": length = length * 10; @@ -2361,7 +2362,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 宣传单 case "14": length = length * 10; @@ -2472,7 +2473,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); product.setWeight(df.format(number * length / 1000 * width / 1000 * product.getCount() * weight)); } - return priceList; + return chucklePrice(role, priceList); // 腰封200克/157克 case "15": // 腰封少数量走的是吊旗少数量的价格 @@ -2540,7 +2541,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); case "金属标": craft_list = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft()); @@ -2638,7 +2639,7 @@ public class ProductService { product.setPrice(product.getPrice() + 40 * Math.max(dto.getPo_number(), 1)); } } - return priceList; + return chucklePrice(role, priceList); } if (length <= 2) { length = 2.0; @@ -2717,7 +2718,7 @@ public class ProductService { * product.setMsg("大张出货（2-3天发货）"); priceList.add(product); return priceList; } */ } - return priceList; + return chucklePrice(role, priceList); case "卡片少数量": String crafts[] = dto.getCraft(); String craftShua = dto.getCraftShua(); @@ -3135,7 +3136,7 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); // 便签本/联单 case "16": length = length * 10; @@ -3335,7 +3336,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 海报（款数*个数=个数） case "17": // 贡缎布 @@ -3350,7 +3351,7 @@ public class ProductService { for (Product product : priceList) { product.setWeight(df.format(0.165 * length * width * product.getCount() / 10000 * number)); } - return priceList; + return chucklePrice(role, priceList); } else if ("6".equals(kind)) {// 条幅craftTiao priceList = PriceUtils.bannerPrice(kind2, length, width, count, number, role); @@ -3388,7 +3389,7 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); } else if ("5".equals(kind)) {// 刻字 Product pro = new Product(); pro.setCount(count); @@ -3403,7 +3404,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.ceil(product.getPrice() * 1.15)); } - return priceList; + return chucklePrice(role, priceList); } else if ("11".equals(kind)) { } else { @@ -3602,7 +3603,7 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); // 扇子 case "18": if (dto.getKindValue().equals("5")) { @@ -3688,7 +3689,7 @@ public class ProductService { product.setWeight(df.format(Double.valueOf(product.getWeight()) * number)); } } - return priceList; + return chucklePrice(role, priceList); // 画册 case "19": // 内页P数加上封面的4P @@ -3738,7 +3739,7 @@ public class ProductService { } } - return priceList; + return chucklePrice(role, priceList); // 包装盒 case "20": // 厘米转成毫米 @@ -3797,7 +3798,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 透明PVC名片 case "21": if (count <= 10000) { @@ -3818,7 +3819,7 @@ public class ProductService { product.setWeight(df.format(0.38 * 0.0855 * 1.7 * 0.054 * product.getCount() * number)); product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 桌贴 case "22": /* @@ -3838,7 +3839,7 @@ public class ProductService { } product.setWeight(df.format(wei * length * width * product.getCount() / 10000 * 1.7 * number)); } - return priceList; + return chucklePrice(role, priceList); // 0.38PVC亮光异型卡片 case "PVC异型卡片": // 印刷价格 @@ -3888,10 +3889,11 @@ public class ProductService { /* * if (priceList.get(0).getPrice() > priceList2.get(0).getPrice()) { // Double minPrice = Math.min(priceList.get(0).getPrice(), // priceList2.get(0).getPrice()); priceList = new ArrayList(); Product product = new Product(); product.setCount(count); product.setPrice(priceList2.get(0).getPrice()); priceList.add(product); } */ - return priceList; + return chucklePrice(role, priceList); // 滴塑 case "23": - return priceList = PriceUtils.getDisuPrice(priceList, width, length, count, number, dto); + priceList = PriceUtils.getDisuPrice(priceList, width, length, count, number, dto); + return chucklePrice(role, priceList); // 透明PVC名片---会员卡 case "24": if (count <= 10000) { @@ -3913,7 +3915,7 @@ public class ProductService { product.setWeight(df.format(0.76 * 1.3 * 0.0855 * 0.054 * product.getCount() * number)); product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 卡片-门挂牌 case "25": priceList = productMapper.getThanPrice(dto); @@ -3942,7 +3944,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 毕业证书 case "26": priceList = new PriceUtils().getDiploma(count); @@ -3950,10 +3952,11 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 暖心贴 case "27": - return getWarmStickerPrice(dto, width, length); + priceList = getWarmStickerPrice(dto, width, length); + return chucklePrice(role, priceList); // 彩色信纸 case "彩色信纸": length = length * 10; @@ -3990,7 +3993,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); // 复印纸 case "复印纸": priceList = new PriceUtils().getCopyPaper(kind, kind2, kind3, count, size); @@ -3998,10 +4001,10 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); case "婚礼卡": priceList = new PriceUtils().getWeddingCardPrice(length, width, count, number, dto.getCraftMo(), dto.getCraftShua()); - return priceList; + return chucklePrice(role, priceList); case "刮刮卡": // 选了【自定义尺寸】 if (dto.isSwitchSize()) { @@ -4064,7 +4067,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); case "66": String craftTang = dto.getCraftTang().replace("双面烫银", "双面烫金"); if (!kind.equals("500克黑卡")) { @@ -4093,7 +4096,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); product.setWeight(df.format(0.09 * 0.054 * product.getCount() * number)); } - return priceList; + return chucklePrice(role, priceList); case "餐垫纸": priceList = new PriceUtils().getPlaceMatPrice(kind, length, width, count); craft_list = dto.getCraft() != null ? Arrays.asList(dto.getCraft()) : new ArrayList<>(); @@ -4111,7 +4114,7 @@ public class ProductService { product.setPrice(Math.ceil(product.getPrice() * 1.9)); } } - return priceList; + return chucklePrice(role, priceList); case "节目单": priceList = productMapper.getThanPrice(dto); if (StringUtils.isEmpty(dto.getCraft())) { @@ -4124,7 +4127,7 @@ public class ProductService { for (Product product : priceList) { product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); case "硫酸纸吊牌": priceList = new PriceUtils().getAcidTagsPrice(length, width, dto.getSize1(), count); // 根据款数重新算价格 @@ -4142,23 +4145,25 @@ public class ProductService { product.setWeight(df.format(product.getCount() * number * (0.135 * area + area1 * 0.3))); product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); case "杯垫": - return getBeiDianPrice(dto, width, length, role, kind2, kind); + priceList = getBeiDianPrice(dto, width, length, role, kind2, kind); + return chucklePrice(role, priceList); case "锦旗": // 单价*产品数量*款数 priceList = new PriceUtils().getJQPrice(kind3, number, width, length, count, priceList); - return priceList; + return chucklePrice(role, priceList); case "号码布": // 单价*产品数量*款数 priceList = new PriceUtils().getHmbPrice(kind3, number, width, length, count, priceList); - return priceList; + return chucklePrice(role, priceList); case "彩旗": // 单价*产品数量*款数 priceList = new PriceUtils().getCQPrice(number, width, length, count, priceList); - return priceList; + return chucklePrice(role, priceList); case "硫酸纸": - return getLiuSuanzhiPrice(dto, width, length, role, proType); + priceList = getLiuSuanzhiPrice(dto, width, length, role, proType); + return chucklePrice(role, priceList); case "亚克力": priceList = new PriceUtils().getYklPrice(dto, number, width, length, count, priceList); for (Product product : priceList) { @@ -4172,7 +4177,7 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); } } - return priceList; + return chucklePrice(role, priceList); case "帆布": priceList = new PriceUtils().getFbPrice(dto, number, width, length, count, priceList); List carftList = dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft()); @@ -4184,7 +4189,7 @@ public class ProductService { product.setWeight(df.format(0.28 * width * length * product.getCount() / 10000 * number)); } } - return priceList; + return chucklePrice(role, priceList); case "29"://慕斯垫 priceList = productMapper.getMsdPrice(dto); @@ -4214,7 +4219,7 @@ public class ProductService { product.setWeight(df.format(0.8 * area * product.getCount() / 10000 * number)); } - return priceList; + return chucklePrice(role, priceList); case "串旗": priceList = new PriceUtils().getCqPrice(width, length, count, number, priceList); if (dto.getCraft() != null) { @@ -4230,12 +4235,12 @@ public class ProductService { } } } - return priceList; + return chucklePrice(role, priceList); case "桌布": width = width / 100; length = length / 100; priceList = new PriceUtils().getTableClothPrice(length, width, count, number, priceList); - return priceList; + return chucklePrice(role, priceList); case "仿古旗": area = length * width * count / 10000; priceList = new FgqPrice().getPrice(count, area, priceList, dto.getCraft(), dto.getKindValue(), number); @@ -4247,23 +4252,24 @@ public class ProductService { } product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); case "手拉旗": - return getShouLaQiPrice(dto, width, length); + priceList = getShouLaQiPrice(dto, width, length); + return chucklePrice(role, priceList); case "筷子套": priceList = new KztPrice().getPrice(count, length, priceList); for (Product product : priceList) { product.setWeight(df.format(length * 3 * number * 0.157)); product.setPrice(Math.floor(product.getPrice() * number)); } - return priceList; + return chucklePrice(role, priceList); case "一次性纸杯": priceList = new PaperCupPrice().getPrice(count, priceList); for (Product product : priceList) { product.setPrice(Math.ceil(product.getPrice() * number * 1.2)); product.setWeight(df.format(6 * product.getCount() / 1000 * number)); } - return priceList; + return chucklePrice(role, priceList); case "PVC证件": // 价格按照大纸裁 priceList = new ZsPrice().getPrice(count, length, width, priceList, number, dto.getCraftSheng()); @@ -4277,9 +4283,10 @@ public class ProductService { width = width / 10; product.setWeight(df.format(wei * length * width * product.getCount() / 10000 * number * 1.3)); } - return priceList; + return chucklePrice(role, priceList); case "数码PVC": - return getsmPVCPrice(dto, width, length, role); + priceList = getsmPVCPrice(dto, width, length, role); + return chucklePrice(role, priceList); case "班旗": priceList = new BqPrice().getPrice(count, length, priceList, number, dto.getCraftShua(), dto.getCraft()); List craLists = !StringUtils.isEmpty(dto.getCraft()) ? Arrays.asList(dto.getCraft()) : new ArrayList<>(); @@ -4297,9 +4304,10 @@ public class ProductService { product.setWeight(df.format(0.075 * length * width * product.getCount() / 10000 * number + product.getCount() * wei * number )); } - return priceList; + return chucklePrice(role, priceList); case "卡贴": - return getkaTiePrice(dto, width, length); + priceList = getkaTiePrice(dto, width, length); + return chucklePrice(role, priceList); case "会员卡卡套": priceList = new FerruleUtil().getPrice(length, count, priceList); if (number > 1) { @@ -4307,71 +4315,103 @@ public class ProductService { product.setPrice(Math.floor(product.getPrice() * number)); } } - return priceList; + return chucklePrice(role, priceList); case "手提杯托": - return getTuoBeiPrice(dto, width, length); + priceList = getTuoBeiPrice(dto, width, length); + return chucklePrice(role, priceList); case "天幕": - return getTianMuPrice(dto, width, length); + priceList = getTianMuPrice(dto, width, length); + return chucklePrice(role, priceList); case "挂布": - return getGuaBuPrice(dto, width, length); + priceList = getGuaBuPrice(dto, width, length); + return chucklePrice(role, priceList); case "定制衫": - return getClotherPrice(dto, width, length); + priceList = getClotherPrice(dto, width, length); + return chucklePrice(role, priceList); case "手绘": - return getShouhuiPrice(dto, width, length); + priceList = getShouhuiPrice(dto, width, length); + return chucklePrice(role, priceList); case "奖牌": - return getMedalPrice(dto, width, length); + priceList = getMedalPrice(dto, width, length); + return chucklePrice(role, priceList); case "防伪标": - return getantiLabelPrice(dto, width, length); + priceList = getantiLabelPrice(dto, width, length); + return chucklePrice(role, priceList); case "透卡": - return getPETPrice(dto, width, length); + priceList = getPETPrice(dto, width, length); + return chucklePrice(role, priceList); case "澜达海报": - return getDalanPrice(dto, width, length); + priceList = getDalanPrice(dto, width, length); + return chucklePrice(role, priceList); case "水标": - return getShuibiaoPrice(dto, length, width); + priceList = getShuibiaoPrice(dto, length, width); + return chucklePrice(role, priceList); case "镭射吊牌": - return getLeiseDiaoPrice(dto, length, width); + priceList = getLeiseDiaoPrice(dto, length, width); + return chucklePrice(role, priceList); case "刻字车贴": - return getCheTiePrice(dto, length, width); + priceList = getCheTiePrice(dto, length, width); + return chucklePrice(role, priceList); case "胶带": - return getJiadaoPrice(dto, length, width); + priceList = getJiadaoPrice(dto, length, width); + return chucklePrice(role, priceList); case "特光不干胶": - return getLightPrice(dto, length, width); + priceList = getLightPrice(dto, length, width); + return chucklePrice(role, priceList); case "淋膜纸": - return getLingmoPrice(dto, width, length); + priceList = getLingmoPrice(dto, width, length); + return chucklePrice(role, priceList); case "香薰卡": - return getaromatherapyPrice(dto, width, length); + priceList = getaromatherapyPrice(dto, width, length); + return chucklePrice(role, priceList); case "金属微章": - return getbadgePrice(dto, width, length); + priceList = getbadgePrice(dto, width, length); + return chucklePrice(role, priceList); case "冰箱贴": - return getfridgePrice(dto, width, length, role); + priceList = getfridgePrice(dto, width, length, role); + return chucklePrice(role, priceList); case "帆布袋": - return getCanvasBagPrice(dto, width, length); + priceList = getCanvasBagPrice(dto, width, length); + return chucklePrice(role, priceList); case "外卖盒": - return getTakeoutBoxPrice(dto, width, length); + priceList = getTakeoutBoxPrice(dto, width, length); + return chucklePrice(role, priceList); case "方巾纸": - return getHandkerPrice(dto, width, length); + priceList = getHandkerPrice(dto, width, length); + return chucklePrice(role, priceList); case "鼠标垫": - return getMousePadPrice(dto, width, length); + priceList = getMousePadPrice(dto, width, length); + return chucklePrice(role, priceList); case "手环": - return getWristBandPrice(dto, width, length); + priceList = getWristBandPrice(dto, width, length); + return chucklePrice(role, priceList); case "手提塑料袋": - return getPlasticBagPrice(dto, width, length); + priceList = getPlasticBagPrice(dto, width, length); + return chucklePrice(role, priceList); case "纸碗": - return getPaperBowlPrice(dto, width, length); + priceList = getPaperBowlPrice(dto, width, length); + return chucklePrice(role, priceList); case "挂画": - return getWallPaintingPrice(dto, width, length); + priceList = getWallPaintingPrice(dto, width, length); + return chucklePrice(role, priceList); case "电线胶": - return getWireTapePrice(dto, width, length); + priceList = getWireTapePrice(dto, width, length); + return chucklePrice(role, priceList); case "包装纸": - return getWrappingPaper(dto, width, length); + priceList = getWrappingPaper(dto, width, length); + return chucklePrice(role, priceList); case "撕撕乐": - return getTearingJoyPrice(dto, width, length); + priceList = getTearingJoyPrice(dto, width, length); + return chucklePrice(role, priceList); case "哑粉纸": - return getYaFenPrice(dto, width, length); + priceList = getYaFenPrice(dto, width, length); + return chucklePrice(role, priceList); case "UV打印亚克力": - return getUVDayinYKLPrice(dto, width, length); + priceList = getUVDayinYKLPrice(dto, width, length); + return chucklePrice(role, priceList); case "躺椅": - return getDeckCharitPrice(dto, width, length); + priceList = getDeckCharitPrice(dto, width, length); + return chucklePrice(role, priceList); default: break; } @@ -5843,7 +5883,7 @@ public class ProductService { {60, 70, 90, 100, 105, 110, 150, 200, 260, 430, 550, 690, 2020, 3080, 5950}, {83, 93, 113, 120, 124, 128, 200, 300, 371, 595, 779, 1041, 3108, 4866, 9669}, {83, 93, 113, 120, 124, 128, 200, 300, 371, 595, 779, 1041, 3108, 4866, 9669}, - {153, 163, 200, 210, 220, 230, 250, 350, 450, 650, 850, 1150, 3250, 4950, 9990}, + {199, 212, 260, 273, 286, 299, 325, 455, 585, 845, 1105, 1495, 4225, 6435, 12987}, }; int j = 0; if ("1".equals(dto.getKind())) { @@ -8357,6 +8397,16 @@ public class ProductService { } } + public List chucklePrice(String role, List list) { + //淘系的价格全部按照目前的价格乘以1.15 + if (role.indexOf("1045") == -1 && role.indexOf("1061") == -1) { + for (Product product : list) { + product.setPrice(Math.ceil(product.getPrice() * 1.15)); + } + } + return list; + } + // 价格表上传 public Msg ajaxUploadExcel(MultipartFile file) throws Exception { if (!file.isEmpty()) {