From 4269f8e0fff7f0c920a5ae685f305224248b00c3 Mon Sep 17 00:00:00 2001 From: zhuyiyi <649091362@qq.com> Date: Fri, 28 Mar 2025 14:38:59 +0800 Subject: [PATCH] edit --- .../net/Factory/CardPricingStrategy.java | 2 + .../net/Factory/MetalTargetStrategy.java | 2 + .../lingtao/net/Factory/PricingStrategy.java | 2 + .../net/Factory/PricingStrategyFactory.java | 2 + .../lingtao/net/service/ProductService.java | 21 +++++++--- .../net/service/price/ClothingTagService.java | 6 --- .../net/service/price/ProductService.java | 14 ------- .../price/SelfAdhesiveStickerService.java | 4 -- .../price/impl/ClothingTagServiceImpl.java | 27 ------------- .../service/price/impl/ProductContent.java | 32 --------------- .../impl/SelfAdhesiveStickerServiceImpl.java | 20 ---------- src/main/webapp/views/product/coaster.jsp | 12 +++--- src/main/webapp/views/product/coupon.jsp | 18 +++++++++ src/main/webapp/views/product/cupSet.jsp | 30 +++++++++++--- src/main/webapp/views/product/stickers.jsp | 20 ++++++---- src/main/webapp/views/product/tag.jsp | 8 ++++ src/main/webapp/views/product/tagClothes.jsp | 40 ++++++++++++++++++- 17 files changed, 131 insertions(+), 129 deletions(-) create mode 100644 src/main/java/lingtao/net/Factory/CardPricingStrategy.java create mode 100644 src/main/java/lingtao/net/Factory/MetalTargetStrategy.java create mode 100644 src/main/java/lingtao/net/Factory/PricingStrategy.java create mode 100644 src/main/java/lingtao/net/Factory/PricingStrategyFactory.java delete mode 100644 src/main/java/lingtao/net/service/price/ClothingTagService.java delete mode 100644 src/main/java/lingtao/net/service/price/ProductService.java delete mode 100644 src/main/java/lingtao/net/service/price/SelfAdhesiveStickerService.java delete mode 100644 src/main/java/lingtao/net/service/price/impl/ClothingTagServiceImpl.java delete mode 100644 src/main/java/lingtao/net/service/price/impl/ProductContent.java delete mode 100644 src/main/java/lingtao/net/service/price/impl/SelfAdhesiveStickerServiceImpl.java diff --git a/src/main/java/lingtao/net/Factory/CardPricingStrategy.java b/src/main/java/lingtao/net/Factory/CardPricingStrategy.java new file mode 100644 index 0000000..595322d --- /dev/null +++ b/src/main/java/lingtao/net/Factory/CardPricingStrategy.java @@ -0,0 +1,2 @@ +package lingtao.net.Factory;public class CardPricingStrategy { +} diff --git a/src/main/java/lingtao/net/Factory/MetalTargetStrategy.java b/src/main/java/lingtao/net/Factory/MetalTargetStrategy.java new file mode 100644 index 0000000..f0f84c3 --- /dev/null +++ b/src/main/java/lingtao/net/Factory/MetalTargetStrategy.java @@ -0,0 +1,2 @@ +package lingtao.net.Factory;public class MetalTargetStrategy { +} diff --git a/src/main/java/lingtao/net/Factory/PricingStrategy.java b/src/main/java/lingtao/net/Factory/PricingStrategy.java new file mode 100644 index 0000000..c6a2541 --- /dev/null +++ b/src/main/java/lingtao/net/Factory/PricingStrategy.java @@ -0,0 +1,2 @@ +package lingtao.net.Factory;public interface PricingStrategy { +} diff --git a/src/main/java/lingtao/net/Factory/PricingStrategyFactory.java b/src/main/java/lingtao/net/Factory/PricingStrategyFactory.java new file mode 100644 index 0000000..a5d4844 --- /dev/null +++ b/src/main/java/lingtao/net/Factory/PricingStrategyFactory.java @@ -0,0 +1,2 @@ +package lingtao.net.Factory;public class PricingStrategyFactory { +} diff --git a/src/main/java/lingtao/net/service/ProductService.java b/src/main/java/lingtao/net/service/ProductService.java index 49afe1d..fd923d5 100644 --- a/src/main/java/lingtao/net/service/ProductService.java +++ b/src/main/java/lingtao/net/service/ProductService.java @@ -235,8 +235,8 @@ public class ProductService { // 款数 Integer number = dto.getNumber(); String size = dto.getSize(); - Double width = null; - Double length = null; + Double width = dto.getWidth(); + Double length = dto.getLength(); Double height = null; Double area = null; String oldKind = ""; @@ -734,6 +734,9 @@ public class ProductService { if (craft_list.contains("穿尼龙绳")) { carft_price += Math.max(0.2 * item_count, 40); } + if (craft_list.contains("配弹力绳")) { + carft_price += Math.max(0.1 * item_count, 10); + } double tang_price = 0; if (craft_list.contains("单面烫金") || craft_list.contains("双面烫金")) { tang_price = new PriceUtils().TablePrice(area, tang_prices[count_index], tang_areas); @@ -886,10 +889,13 @@ public class ProductService { int min = getNum(length, width); priceList = getHekaPrice(min, product1, priceList, count); getCraft(product1, priceList, length * 10, width * 10, min); - if ("凹凸".equals(dto.getAotu())) { - for (Product product : priceList) { + for (Product product : priceList) { + if ("凹凸".equals(dto.getAotu())) { product.setPrice(Math.floor(product.getPrice() + (product.getPrice() * 0.09 > 153 ? product.getPrice() * 0.09 : 153))); } + if (craft.contains("弹力绳")) { + product.setPrice(Math.floor(product.getPrice() + Math.max(10, product.getCount() * 0.1))); + } } // 根据款数重新算价格/计算重量 for (Product product : priceList) { @@ -962,10 +968,13 @@ public class ProductService { } } // +棉绳钱 1分5一条 - if (!StringUtils.isEmpty(dto.getCraftSheng())) { - for (Product product : priceList) { + for (Product product : priceList) { + if (!StringUtils.isEmpty(dto.getCraftSheng()) && dto.getCraftSheng().contains("棉绳")) { product.setPrice(product.getPrice() + product.getCount() * 0.015); } + if (!StringUtils.isEmpty(dto.getCraftSheng()) && dto.getCraftSheng().contains("弹力绳")) { + product.setPrice(product.getPrice() + Math.max(product.getCount() * 0.1, 10)); + } } for (Product product : priceList) { product.setWeight(df.format(length * width * product.getCount() / 10000 * 0.6)); diff --git a/src/main/java/lingtao/net/service/price/ClothingTagService.java b/src/main/java/lingtao/net/service/price/ClothingTagService.java deleted file mode 100644 index 5edf5d5..0000000 --- a/src/main/java/lingtao/net/service/price/ClothingTagService.java +++ /dev/null @@ -1,6 +0,0 @@ -package lingtao.net.service.price; - -public interface ClothingTagService { - - void inster(); -} diff --git a/src/main/java/lingtao/net/service/price/ProductService.java b/src/main/java/lingtao/net/service/price/ProductService.java deleted file mode 100644 index f2a66cd..0000000 --- a/src/main/java/lingtao/net/service/price/ProductService.java +++ /dev/null @@ -1,14 +0,0 @@ -package lingtao.net.service.price; - -import lingtao.net.enums.ProductEnum; -import org.apache.poi.ss.formula.functions.T; - -public interface ProductService { - - /** - * 计算价格 - */ - void getProduct(T t); - - ProductEnum getEnum(); -} diff --git a/src/main/java/lingtao/net/service/price/SelfAdhesiveStickerService.java b/src/main/java/lingtao/net/service/price/SelfAdhesiveStickerService.java deleted file mode 100644 index 33792c8..0000000 --- a/src/main/java/lingtao/net/service/price/SelfAdhesiveStickerService.java +++ /dev/null @@ -1,4 +0,0 @@ -package lingtao.net.service.price; - -public interface SelfAdhesiveStickerService { -} diff --git a/src/main/java/lingtao/net/service/price/impl/ClothingTagServiceImpl.java b/src/main/java/lingtao/net/service/price/impl/ClothingTagServiceImpl.java deleted file mode 100644 index 2ae0036..0000000 --- a/src/main/java/lingtao/net/service/price/impl/ClothingTagServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package lingtao.net.service.price.impl; - -import lingtao.net.entity.ClothingTag; -import lingtao.net.enums.ProductEnum; -import lingtao.net.service.price.ClothingTagService; -import lingtao.net.service.price.ProductService; -import org.springframework.stereotype.Service; - - -@Service -public class ClothingTagServiceImpl implements ProductService, ClothingTagService { - - @Override - public void getProduct(ClothingTag clothingTag) { - System.out.println("===========clothingTag"); - } - - @Override - public ProductEnum getEnum() { - return ProductEnum.clothing_Tag; - } - - @Override - public void inster() { - - } -} diff --git a/src/main/java/lingtao/net/service/price/impl/ProductContent.java b/src/main/java/lingtao/net/service/price/impl/ProductContent.java deleted file mode 100644 index 57bfab9..0000000 --- a/src/main/java/lingtao/net/service/price/impl/ProductContent.java +++ /dev/null @@ -1,32 +0,0 @@ -package lingtao.net.service.price.impl; - -import lingtao.net.enums.ProductEnum; -import lingtao.net.service.price.ProductService; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.Map; - -@Service -public class ProductContent implements ApplicationContextAware { - - @Autowired(required = false) - Map productServiceMap; - - public ProductService getService(ProductEnum productEnum) { - return productServiceMap.get(productEnum); - } - - @Override - public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { - Map map = applicationContext.getBeansOfType(ProductService.class); - productServiceMap = new HashMap<>(); - map.forEach((key, value) -> { - productServiceMap.put(value.getEnum(), value); - }); - } -} diff --git a/src/main/java/lingtao/net/service/price/impl/SelfAdhesiveStickerServiceImpl.java b/src/main/java/lingtao/net/service/price/impl/SelfAdhesiveStickerServiceImpl.java deleted file mode 100644 index 13b0cc5..0000000 --- a/src/main/java/lingtao/net/service/price/impl/SelfAdhesiveStickerServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package lingtao.net.service.price.impl; - -import lingtao.net.entity.SelfAdhesiveSticker; -import lingtao.net.enums.ProductEnum; -import lingtao.net.service.price.ProductService; -import lingtao.net.service.price.SelfAdhesiveStickerService; -import org.springframework.stereotype.Service; - -@Service -public class SelfAdhesiveStickerServiceImpl implements ProductService, SelfAdhesiveStickerService { - @Override - public void getProduct(SelfAdhesiveSticker selfAdhesiveSticker) { - System.out.println("===========SelfAdhesiveSticker"); - } - - @Override - public ProductEnum getEnum() { - return ProductEnum.self_adhesive_sticker; - } -} diff --git a/src/main/webapp/views/product/coaster.jsp b/src/main/webapp/views/product/coaster.jsp index 06be819..78ca0cf 100644 --- a/src/main/webapp/views/product/coaster.jsp +++ b/src/main/webapp/views/product/coaster.jsp @@ -121,13 +121,13 @@ diff --git a/src/main/webapp/views/product/coupon.jsp b/src/main/webapp/views/product/coupon.jsp index 4c4d4aa..a875816 100644 --- a/src/main/webapp/views/product/coupon.jsp +++ b/src/main/webapp/views/product/coupon.jsp @@ -669,6 +669,14 @@ + + @@ -1009,6 +1017,16 @@ $("#z4_craft .shengz").prop("disabled", true); } } + if (data.value == "配弹力绳" ) { + if ($(data.elem).is(":checked")) { + $("#z4_craft .tscolor").show(); + $("#z4_craft .tscolor").prop("disabled", false); + } else { + $("#z4_craft .tscolor").hide(); + $("#z4_craft .tscolor").prop("disabled", true); + } + } + }); form.on("radio(kindValue2)", function (data) { if (data.value == 10) { diff --git a/src/main/webapp/views/product/cupSet.jsp b/src/main/webapp/views/product/cupSet.jsp index 2d9b3da..4218652 100644 --- a/src/main/webapp/views/product/cupSet.jsp +++ b/src/main/webapp/views/product/cupSet.jsp @@ -97,11 +97,21 @@
+

+ 宽幅 +

+
+ +

尺寸（cm）输入格式: 长 * 宽

- +

数量（个） @@ -119,9 +129,9 @@ 工艺

- - - <%-- --%> + + +
@@ -295,6 +305,16 @@ form.render(); } }); */ + form.on("checkbox(craft_btn)", function (data) { + if ($("input[name='craft']:checked").length < 2) { + layer.msg("300克铜版纸模切覆膜工艺必选", {offset: ['300px', '300px']}, function () { + }); + $("input[name='craft']").prop('checked', true); + form.render('checkbox'); + return false; + } + }) + form.on('radio(kindValue)', function (data) { if (data.value == 0 || data.value == 2) { $("#normal").show() @@ -458,7 +478,7 @@ if ($("input[name='craftTang']:checked").val() != null) { arr.push($("input[name='craftTang']:checked").val()); } - var span_result = '杯套 - ' + kind + '-' + arr + ' - ' + $("#ui_size").val() + 'cm\n'; + var span_result = '杯套 - ' + kind + '-' + arr + ' - ' + $("select[name='width'] option:selected").val() + '*' + $("#ui_size").val() + 'cm\n'; } else { var span_result = '杯套 - ' + kind + ' - ' + [size] + '\n'; //var span_result ='杯套 - ' + kind +'\n'; diff --git a/src/main/webapp/views/product/stickers.jsp b/src/main/webapp/views/product/stickers.jsp index af483fc..809f225 100644 --- a/src/main/webapp/views/product/stickers.jsp +++ b/src/main/webapp/views/product/stickers.jsp @@ -28,7 +28,7 @@ <%-- --%> -<%-- --%> + <%-- --%> <%-- --%>
@@ -294,6 +294,8 @@ checked="checked"> + |     @@ -711,7 +713,7 @@ } else if (TJValue == "彩色印刷+烫金/银") { html += "广东：（5-6天发货） 中通 圆通 顺丰" } else { - html += "广东：覆亮膜 （15点前上传系统的当天发货，15点后上传系统的隔天发货）;
广东：覆哑膜 (2-3天发货);" + html += "广东：覆亮膜 （15点前上传系统的当天发货，15点后上传系统的隔天发货）;
广东：覆哑膜 (2-3天发货);
广东：不覆膜 (48小时发货);" } } else if (kindvalue == "2") { if (TJValue == "纯烫金") { @@ -859,12 +861,12 @@ $(".fm").find(":input").attr("disabled", true); } // PVC、透明没有覆哑膜 - /* if(data.value == 1 || data.value == 2){ - $(".yamo").find(":input").attr("disabled", true); + if (data.value == 1 && $("input[name='stickerKind']:checked").val() == "常用种类") { + $(".nofm").find(":input").attr("disabled", false); + } else { + $(".nofm").find(":input").attr("disabled", true); $('input[class = liangmo]').prop('checked', true); - }else{ - $(".yamo").find(":input").attr("disabled", false); - } */ + } // 哑金哑银 if (data.value == 5 || data.value == 6) { // 常规种类凹凸不禁用 @@ -1053,6 +1055,8 @@ // $(this).prop("disabled", false); // } // }) + + } else if (data.value == 1) { $(".tj").hide(); $(".tj").find(":input").attr("disabled", true); @@ -1062,6 +1066,8 @@ $(".fm").hide(); $(".fm").find(":input").attr("disabled", true); } + $(".nofm").find(":input").attr("disabled", true); + $('input[class = liangmo]').prop('checked', true); if (data.value == 5 || data.value == 6) { $(".at").show(); $('.at').removeAttr('disabled'); diff --git a/src/main/webapp/views/product/tag.jsp b/src/main/webapp/views/product/tag.jsp index becd4e8..49bedb3 100644 --- a/src/main/webapp/views/product/tag.jsp +++ b/src/main/webapp/views/product/tag.jsp @@ -46,6 +46,14 @@ class="layui-input" value="吊牌"> --> + +