From 3916de9410192ea8728ebd15c124585d4514825c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 24 Apr 2023 00:53:29 +0800
Subject: [PATCH] fix
---
src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 2 +-
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 4 ++++
src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html | 4 ++--
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index ca6b5b4..571b04f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -347,7 +347,7 @@
}
// 判断会员层级
- if (item.getIsNormal() == 2 && goodsLevel > item.getGoodsLevel()) {
+ if (item.getIsNormal() == 2 && goodsLevel < item.getGoodsLevel()) {
goodsLevel = item.getGoodsLevel();
}
}
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 5dc6e1f..f428f1b 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
@@ -72,6 +72,10 @@
// 父级会员
MallMember parentMember = mallMemberMapper.selectInfoByInviteId(member.getReferrerId());
+ if (parentMember == null) {
+ return;
+ }
+
if (parentMember.getAccountLevel() == 0 || MemberLevelEnum.ZERO_LEVEL.getType().equals(parentMember.getLevel())) {
log.info("上级：{}未购买会员套餐，无返利", parentMember.getInviteId());
return;
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 f706102..b041b83 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsAddNew.html
@@ -110,7 +110,7 @@
<select name="goodsLevel" class="goods-level" lay-filter="goods-level-select">
<option value="1">会员套餐</option>
<option value="2">代理套餐</option>
- <option value="2">股东套餐</option>
+ <option value="3">股东套餐</option>
</select>
</div>
</div>
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 56e93c3..0fc3041 100644
--- a/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
+++ b/src/main/resources/templates/febs/views/modules/goods/goodsUpdateNew.html
@@ -120,7 +120,7 @@
<select name="goodsLevel" class="goods-level">
<option value="1">会员套餐</option>
<option value="2">代理套餐</option>
- <option value="2">股东套餐</option>
+ <option value="3">股东套餐</option>
</select>
</div>
</div>
@@ -377,6 +377,7 @@
elem: '#febs-form-group-date'
});
+ var E = window.wangEditor;
formSelects.render();
form.verify({
@@ -386,7 +387,6 @@
]
});
- var E = window.wangEditor;
const editorConfig = { MENU_CONF: {} };
editorConfig.MENU_CONF['uploadImage'] = {
server: '/admin/goods/uploadFileBase64',
--
Gitblit v1.9.1