新增数码插旗

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

@@ -324,7 +324,12 @@ public class ProductService {
                             width = Math.ceil(width);
                             area = length * width / 10000;
                         }
-                        priceList = normalSticker(dto, "0", number, area, width, length, count, oldKind, priceList);
+                        if ("常规".equals(dto.getKind2Value())) {
+                            priceList = normalSticker(dto, "0", number, area, width, length, count, oldKind, priceList);
+                        }
+                        if ("数码".equals(dto.getKind2Value())) {
+                            priceList = lessSticker(dto, "0", number, width, length, count, priceList, role);
+                        }
 
                         if (priceList.size() >= 3) {
                             priceList = priceList.subList(0, 3);
@@ -338,7 +343,12 @@ public class ProductService {
                             width = Math.ceil(width);
                             area = length * width / 10000;
                         }
-                        priceList = normalSticker(dto, "1", number, area, width, length, count, oldKind, priceList);
+                        if ("常规".equals(dto.getKind2Value())) {
+                            priceList = normalSticker(dto, "1", number, area, width, length, count, oldKind, priceList);
+                        }
+                        if ("数码".equals(dto.getKind2Value())) {
+                            priceList = lessSticker(dto, "1", number, width, length, count, priceList, role);
+                        }
                         if (priceList.size() >= 3) {
                             priceList = priceList.subList(0, 3);
                         }
@@ -497,20 +507,26 @@ public class ProductService {
                         for (Product product : priceList) {
                             double basePrice = 0;
                             if ("粘牙签".equals(dto.getCraftShua())) {
-                                if (product.getCount() <= 500) {
-                                    basePrice = 0.108;
-                                } else if (product.getCount() <= 1000) {
-                                    basePrice = 0.127;
-                                } else if (product.getCount() <= 2000) {
-                                    basePrice = 0.118;
-                                } else if (product.getCount() <= 3000) {
-                                    basePrice = 0.114;
-                                } else if (product.getCount() <= 5000) {
-                                    basePrice = 0.106;
-                                } else {
-                                    basePrice = 0.086;
+                                if ("常规".equals(dto.getKind2Value())) {
+                                    if (product.getCount() <= 500) {
+                                        basePrice = 0.108;
+                                    } else if (product.getCount() <= 1000) {
+                                        basePrice = 0.127;
+                                    } else if (product.getCount() <= 2000) {
+                                        basePrice = 0.118;
+                                    } else if (product.getCount() <= 3000) {
+                                        basePrice = 0.114;
+                                    } else if (product.getCount() <= 5000) {
+                                        basePrice = 0.106;
+                                    } else {
+                                        basePrice = 0.086;
+                                    }
+                                }
+                                if ("数码".equals(dto.getKind2Value())) {
+                                    basePrice = 0.5;
                                 }
                             }
+
                             if ("配牙签".equals(dto.getCraftShua())) {
                                 if (product.getCount() <= 500) {
                                     basePrice = 0.032;
@@ -532,10 +548,11 @@ public class ProductService {
                             if ("12".equals(dto.getToothpick_size())) {
                                 basePrice = basePrice + 0.02;
                             }
+
                             if ("0".equals(dto.getKindValue())) {
-                                product.setPrice(product.getPrice() + Math.ceil(product.getCount() * basePrice));
+                                product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5));
                             } else {
-                                product.setPrice(product.getPrice() + Math.ceil(product.getCount() * basePrice * number));
+                                product.setPrice(product.getPrice() + Math.max(Math.ceil(product.getCount() * basePrice), 5) * number);
                             }
                             if ("配牙签".equals(dto.getCraftShua()) && "6.5".equals(dto.getToothpick_size()) && ((width == 9 && length == 2.5) || length == 9 && width == 2.5)) {
                                 if (product.getCount() == 500) {
@@ -6569,7 +6586,7 @@ public class ProductService {
                 product.setPrice(product.getPrice() + ((dto.getN_mq_num()) * base_price));
             }
         }
-        if (number > 1) {
+        if (number > 1 && dto.getP() != null) {
             double desFee = 0;
             if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
                 if (dto.getP() == 1) {

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

@@ -362,9 +362,9 @@ public class PosterPrice {
             // 户外写真白胶（国产）
             case "0":
                 areas = new double[]{2, 5, 7, 8, 10, 20, 50};
-                prices = new double[]{55, 45, 40, 37, 31, 29, 27};
+                prices = new double[]{50, 40, 35, 32, 26, 24, 22};
                 last_price = 26;
-                min_price += 50 + 15;
+                min_price += 50 -5;
                 // 根据面积得到单价
                 weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
                 break;

src/main/webapp/views/product/wallPainting.jsp

@@ -40,7 +40,7 @@
                     <option value="30*50">30*50</option>
                     <option value="50*80">50*80</option>
                     <option value="60*100">60*100</option>
-                    <option value="80*120">80*120</option>
+<%--                    <option value="80*120">80*120</option>--%>
                 </select>
             </div>
             <div class="layui-form-item" style="display: none">