From 6184ec366a86d7c9c6884ce868be5e706a57b0e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 08 Apr 2023 15:30:59 +0800
Subject: [PATCH] 设置内转开关
---
src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java | 8 +-
src/main/resources/templates/index.html | 2
src/main/resources/mapper/modules/MallAchieveRecordMapper.xml | 7 +
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 39 ++++-----
src/main/java/cc/mrbird/febs/mall/service/impl/MallMoneyFlowServiceImpl.java | 6 +
src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java | 2
src/main/resources/mapper/modules/MallMemberMapper.xml | 12 ++
src/main/resources/templates/error/404.html | 2
src/main/java/cc/mrbird/febs/mall/service/IAgentService.java | 8 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 13 ++-
src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java | 2
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 50 ++++++-----
src/main/resources/templates/error/403.html | 2
src/main/resources/templates/febs/views/modules/mallMember/agentLevelSet.html | 2
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 18 +++-
src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java | 2
src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java | 3
src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java | 6
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml | 2
src/main/java/cc/mrbird/febs/mall/service/IMallMoneyFlowService.java | 2
src/main/resources/templates/error/500.html | 2
src/main/resources/templates/febs/views/layout.html | 2
src/main/resources/templates/febs/views/login.html | 4
23 files changed, 118 insertions(+), 78 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java b/src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java
index 9ac29e7..fa70d99 100644
--- a/src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java
+++ b/src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java
@@ -63,7 +63,7 @@
log.info("/ /` / / \\ | |\\/| | |_) | | | |_ | | | |_ ");
log.info("\\_\\_, \\_\\_/ |_| | |_| |_|__ |_|__ |_| |_|__ ");
log.info(" ");
- log.info("美澳商城 权限系统启动完毕，地址：{}", url);
+ log.info("HNTO商城 权限系统启动完毕，地址：{}", url);
boolean auto = febsProperties.isAutoOpenBrowser();
if (auto && StringUtils.equalsIgnoreCase(active, FebsConstant.DEVELOP)) {
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java
index 314d2e1..283e367 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java
@@ -6,8 +6,11 @@
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
public interface MallAchieveRecordMapper extends BaseMapper<MallAchieveRecord> {
BigDecimal selectAchieveTotal(@Param("type") String type, @Param("date") Date date);
+
+ List<MallAchieveRecord> selectByMemberId( @Param("memberId")Long memberId);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java b/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
index bccd530..4904339 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAgentService.java
@@ -4,6 +4,14 @@
void autoUpAgentLevel(Long memberId);
+ /**
+ * 1、购买人获得固定比例的积分
+ * 2、直推获取8%的现金->余额,4%的积分->积分
+ * 3、不同代理级别获取不用的比例的现金和积分
+ * 4、董事享受全公司入单分红2%加权（现金）
+ * 5、合伙人享全公司入单分红5%加权（现金）
+ * 6、入单后，50%入现金池 35%的积分入积分池,更新价格
+ */
void returnMoneyToAgent(Long orderId);
void rankReturnMoney(Long orderId);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IMallMoneyFlowService.java b/src/main/java/cc/mrbird/febs/mall/service/IMallMoneyFlowService.java
index 5b35700..d01ee12 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IMallMoneyFlowService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IMallMoneyFlowService.java
@@ -15,4 +15,6 @@
void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Long rtMemberId, Integer flowType);
+ void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Long rtMemberId, Integer flowType, Integer isReturn);
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 7817f85..a356f36 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -189,6 +189,7 @@
amountTC,
"score",
MoneyFlowTypeEnum.BUY_SET_MEAL_PERK.getValue(),
+ memberId,
FlowTypeEnum.SCORE.getValue(),
orderNo);
@@ -206,6 +207,7 @@
amountTC,
"balance",
MoneyFlowTypeEnum.DIRECT_CASH_PERK.getValue(),
+ memberId,
FlowTypeEnum.BALANCE.getValue(),
orderNo);
@@ -214,6 +216,7 @@
amountTC,
"score",
MoneyFlowTypeEnum.DIRECT_SCORE_PERK.getValue(),
+ memberId,
FlowTypeEnum.SCORE.getValue(),
orderNo);
}
@@ -228,6 +231,7 @@
amountTC,
"balance",
MoneyFlowTypeEnum.DIRECTOR_CASH_PERK.getValue(),
+ memberId,
FlowTypeEnum.BALANCE.getValue(),
orderNo);
}
@@ -242,6 +246,7 @@
amountTC,
"balance",
MoneyFlowTypeEnum.PARTNER_CASH_PERK.getValue(),
+ memberId,
FlowTypeEnum.BALANCE.getValue(),
orderNo);
}
@@ -310,6 +315,7 @@
teamPerkMemberId,
"balance",
MoneyFlowTypeEnum.AGENT_CASH_PERK.getValue(),
+ memberId,
FlowTypeEnum.BALANCE.getValue(),
orderNo);
}
@@ -318,6 +324,7 @@
teamPerkMemberId,
"score",
MoneyFlowTypeEnum.AGENT_SCORE_PERK.getValue(),
+ memberId,
FlowTypeEnum.SCORE.getValue(),
orderNo);
}
@@ -397,7 +404,7 @@
* @param flowType 流水分类
* @param orderNo 订单编号
*/
- private void perkMember(Long memberId,PerkEnum perkEnum,BigDecimal amountTC,String walletField,int type,int flowType,String orderNo){
+ private void perkMember(Long memberId,PerkEnum perkEnum,BigDecimal amountTC,String walletField,int type,Long rtMemberId,int flowType,String orderNo){
DataDictionaryCustom perkEnumDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
perkEnum.getType(),
perkEnum.getCode());
@@ -414,7 +421,7 @@
perkEnumDicPercentPerk = perkEnumDicPercentPerk.divide(poolScorePrice, 2 ,BigDecimal.ROUND_DOWN);
}
if(perkEnumDicPercentPerk.compareTo(BigDecimal.ZERO) > 0){
- addWalletInfoAndMoneyFlow(perkEnumDicPercentPerk,memberId,walletField,type,flowType,orderNo);
+ addWalletInfoAndMoneyFlow(perkEnumDicPercentPerk,memberId,walletField,type,rtMemberId,flowType,orderNo);
}
}
}
@@ -428,7 +435,7 @@
* @param flowType
* @param orderNo
*/
- private void addWalletInfoAndMoneyFlow(BigDecimal amount,Long memberId,String walletField,int type,int flowType,String orderNo){
+ private void addWalletInfoAndMoneyFlow(BigDecimal amount,Long memberId,String walletField,int type,Long rtMemberId,int flowType,String orderNo){
//增加
iApiMallMemberWalletService.add(amount,memberId,walletField);
//增加一个流水记录
@@ -437,6 +444,7 @@
amount,
type,
orderNo,
+ rtMemberId,
flowType,
AppContants.IS_RETURN_YES);
}
@@ -451,7 +459,7 @@
* @param flowType 流水分类
* @param orderNo 订单编号
*/
- private void perkMembersLevel(List<MallMember> mallMembers,PerkEnum perkEnum,BigDecimal amountTC,String walletField,int type,int flowType,String orderNo){
+ private void perkMembersLevel(List<MallMember> mallMembers,PerkEnum perkEnum,BigDecimal amountTC,String walletField,int type,Long rtMemberId,int flowType,String orderNo){
DataDictionaryCustom perkEnumDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
perkEnum.getType(),
perkEnum.getCode());
@@ -464,7 +472,7 @@
if(perkEnumDicPercentPerk.compareTo(BigDecimal.ZERO) > 0){
for(MallMember mallMember : mallMembers){
Long memberId = mallMember.getId();
- addWalletInfoAndMoneyFlow(perkEnumDicPercentPerk,memberId,walletField,type,flowType,orderNo);
+ addWalletInfoAndMoneyFlow(perkEnumDicPercentPerk,memberId,walletField,type,rtMemberId,flowType,orderNo);
}
}
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 4465115..87ed2ec 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -1,10 +1,7 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
-import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
-import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
@@ -61,6 +58,7 @@
private final MallShopApplyMapper mallShopApplyMapper;
private final MallRegisterAppealMapper mallRegisterAppealMapper;
private final MallMemberBankMapper mallMemberBankMapper;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
@Value("${spring.profiles.active}")
@@ -107,6 +105,11 @@
if (inviteMember == null) {
throw new FebsException("邀请码不存在");
}
+ //购买套餐产生业绩，才能推广会员
+ List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectByMemberId(inviteMember.getId());
+ if(CollUtil.isEmpty(mallAchieveRecordList)){
+ throw new FebsException("非会员不能推广");
+ }
mallMember.setReferrerId(registerDto.getInviteId());
@@ -114,7 +117,7 @@
mallMember.setName(registerDto.getName());
mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
- mallMember.setLevel(AgentLevelEnum.ZERO_LEVEL.name());
+ mallMember.setLevel(MemberLevelEnum.NORMAL.name());
mallMember.setSex("男");
mallMember.setBindPhone(registerDto.getAccount());
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 aa6ff88..bc1e7d1 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
@@ -72,6 +72,7 @@
private final AgentProducer agentProducer;
private final IPayService payService;
private final IMallAchieveService mallAchieveService;
+ private final MallAchieveRecordMapper mallAchieveRecordMapper;
private final UnipayService unipayService;
private final MallMemberBankSignMapper mallMemberBankSignMapper;
@@ -327,45 +328,37 @@
orderInfo.setPayResult("1");
boolean hasTc = false;
- // 静态倍数
+ BigDecimal achieveAmount = BigDecimal.ZERO;
List<MallOrderItem> orderItems = this.baseMapper.getMallOrderItemByOrderId(orderInfo.getId());
if (CollUtil.isNotEmpty(orderItems)) {
for (MallOrderItem orderItem : orderItems) {
MallGoods mallGoods = mallGoodsMapper.selectById(orderItem.getGoodsId());
- BigDecimal score = BigDecimal.ZERO;
MallGoodsSku sku = mallGoodsSkuMapper.selectById(orderItem.getSkuId());
if (mallGoods.getIsNormal() == 2) {
hasTc = true;
- score = sku.getPresentPrice().multiply(mallGoods.getStaticMulti()).multiply(new BigDecimal(orderItem.getCnt()));
-// BigDecimal staticMulti = mallGoods.getStaticMulti() == null ? BigDecimal.ZERO : mallGoods.getStaticMulti();
-// score = sku.getPresentPrice().multiply(staticMulti);
- // 普通商品也及时结算，不再10天结算
- } else {
- score = sku.getPresentPrice();
- }
-
- if (score.compareTo(BigDecimal.ZERO) > 0) {
- memberWalletService.add(score, member.getId(), "score");
- mallMoneyFlowService.addMoneyFlow(member.getId(), score, MoneyFlowTypeEnum.STATIC_BONUS.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.SCORE.getValue());
-
- // 添加业绩
- mallAchieveService.add(orderItem.getId());
+ achieveAmount = achieveAmount.add(sku.getPresentPrice().multiply(new BigDecimal(orderItem.getCnt())));
}
}
}
- // 购买套餐后，升级为普通会员
- if (hasTc) {
- MallMember mallMember = memberMapper.selectById(member.getId());
- if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
- memberMapper.updateById(mallMember);
+
+ if (hasTc){
+ if(achieveAmount.compareTo(BigDecimal.ZERO) > 0) {
+ // 添加业绩
+ MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
+ mallAchieveRecord.setMemberId(member.getId());
+ mallAchieveRecord.setAmount(achieveAmount);
+ mallAchieveRecord.setAchieveTime(orderInfo.getPayTime());
+ mallAchieveRecord.setOrderId(orderInfo.getId());
+ mallAchieveRecord.setIsNormal(2);
+ mallAchieveRecord.setPayTime(orderInfo.getPayTime());
+ mallAchieveRecordMapper.insert(mallAchieveRecord);
}
}
mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
agentProducer.sendAutoLevelUpMsg(member.getId());
- agentProducer.sendOrderReturn(orderInfo.getId());
+// agentProducer.sendOrderReturn(orderInfo.getId());
agentProducer.sendReturnMoneyMsg(orderInfo.getId());
break;
case "4":
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMoneyFlowServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMoneyFlowServiceImpl.java
index 54e1212..74c9cec 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallMoneyFlowServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallMoneyFlowServiceImpl.java
@@ -49,4 +49,10 @@
public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Long rtMemberId, Integer flowType) {
this.addMoneyFlow(memberId, amount, type, orderNo, null, null, rtMemberId, null, flowType, null);
}
+
+ @Override
+ public void addMoneyFlow(Long memberId, BigDecimal amount, Integer type, String orderNo, Long rtMemberId, Integer flowType, Integer isReturn) {
+ this.addMoneyFlow(memberId, amount, type, orderNo, null, null, rtMemberId, null, flowType,isReturn);
+
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
index aec9654..6dd0646 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/ExchangeConstants.java
@@ -6,5 +6,5 @@
**/
public class ExchangeConstants {
- public static final String EXCHANGE_DEFAULT = "exchange_default";
+ public static final String EXCHANGE_DEFAULT = "exchange_h_default";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
index 69b8301..306d6c7 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/QueueConstants.java
@@ -6,8 +6,8 @@
**/
public class QueueConstants {
- public static final String QUEUE_DEFAULT = "queue_default";
- public static final String AGENT_AUTO_LEVEL_UP = "queue_agent_auto_level_up";
+ public static final String QUEUE_DEFAULT = "queue_h_default";
+ public static final String AGENT_AUTO_LEVEL_UP = "queue_h_agent_auto_level_up";
public static final String AGENT_RETURN_MONEY = "queue_h_agent_return_money";
- public static final String ORDER_RETURN_MONEY = "queue_order_return_money";
+ public static final String ORDER_RETURN_MONEY = "queue_h_order_return_money";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java b/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
index f9d7c1f..bda695e 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/constants/RouteKeyConstants.java
@@ -6,5 +6,5 @@
**/
public class RouteKeyConstants {
- public static final String ROUTE_KEY_DEFAULT = "route_key_default";
+ public static final String ROUTE_KEY_DEFAULT = "route_key_h_default";
}
diff --git a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
index adfbda4..3e0a65d 100644
--- a/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
+++ b/src/main/java/cc/mrbird/febs/rabbit/enumerates/RabbitQueueEnum.java
@@ -5,14 +5,14 @@
@Getter
public enum RabbitQueueEnum {
- DEFAULT("exchange_default", "route_key_default", "queue_default"),
+ DEFAULT("exchange_h_default", "route_key_h_default", "queue_h_default"),
- ORDER_CANCEL_DELAY_TTL("exchange_order_delay_ttl", "route_key_order_delay_ttl", "queue_order_delay_ttl"),
- ORDER_CANCEL_DELAY("exchange_order_delay", "route_key_order_delay", "queue_order_delay"),
+ ORDER_CANCEL_DELAY_TTL("exchange_h_order_delay_ttl", "route_key_h_order_delay_ttl", "queue_h_order_delay_ttl"),
+ ORDER_CANCEL_DELAY("exchange_h_order_delay", "route_key_h_order_delay", "queue_h_order_delay"),
AGENT_RETURN_MONEY("exchange_h_agent_return_money", "route_key_h_agent_return_money", "queue_h_agent_return_money"),
- ORDER_RETURN_MONEY("exchange_order_return_money", "route_key_order_return_money", "queue_order_return_money");
+ ORDER_RETURN_MONEY("exchange_h_order_return_money", "route_key_h_order_return_money", "queue_h_order_return_money");
private String exchange;
diff --git a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
index ac88217..a0b1b5b 100644
--- a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
+++ b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
@@ -32,7 +32,7 @@
<select id="getAgentLevelOption" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo">
select a.code id,a.description name from data_dictionary_custom a
- where a.type='AGENT_LEVEL' and a.code != 'ZERO_LEVEL'
+ where a.type='AGENT_PERK_SET'
</select>
<select id="getRankAwardUpdateInfoById" resultType="cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo">
diff --git a/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml b/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml
index 53af5db..af14818 100644
--- a/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml
@@ -13,4 +13,11 @@
</if>
</select>
+ <select id="selectByMemberId" resultType="cc.mrbird.febs.mall.entity.MallAchieveRecord">
+ select
+ *
+ from mall_achieve_record
+ where member_id = #{memberId}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index c8b88e2..e436ebb 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,12 +3,18 @@
<mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberMapper">
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
- SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore,IFNULL(c.commission,0) commission
- ,d.description levelName
+ SELECT
+ m.*,
+ a.name referrerName,
+ IFNULL(c.balance,0) balance,
+ IFNULL(c.score,0) score,
+ IFNULL(c.prize_score,0) prizeScore,
+ IFNULL(c.commission,0) commission,
+ d.code levelName
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
LEFT JOIN mall_member_wallet c on c.member_id = m.id
- LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
+ LEFT JOIN data_dictionary_custom d on d.code = m.level
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
diff --git a/src/main/resources/templates/error/403.html b/src/main/resources/templates/error/403.html
index d246c78..24a367c 100644
--- a/src/main/resources/templates/error/403.html
+++ b/src/main/resources/templates/error/403.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
- <title>美澳商城 权限系统</title>
+ <title>HNTO商城 权限系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html
index a9b95cc..12829d0 100644
--- a/src/main/resources/templates/error/404.html
+++ b/src/main/resources/templates/error/404.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
- <title>美澳商城 权限系统</title>
+ <title>HNTO商城 权限系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
diff --git a/src/main/resources/templates/error/500.html b/src/main/resources/templates/error/500.html
index 8186ddd..a285a92 100644
--- a/src/main/resources/templates/error/500.html
+++ b/src/main/resources/templates/error/500.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
- <title>美澳商城 权限系统</title>
+ <title>HNTO商城 权限系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
diff --git a/src/main/resources/templates/febs/views/layout.html b/src/main/resources/templates/febs/views/layout.html
index f5281bd..ea164f0 100644
--- a/src/main/resources/templates/febs/views/layout.html
+++ b/src/main/resources/templates/febs/views/layout.html
@@ -64,7 +64,7 @@
<div class="layui-side-scroll">
<div class="layui-logo" style="cursor: pointer">
<img data-th-src="@{febs/images/logo.png}">
- <span>美澳商城 权限系统</span>
+ <span>HNTO商城 权限系统</span>
</div>
<script
type="text/html"
diff --git a/src/main/resources/templates/febs/views/login.html b/src/main/resources/templates/febs/views/login.html
index b361bc2..748273d 100644
--- a/src/main/resources/templates/febs/views/login.html
+++ b/src/main/resources/templates/febs/views/login.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="utf-8">
- <title>美澳商城 权限系统</title>
+ <title>HNTO商城 权限系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -19,7 +19,7 @@
<div class="layui-container">
<div class="layui-row">
<div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-tc">
- <div class="layui-logo"><span><b>美澳商城</b> 权限系统</span></div>
+ <div class="layui-logo"><span><b>HNTO商城</b> 权限系统</span></div>
</div>
<div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4" id="login-div">
<div class="layui-form" lay-filter="login-form">
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentLevelSet.html b/src/main/resources/templates/febs/views/modules/mallMember/agentLevelSet.html
index 0f7f3c3..6626a47 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/agentLevelSet.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentLevelSet.html
@@ -27,7 +27,7 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">代理级别：</label>
+ <label class="layui-form-label">级别：</label>
<div class="layui-input-inline">
<select lay-verify="required" name="levelCode" class="agent-level-set-level" id="levelSet">
<option value="">请选择</option>
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index 2dad877..021e001 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -8,35 +8,39 @@
<div class="layui-col-md10">
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">名称：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="名称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">账号：</label>
<div class="layui-input-inline">
- <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="账号/邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">账户状态</label>
+ <label class="layui-form-label">会员类型：</label>
+ <div class="layui-input-inline">
+ <select name="level">
+ <option value="">请选择</option>
+ <option value="NORMAL">普通会员</option>
+ <option value="V1">V1</option>
+ <option value="V2">V2</option>
+ <option value="V3">V3</option>
+ <option value="V4">V4</option>
+ <option value="V5">V5</option>
+ <option value="V6">V6</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">账号状态：</label>
<div class="layui-input-inline">
<select name="accountStatus">
<option value="">请选择</option>
<option value="1">正常</option>
<option value="2">禁用</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">会员类型</label>
- <div class="layui-input-inline">
- <select name="level">
- <option value="">请选择</option>
- <option value="FIRST_LEVEL">普通会员</option>
- <option value="SECOND_LEVEL">一星</option>
- <option value="THIRD_LEVEL">二星</option>
- <option value="FOUR_LEVEL">三星</option>
- <option value="FIFTH_LEVEL">四星</option>
</select>
</div>
</div>
@@ -96,8 +100,8 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>
- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>-->
+<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>
@@ -229,13 +233,13 @@
{field: 'name', title: '名称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left'},
- {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
- {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
- {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
+ {field: 'score', title: '积分', minWidth: 100,align:'left'},
+ // {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
+ // {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
- {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
- {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
+ // {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
+ // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
{field: 'accountType', title: '账号类型',
templet: function (d) {
if (d.accountType === 2) {
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index bff22d7..fa73565 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -3,7 +3,7 @@
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
<meta charset="utf-8">
- <title>美澳商城 权限系统</title>
+ <title>HNTO商城 权限系统</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
--
Gitblit v1.9.1