From 75daf06e97c38964971624aa386f2f852f950893 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Sat, 28 May 2022 14:50:14 +0800 Subject: [PATCH] fix goods add category --- src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 3 +++ src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 3 +++ src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 4 +++- 3 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java index 728fa15..42b04dd 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java @@ -118,6 +118,9 @@ for (MallOrderItem item : items) { // 减去成本后算收益 BigDecimal amount = item.getPrice().subtract(item.getCostPrice()).multiply(BigDecimal.valueOf(item.getCnt())); + if (amount.compareTo(BigDecimal.ZERO) < 1) { + continue; + } // =======直推返利== start ===== // 直接奖励收益 diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html index 5cbc964..ff0bfa9 100644 --- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html +++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html @@ -294,6 +294,9 @@ value : 'id', children : 'child' }, + iconfont: { + parent: 'hidden', + }, radio: true, clickClose: true, tree: { diff --git a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html index d670df0..3410fd4 100644 --- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html +++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html @@ -322,6 +322,9 @@ value : 'id', children : 'child' }, + iconfont: { + parent: 'hidden', + }, radio: true, clickClose: true, tree: { @@ -552,7 +555,6 @@ "thumbs": thumbs }); - console.log(goodsInfo.categoryId); var arr = []; arr.push(goodsInfo.categoryId) category.setValue(arr); -- Gitblit v1.9.1