Browse Source

香薰卡新增配件

zhuyiyi 1 tháng trước cách đây
mục cha
commit
de99f53f4b

+ 4 - 1
src/main/java/lingtao/net/service/ProductService.java

@@ -5410,7 +5410,10 @@ public class ProductService {
         if (carftList.contains("配弹力绳")) {
             craft_price += Math.ceil(0.1 * dto.getCount() * dto.getNumber());
         }
-        if (carftList.contains("穿涤纶丝带") || carftList.contains("穿吊牌绳") || carftList.contains("穿弹力绳")) {
+        if (carftList.contains("配别针")) {
+            craft_price += Math.ceil(0.1 * dto.getCount() * dto.getNumber());
+        }
+        if (carftList.contains("穿涤纶丝带") || carftList.contains("穿吊牌绳") || carftList.contains("穿弹力绳") || carftList.contains("穿别针")) {
             craft_price += Math.ceil(0.15 * dto.getCount() * dto.getNumber());
         }
         int number = dto.getNumber();

+ 4 - 2
src/main/webapp/views/product/aromatherapyCard.jsp

@@ -116,8 +116,8 @@
 
                 <div class="layui-input-block">
                     配件:
-                    <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="别针"
-                           title="别针">
+                    <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="别针"
+                           title="别针">
                     <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配涤纶丝带"
                            title="配涤纶丝带">
                     <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="配吊牌绳"
@@ -127,6 +127,8 @@
                 </div>
                 <div class="layui-input-block">
                     穿配件:
+                    <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="穿别针"
+                           title="穿别针">
                     <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="穿涤纶丝带"
                            title="穿涤纶丝带">
                     <input type="checkbox" class="peijian" name="craft" lay-filter="peijian" value="穿吊牌绳"