Pārlūkot izejas kodu

修改uv工艺价格

zhuyiyi 3 mēneši atpakaļ
vecāks
revīzija
f0024fd1b7

+ 3 - 0
src/main/java/lingtao/net/service/ProductService.java

@@ -2535,6 +2535,9 @@ public class ProductService {
                     // 1006 1003 1005 1037 1058 1002 1033 1045 卓盛 航和 米笛儿 竹范 领淘文具 榆家 涛莱 拼多多uv单独报价
                     List<String> crafts = new ArrayList<>(dto.getCraft() == null ? new ArrayList<>() : Arrays.asList(dto.getCraft()));
                     crafts.remove("刮板");
+                    if (crafts.size() > 0 && "烫金".equals(crafts.get(0))) {
+                        crafts.remove(0);
+                    }
                     String[] newCrafts = crafts.size() == 0 ? null : crafts.stream().toArray(String[]::new);
                     priceList = new PriceUtils().UVStickerSmallPriceV2(length, width, count, number, dto.getCraftMo(), newCrafts, role.indexOf("1045") > -1);
                     if (priceList.get(0).getCount() != count) {

+ 5 - 2
src/main/java/lingtao/net/util/PriceUtils.java

@@ -1568,7 +1568,7 @@ public class PriceUtils {
         }
 
         if (!StringUtils.isEmpty(zhuan)) {
-            if ("烫金".equals(zhuan[0]) || "烫银".equals(zhuan[0]) || "烫蓝".equals(zhuan[0]) || "烫红".equals(zhuan[0]) || "烫黑".equals(zhuan[0]) || "镭射银".equals(zhuan[0]) || "镭射金".equals(zhuan[0]) || "玫瑰金".equals(zhuan[0])) {
+            if ("烫金".equals(zhuan[0]) || "烫银".equals(zhuan[0]) || "烫蓝".equals(zhuan[0]) || "烫红".equals(zhuan[0]) || "烫黑".equals(zhuan[0]) || "玫瑰金".equals(zhuan[0])) {
                 // 起步价+58元
                 price = price + (40 * area);
                 price = price > 80 ? price : 80;
@@ -1579,6 +1579,9 @@ public class PriceUtils {
             } else if ("双面贴".equals(zhuan[0])) {
                 price = price + (40 * area);
                 price = price > 80 ? price : 80;
+            } else if ("镭射银".equals(zhuan[0]) || "镭射金".equals(zhuan[0])) {
+                price = price + (50 * area);
+                price = price > 80 ? price : 80;
             }
         }
         Product pro = new Product();
@@ -1593,7 +1596,7 @@ public class PriceUtils {
 
 
         int oldCount = count;
-        if (!StringUtils.isEmpty(zhuan) && ("专金".equals(zhuan[0]) || "专银".equals(zhuan[0]) || "印刷+烫金".equals(zhuan[0]) || "印刷+烫银".equals(zhuan[0])) && count < 100) {
+        if (!StringUtils.isEmpty(zhuan) && ("专金".equals(zhuan[0]) || "专银".equals(zhuan[0]) || "印刷+烫金".equals(zhuan[0]) || "印刷+烫银".equals(zhuan[0]) || "镭射银".equals(zhuan[0]) || "镭射金".equals(zhuan[0])) && count < 100) {
             // 烫金100个起
             count = 100;
         }

+ 1 - 3
src/main/webapp/views/main.jsp

@@ -431,9 +431,7 @@
             <!--向上轮播-->
             <div class="swiper" style="height: 100%;width: 800px;">
                 <div class="swiper-wrapper">
-                    <div class="swiper-slide" data-swiper-autoplay="5000">【新增】刻字车贴价格更新</div>
-                    <div class="swiper-slide" data-swiper-autoplay="5000">【新增】PET透卡新增工艺</div>
-                    <div class="swiper-slide" data-swiper-autoplay="5000">【新增】贺卡新增opp袋工艺</div>
+                    <div class="swiper-slide" data-swiper-autoplay="5000">【修改】即日起  uv烫镭射银/镭射金3-4天发货 广州发货</div>
                 </div>
             </div>
         </div>

+ 8 - 2
src/main/webapp/views/product/metal.jsp

@@ -150,7 +150,7 @@
                     <input type="checkbox" name="craft" lay-filter="craftZhuan" value="烫金" title="烫金"
                            class="craftZhuan">
                     <div class="layui-inline tjselect" style="width:60px; display:none">
-                        <select name="craft" class="layui-select " disabled>
+                        <select name="craft" class="layui-select" lay-filter="tjselect" disabled>
                             <option value="烫金">烫金</option>
                             <option value="烫银">烫银</option>
                             <option value="烫蓝">烫蓝</option>
@@ -260,12 +260,16 @@
             let data = {
                 proTypeValue: $('input[name="kind"]:checked').val()
             }
+
             if (data.proTypeValue == '金属标' && (craftMo == '双色' || craftMo == '彩色(三色)')) {
                 data.craftValue = craftMo;
             }
             if (data.proTypeValue == 'UV转印贴') {
                 data.craftValue = craft;
             }
+            if (craft == "烫金") {
+                data.craftValue = $(".tjselect option:selected").val();
+            }
             // 清空轮播图
             $("#carousel").empty();
             $("#remark").empty();
@@ -302,7 +306,9 @@
 
         //建造实例
         ins = carousel.render({});
-
+        form.on("select(tjselect)", function (data) {
+            getProductImage()
+        })
         form.on("radio(craftMo)", function (data) {
             getProductImage()
         })

+ 1 - 1
src/main/webapp/views/system/customerTrain/skill/showCustomerSkillContent.jsp

@@ -162,7 +162,7 @@
                 });
             } else if (obj.event === 'view') {
                 // 在此处输入 layer 的任意代码
-                navigator.clipboard.writeText(data.content);
+                navigator.clipboard.writeText(data1.content);
                 layer.msg('复制成功!', {icon: 6, offset: 'auto', time: 1000});
             }
         })

+ 1 - 1
src/main/webapp/views/system/fileName/reveal/quality.jsp

@@ -162,7 +162,7 @@
                 });
             } else if (obj.event === 'view') {
                 // 在此处输入 layer 的任意代码
-                navigator.clipboard.writeText(data.content);
+                navigator.clipboard.writeText(data1.content);
                 layer.msg('复制成功!', {icon: 6, offset: 'auto', time: 1000});
             }
         })