Browse Source

新增流苏工艺

zhuyiyi 1 month ago
parent
commit
6b9c9feefb

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

@@ -3136,12 +3136,19 @@ public class ProductService {
                     if (Arrays.binarySearch(dto.getCraft(), "配弹力绳") > -1) {
                         peijianPrice = 0.05;
                     }
+
                     for (Product product : priceList) {
                         if (peijianPrice > 0) {
                             product.setPrice(Math.ceil(product.getPrice() + peijianPrice * dto.getCount() * dto.getNumber() + 5));
                         }
                     }
+                    if (Arrays.binarySearch(dto.getCraft(), "配流苏") > -1) {
+                        for (Product product : priceList) {
+                            product.setPrice(Math.ceil(product.getPrice() + Math.max(5, 3 * dto.getCo_number())));
+                        }
+                    }
                 }
+
                 if (!role.contains("1045") && !role.contains("1054") && !role.contains("1029")) {
                     if (number > 1) {
                         double designFee = 0;

+ 1 - 1
src/main/java/lingtao/net/util/PosterPrice.java

@@ -364,7 +364,7 @@ public class PosterPrice {
                 areas = new double[]{2, 5, 7, 8, 10, 20, 50};
                 prices = new double[]{50, 40, 35, 32, 26, 24, 22};
                 last_price = 26;
-                min_price += 50 -5;
+                min_price += 50 - 5;
                 // 根据面积得到单价
                 weight = String.valueOf(DecimalFormat.format(area * 0.24 * number));
                 break;

+ 23 - 0
src/main/webapp/views/product/coupon.jsp

@@ -898,6 +898,11 @@
                                 <option value="银色绳子">银色绳子</option>
                             </select>
                         </div>
+                        <input type="checkbox" class="lesspeijian" name="craft" lay-filter="lessz4PeiJian" value="配流苏"
+                               title="配流苏">
+                        <div class="layui-inline liusu" style="width: 110px;display: none;align-items: center">
+                            <input class="layui-input" name="co_number" value="1"><span style="flex-shrink: 0;">包  (10条/包)</span>
+                        </div>
                     </div>
                 </form>
             </div>
@@ -1234,6 +1239,7 @@
                         $("#lesspeijian").find(":input").attr("disabled", true);
                         $(".scolor").hide();
                         $(".tscolor").hide();
+                        $(".liusu").hide();
                     }
                     form.render();
                 });
@@ -1357,6 +1363,15 @@
                         $("#lesspeijian .tscolor").prop("disabled", true);
                     }
                 }
+                if (data.value == "配流苏") {
+                    if ($(data.elem).is(":checked")) {
+                        $("#lesspeijian .liusu").css("display","flex");
+                        $("#lesspeijian .liusu").prop("disabled", false);
+                    } else {
+                        $("#lesspeijian .liusu").hide();
+                        $("#lesspeijian .liusu").prop("disabled", true);
+                    }
+                }
             });
             form.on("radio(kindValue2)", function (data) {
                 peijianuiHide();
@@ -2083,6 +2098,7 @@
                 // 上面的else 已经有这个效果了
                 $(".scolor").hide()
                 $(".tscolor").hide()
+                $(".liusu").hide();
                 $("#kindValueForm").show();
                 if (couponKind == "少数量") {
                     $(".ui_shk_size").hide();
@@ -3209,6 +3225,13 @@
                             arr.push($(this).val() + "-" + shenColor)
                             return;
                         }
+                        if ($(this).val() === '配流苏') {
+                            if (couponKind == "少数量") {
+                                let coNumber = $("#lesspeijian input[name='co_number']").val();
+                                arr.push(coNumber + "包" + $(this).val())
+                            }
+                            return;
+                        }
                         if ($(this).val() === '流苏') {
                             arr.push($(".select_liusu select[name='craft'] option:selected").val())
                             return;