From ab841f9e32a3dc207d5fc29813e28fe98084c58a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 11 Jan 2024 10:42:15 +0800
Subject: [PATCH] 套餐
---
src/main/resources/mapper/modules/MallAchieveRecordMapper.xml | 8 +
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java | 44 +++++++
src/main/java/cc/mrbird/febs/mall/vo/AdminPerkSetVo.java | 12 ++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 1
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java | 7 +
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java | 32 +++++
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 4
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java | 9 +
src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java | 2
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java | 122 +++++++++++++------
src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java | 14 +-
src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java | 1
src/main/resources/templates/febs/views/modules/system/perkSet.html | 66 +++++++++++
13 files changed, 274 insertions(+), 48 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
index 537343b..c4a2f63 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -5,6 +5,15 @@
@Getter
public enum DataDictionaryEnum {
+ //套餐返利的四个档位
+ SI_POSITION("SI_POSITION", "SI_POSITION"),
+ SI_POSITION_PERCENT("SI_POSITION_PERCENT", "SI_POSITION_PERCENT"),
+ SAN_POSITION("SAN_POSITION", "SAN_POSITION"),
+ SAN_POSITION_PERCENT("SAN_POSITION_PERCENT", "SAN_POSITION_PERCENT"),
+ ER_POSITION("ER_POSITION", "ER_POSITION"),
+ ER_POSITION_PERCENT("ER_POSITION_PERCENT", "ER_POSITION_PERCENT"),
+ YI_POSITION("YI_POSITION", "YI_POSITION"),
+ YI_POSITION_PERCENT("YI_POSITION_PERCENT", "YI_POSITION_PERCENT"),
//权益额度增加倍数
EQUITY_LIMIT_TIMES("EQUITY_LIMIT_TIMES", "EQUITY_LIMIT_TIMES"),
//积分池设置{"everydayRatio":10,"dividEquallyRatio":1}每日订单的百分之几，增加到积分池;每日平分百分比
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
index d5ff1ec..2455d5f 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
@@ -138,7 +138,12 @@
/**
* 套餐产生权益积分
*/
- TC_TO_EQUITY_LIMIT(27);
+ TC_TO_EQUITY_LIMIT(27),
+
+ /**
+ * 套餐每日返利
+ */
+ TC_TO_BALANCE(28);
private final int value;
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
index 1069031..e700020 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -76,6 +76,38 @@
DataDictionaryEnum.EQUITY_LIMIT_TIMES.getType(),
DataDictionaryEnum.EQUITY_LIMIT_TIMES.getCode(),
adminPerkSetVo.getEquityLimitTimes());
+ commonService.updateDataDic(
+ DataDictionaryEnum.YI_POSITION.getType(),
+ DataDictionaryEnum.YI_POSITION.getCode(),
+ adminPerkSetVo.getYiPosition());
+ commonService.updateDataDic(
+ DataDictionaryEnum.YI_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.YI_POSITION_PERCENT.getCode(),
+ adminPerkSetVo.getYiPositionPercent());
+ commonService.updateDataDic(
+ DataDictionaryEnum.ER_POSITION.getType(),
+ DataDictionaryEnum.ER_POSITION.getCode(),
+ adminPerkSetVo.getErPosition());
+ commonService.updateDataDic(
+ DataDictionaryEnum.ER_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.ER_POSITION_PERCENT.getCode(),
+ adminPerkSetVo.getErPositionPercent());
+ commonService.updateDataDic(
+ DataDictionaryEnum.SAN_POSITION.getType(),
+ DataDictionaryEnum.SAN_POSITION.getCode(),
+ adminPerkSetVo.getSanPosition());
+ commonService.updateDataDic(
+ DataDictionaryEnum.SAN_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.SAN_POSITION_PERCENT.getCode(),
+ adminPerkSetVo.getSanPositionPercent());
+ commonService.updateDataDic(
+ DataDictionaryEnum.SI_POSITION.getType(),
+ DataDictionaryEnum.SI_POSITION.getCode(),
+ adminPerkSetVo.getSiPosition());
+ commonService.updateDataDic(
+ DataDictionaryEnum.SI_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.SI_POSITION_PERCENT.getCode(),
+ adminPerkSetVo.getSiPositionPercent());
return new FebsResponse().success();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
index 6d12297..8eef586 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -165,6 +165,50 @@
adminPerkSetVo.setEquityLimitTimes(equityLimitTimesDic.getValue());
}
+ DataDictionaryCustom yiPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YI_POSITION.getType(),
+ DataDictionaryEnum.YI_POSITION.getCode()
+ );
+ adminPerkSetVo.setYiPosition(yiPositionDic.getValue());
+
+ DataDictionaryCustom yiPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YI_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.YI_POSITION_PERCENT.getCode()
+ );
+ adminPerkSetVo.setYiPositionPercent(yiPositionPercentDic.getValue());
+
+ DataDictionaryCustom erPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.ER_POSITION.getType(),
+ DataDictionaryEnum.ER_POSITION.getCode()
+ );
+ adminPerkSetVo.setErPosition(erPositionDic.getValue());
+ DataDictionaryCustom erPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.ER_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.ER_POSITION_PERCENT.getCode()
+ );
+ adminPerkSetVo.setErPositionPercent(erPositionPercentDic.getValue());
+
+ DataDictionaryCustom sanPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SAN_POSITION.getType(),
+ DataDictionaryEnum.SAN_POSITION.getCode()
+ );
+ adminPerkSetVo.setSanPosition(sanPositionDic.getValue());
+ DataDictionaryCustom sanPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SAN_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.SAN_POSITION_PERCENT.getCode()
+ );
+ adminPerkSetVo.setSanPositionPercent(sanPositionPercentDic.getValue());
+ DataDictionaryCustom siPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SI_POSITION.getType(),
+ DataDictionaryEnum.SI_POSITION.getCode()
+ );
+ adminPerkSetVo.setSiPosition(siPositionDic.getValue());
+ DataDictionaryCustom siPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SI_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.SI_POSITION_PERCENT.getCode()
+ );
+ adminPerkSetVo.setSiPositionPercent(siPositionPercentDic.getValue());
+
model.addAttribute("adminPerkSet", adminPerkSetVo);
return FebsUtil.view("modules/system/perkSet");
}
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 283e367..86c6e22 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallAchieveRecordMapper.java
@@ -13,4 +13,6 @@
BigDecimal selectAchieveTotal(@Param("type") String type, @Param("date") Date date);
List<MallAchieveRecord> selectByMemberId( @Param("memberId")Long memberId);
+
+ List<MallAchieveRecord> selectListByCostAmountAndIsNorMal(@Param("costAmount") BigDecimal zero, @Param("isNormal") int i);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
index 77ff326..c9ee9fd 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java
@@ -50,13 +50,13 @@
// memberProfitService.storeAndDirectorProfit(null);
// }
//
-// /**
-// * 感恩奖
-// */
-// @Scheduled(cron = "0 0 1 * * ?")
-// public void thankfulJob() {
-// memberProfitService.thankfulProfit(null);
-// }
+ /**
+ * 感恩奖
+ */
+ @Scheduled(cron = "0 0 1 * * ?")
+ public void thankfulJob() {
+ memberProfitService.thankfulProfit(null);
+ }
//
//
// /**
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 5bcab9e..ea5107e 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
@@ -259,6 +259,7 @@
mallMemberVo.setBalance(wallet.getBalance());
mallMemberVo.setScore(wallet.getScore());
mallMemberVo.setPrizeScore(wallet.getPrizeScore());
+ mallMemberVo.setEquityLimit(wallet.getEquityLimit());
mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
DataDictionaryCustom poolScorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
index 70395e5..346b868 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/CommonService.java
@@ -114,6 +114,7 @@
MallAchieveRecord mallAchieveRecord = new MallAchieveRecord();
mallAchieveRecord.setMemberId(memberId);
mallAchieveRecord.setAmount(achieveAmount);
+ mallAchieveRecord.setCostAmount(achieveAmount);
mallAchieveRecord.setAchieveTime(orderInfo.getPayTime());
mallAchieveRecord.setOrderId(orderInfo.getId());
mallAchieveRecord.setIsNormal(2);
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 b40eef9..7e68c68 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
@@ -1,9 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
-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.utils.AppContants;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.ScorePoorDto;
@@ -54,6 +51,7 @@
private final MallAchieveRecordMapper mallAchieveRecordMapper;
private final RedisUtils redisUtils;
private final MallMemberWalletMapper mallMemberWalletMapper;
+ private final IApiMallMemberWalletService iApiMallMemberWalletService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -383,56 +381,100 @@
}
/**
- * 拿推荐人的收益（代理，直推，排名）的10%加权平分给下面直推
+ * 每日自动分发套餐的百分比到余额
*/
@Override
public void thankfulProfit(Date date) {
log.info("######==感恩奖==start==####");
- List<MallMember> mallMembers = mallMemberMapper.selectMemberListHasChild();
- if (CollUtil.isEmpty(mallMembers)) {
+ List<MallAchieveRecord> mallAchieveRecordList = mallAchieveRecordMapper.selectListByCostAmountAndIsNorMal(BigDecimal.ZERO,2);
+ if(CollUtil.isEmpty(mallAchieveRecordList)){
return;
}
- if (date == null) {
- date = DateUtil.offset(new Date(), DateField.DAY_OF_YEAR, -1);
- }
+ DataDictionaryCustom yiPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YI_POSITION.getType(),
+ DataDictionaryEnum.YI_POSITION.getCode()
+ );
+ BigDecimal yiPosition = new BigDecimal(yiPositionDic.getValue());
+ DataDictionaryCustom yiPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.YI_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.YI_POSITION_PERCENT.getCode()
+ );
+ BigDecimal yiPositionPercent = new BigDecimal(yiPositionPercentDic.getValue()).multiply(new BigDecimal("0.01"));
- DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.THANKFUL_BONUS.getType(), DataDictionaryEnum.THANKFUL_BONUS.getCode());
- // 感恩奖比例
- BigDecimal prop = new BigDecimal(dic.getValue()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+ DataDictionaryCustom erPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.ER_POSITION.getType(),
+ DataDictionaryEnum.ER_POSITION.getCode()
+ );
+ BigDecimal erPosition = new BigDecimal(erPositionDic.getValue());
+ DataDictionaryCustom erPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.ER_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.ER_POSITION_PERCENT.getCode()
+ );
+ BigDecimal erPositionPercent = new BigDecimal(erPositionPercentDic.getValue()).multiply(new BigDecimal("0.01"));
- for (MallMember mallMember : mallMembers) {
- BigDecimal income = mallMoneyFlowMapper.selectThankfulCommission(date, mallMember.getId());
- List<MallMember> children = mallMemberMapper.selectMemberDirectForHasLevel(mallMember.getInviteId());
- if (CollUtil.isEmpty(children)) {
+ DataDictionaryCustom sanPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SAN_POSITION.getType(),
+ DataDictionaryEnum.SAN_POSITION.getCode()
+ );
+ BigDecimal sanPosition = new BigDecimal(sanPositionDic.getValue());
+ DataDictionaryCustom sanPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SAN_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.SAN_POSITION_PERCENT.getCode()
+ );
+ BigDecimal sanPositionPercent = new BigDecimal(sanPositionPercentDic.getValue()).multiply(new BigDecimal("0.01"));
+
+ DataDictionaryCustom siPositionDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SI_POSITION.getType(),
+ DataDictionaryEnum.SI_POSITION.getCode()
+ );
+ BigDecimal siPosition = new BigDecimal(siPositionDic.getValue());
+ DataDictionaryCustom siPositionPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.SI_POSITION_PERCENT.getType(),
+ DataDictionaryEnum.SI_POSITION_PERCENT.getCode()
+ );
+ BigDecimal siPositionPercent = new BigDecimal(siPositionPercentDic.getValue()).multiply(new BigDecimal("0.01"));
+ for(MallAchieveRecord mallAchieveRecord : mallAchieveRecordList){
+ Long orderId = mallAchieveRecord.getOrderId();
+ MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(orderId);
+ if(OrderStatusEnum.FINISH.getValue() != mallOrderInfo.getStatus()){
continue;
}
-
- BigDecimal reduceProfit = income.multiply(prop);
- if (reduceProfit.compareTo(BigDecimal.ZERO) < 1) {
+ BigDecimal percent = BigDecimal.ZERO;//比例
+ BigDecimal amount = mallAchieveRecord.getAmount();//总业绩
+ BigDecimal costAmount = mallAchieveRecord.getCostAmount();//剩余业绩
+ if(amount.compareTo(yiPosition) < 0){
+ continue;
+ }else if(amount.compareTo(yiPosition) >= 0 && amount.compareTo(erPosition) < 0){
+ percent = yiPositionPercent;
+ }else if(amount.compareTo(erPosition) >= 0 && amount.compareTo(sanPosition) < 0){
+ percent = erPositionPercent;
+ }else if(amount.compareTo(sanPosition) >= 0 && amount.compareTo(siPosition) < 0){
+ percent = sanPositionPercent;
+ }else{
+ percent = siPositionPercent;
+ }
+ BigDecimal perk = amount.multiply(percent).setScale(2,BigDecimal.ROUND_DOWN);//实际发送的余额
+ if(BigDecimal.ZERO.compareTo(perk) >= 0){
continue;
}
-
- int reduce = walletService.reduce(reduceProfit, mallMember.getId(), "commission");
- if (reduce == 2) {
- continue;
+ if(perk.compareTo(costAmount) >= 0){
+ perk = costAmount;
}
- moneyFlowService.addMoneyFlow(mallMember.getId(), reduceProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+ costAmount = costAmount.subtract(perk);
+ mallAchieveRecord.setCostAmount(costAmount);
+ mallAchieveRecordMapper.updateById(mallAchieveRecord);
+ //增加
+ iApiMallMemberWalletService.add(perk,mallAchieveRecord.getMemberId(),"balance");
+ //增加一个流水记录
+ moneyFlowService.addMoneyFlow(
+ mallAchieveRecord.getMemberId(),
+ perk,
+ MoneyFlowTypeEnum.TC_TO_BALANCE.getValue(),
+ mallOrderInfo.getOrderNo(),
+ mallAchieveRecord.getMemberId(),
+ FlowTypeEnum.BALANCE.getValue(),
+ AppContants.IS_RETURN_YES);
- for (MallMember child : children) {
- BigDecimal preProfit = income.multiply(prop).divide(BigDecimal.valueOf(children.size()), 2, RoundingMode.HALF_DOWN);
- if (preProfit.compareTo(BigDecimal.ZERO) < 1) {
- continue;
- }
-
-// int reduce1 = walletService.reduce(preProfit, child.getId(), "score");
-// if (reduce1 == 2) {
-// continue;
-// }
-// walletService.add(preProfit, child.getId(), "commission");
-// moneyFlowService.addMoneyFlow(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.COMMISSION.getValue());
-// moneyFlowService.addMoneyFlow(child.getId(), preProfit.negate(), MoneyFlowTypeEnum.THANKFUL.getValue(), null, mallMember.getId(), FlowTypeEnum.SCORE.getValue());
- changeScoreAndCommission(child.getId(), preProfit, MoneyFlowTypeEnum.THANKFUL.getValue(), null);
- }
}
log.info("######==感恩奖==end==####");
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminPerkSetVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminPerkSetVo.java
index 0b6d194..15360fc 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/AdminPerkSetVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminPerkSetVo.java
@@ -36,4 +36,16 @@
*/
private String equityLimitTimes;
+ private String yiPosition;
+ private String yiPositionPercent;
+
+ private String erPosition;
+ private String erPositionPercent;
+
+ private String sanPosition;
+ private String sanPositionPercent;
+
+ private String siPosition;
+ private String siPositionPercent;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
index 7ea2573..ee50baa 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -93,4 +93,8 @@
@ApiModelProperty(value = "是否店长 1-是 2-否")
private Integer storeMaster;
+ @ApiModelProperty(value = "权益积分")
+ private BigDecimal equityLimit;
+
+
}
diff --git a/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml b/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml
index af14818..200cf15 100644
--- a/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallAchieveRecordMapper.xml
@@ -20,4 +20,12 @@
where member_id = #{memberId}
</select>
+ <select id="selectListByCostAmountAndIsNorMal" resultType="cc.mrbird.febs.mall.entity.MallAchieveRecord">
+ select
+ *
+ from mall_achieve_record
+ where cost_amount > #{costAmount}
+ and is_normal = #{isNormal}
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/system/perkSet.html b/src/main/resources/templates/febs/views/modules/system/perkSet.html
index 79890a1..6071442 100644
--- a/src/main/resources/templates/febs/views/modules/system/perkSet.html
+++ b/src/main/resources/templates/febs/views/modules/system/perkSet.html
@@ -58,6 +58,64 @@
<div class="layui-form-mid layui-word-aux">。</div>
</div>
</div>
+ <blockquote class="layui-elem-quote blue-border">每日套餐返利设置</blockquote>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label febs-form-item-require">第一档：</label>
+ <div class="layui-form-mid layui-word-aux">金额大于：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="yiPosition" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">，获得比例：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="yiPositionPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">%。</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label febs-form-item-require">第二档：</label>
+ <div class="layui-form-mid layui-word-aux">金额大于：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="erPosition" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">，获得比例：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="erPositionPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">%。</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label febs-form-item-require">第三档：</label>
+ <div class="layui-form-mid layui-word-aux">金额大于：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="sanPosition" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">，获得比例：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="sanPositionPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">%。</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label febs-form-item-require">第四档：</label>
+ <div class="layui-form-mid layui-word-aux">金额大于：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="siPosition" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">，获得比例：</div>
+ <div class="layui-input-inline">
+ <input type="text" name="siPositionPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-form-mid layui-word-aux">%。</div>
+ </div>
+ </div>
+
</div>
<div class="layui-card-footer">
@@ -97,6 +155,14 @@
function initPerkSetValue() {
form.val("perk-set-form", {
+ "yiPosition": adminPerkSet.yiPosition,
+ "yiPositionPercent": adminPerkSet.yiPositionPercent,
+ "erPosition": adminPerkSet.erPosition,
+ "erPositionPercent": adminPerkSet.erPositionPercent,
+ "sanPosition": adminPerkSet.sanPosition,
+ "sanPositionPercent": adminPerkSet.sanPositionPercent,
+ "siPosition": adminPerkSet.siPosition,
+ "siPositionPercent": adminPerkSet.siPositionPercent,
"buySetMealPerkPercent": adminPerkSet.buySetMealPerkPercent,
"directCashPerkPercent": adminPerkSet.directCashPerkPercent,
"directScorePerkPercent": adminPerkSet.directScorePerkPercent,
--
Gitblit v1.9.1