修改单面凹凸

src/main/java/lingtao/net/service/ProductService.java

@@ -1024,7 +1024,7 @@ public class ProductService {
                         priceList = getHekaPrice(min, product1, priceList, count);
                         getCraft(product1, priceList, length * 10, width * 10, min);
                         for (Product product : priceList) {
-                            if ("凹凸".equals(dto.getAotu())) {
+                            if ("击凸".equals(dto.getAotu()) || "压凹".equals(dto.getAotu())) {
                                 product.setPrice(Math.floor(product.getPrice() + (product.getPrice() * 0.09 > 153 ? product.getPrice() * 0.09 : 153)));
                             }
                             if (craft.contains("弹力绳")) {
@@ -5767,7 +5767,7 @@ public class ProductService {
                     }
                 }
             }
-            if (craftList.contains("击凸")) {
+            if (!"服装吊牌".equals(dto.getProTypeValue()) && craftList.contains("击凸")) {
                 for (Product product : priceList) {
                     if (product.getCount() <= 400) {
                         product.setPrice(product.getPrice() + 60);

src/main/java/lingtao/net/util/AStickersPrice.java

@@ -2,6 +2,10 @@ package lingtao.net.util;
 
 import lingtao.net.bean.Product;
 
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -386,26 +390,13 @@ public class AStickersPrice {
     }
 
     public static void main(String[] args) {
-        String memoStr = "(1988074200376066673)-80x54mm-1000张-铜版纸不干胶覆膜模切-ZS-马晓光123maxiaoguang-河南省-红红-[C2+1]";
-        memoStr = memoStr.replace("（", "(");
-        memoStr = memoStr.replace("）", ")");
-        int sIndex = memoStr.indexOf("(");
-        int eIndex = memoStr.indexOf(")");
-        if (sIndex == -1 || eIndex == -1) {
-            return;
+        String path = "Z:\\设计文件共享中心\\已下单\\2019\\1月\\年后出货\\不干胶\\dy\\已拼";
+        Path startPath = Paths.get(path);
+        try {
+            Files.walk(startPath).filter(Files::isRegularFile).forEach(System.out::println);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
-        String first = memoStr.substring(0, sIndex + 1);
-        String memoCtid = "S_C1_1988074200376066673";
-        if (memoCtid.indexOf("C") != -1) {
-            String CIdx = midStrEx(memoStr, "[", "]"); //C1
-            if (CIdx.indexOf("+") != -1) {
-                CIdx = "C" + CIdx.split("\\+")[1];
-            }
-            memoCtid = memoCtid.replace(CIdx + "_", ""); //去掉C1
-        }
-        String last = memoStr.substring(eIndex, memoStr.length());
-        String newMemo = first + memoCtid + last;
-        System.out.println(newMemo);
     }
 
     public static String midStrEx(String source, String startStr, String endStr) {

src/main/java/lingtao/net/util/PriceUtils.java

@@ -972,7 +972,7 @@ public class PriceUtils {
             } else if ("单面烫黄金".equals(kind2)) {
                 double priceArr[] = {68, 48, 37, 36, 35, 34};
                 list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
-            } else if ("单面凹凸".equals(kind2)) {
+            } else if ("击凸".equals(kind2) || "压凹".equals(kind2)) {
                 double priceArr[] = {75, 50, 40, 40, 39, 38};
                 list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
             } else if ("单面烫黄金+凹凸".equals(kind2)) {
@@ -1015,7 +1015,7 @@ public class PriceUtils {
             } else if ("单面烫黄金".equals(kind2)) {
                 double priceArr[] = {68, 48, 37, 36, 35, 34};
                 list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
-            } else if ("单面凹凸".equals(kind2)) {
+            } else if ("击凸".equals(kind2) || "压凹".equals(kind2)) {
                 double priceArr[] = {75, 50, 40, 40, 39, 38};
                 list = acountTag600Price(area, count, priceArr, shengzi, flag, list);
             } else if ("单面烫黄金+凹凸".equals(kind2)) {