From 0e0738fea4275eb50c1014dea40ac5cf9f8cf845 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 13 Apr 2023 12:35:24 +0800
Subject: [PATCH] 后台修改
---
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVerifyVo.java | 18 +++
src/main/resources/templates/febs/views/modules/mallMember/agentVerify.html | 104 +++++++++++++++++
src/main/resources/mapper/modules/MallAgentRecordMapper.xml | 12 ++
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java | 19 +++
src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java | 5
src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java | 4
src/main/java/cc/mrbird/febs/mall/vo/ApiMallAgentRecordVo.java | 47 +++++++
src/main/java/cc/mrbird/febs/mall/mapper/MallAgentRecordMapper.java | 3
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 25 ++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 15 ++
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java | 3
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 11 +
src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html | 19 ++
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java | 18 +++
src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java | 6 +
src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java | 1
src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java | 1
src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java | 6
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml | 5
src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java | 4
20 files changed, 313 insertions(+), 13 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index 2398cb7..f26cca9 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -230,6 +230,16 @@
return mallMemberService.getAgentLevelOption();
}
+ /**
+ * 代理-等级选择Option
+ */
+ @GetMapping("agentLevelOption/tree")
+ @ControllerEndpoint(exceptionMessage = "获取等级失败")
+ public List<AdminAgentLevelOptionTreeVo> agentLevelOption() {
+// return mallMemberService.getAgentLevelOption();
+ return mallMemberService.agentLevelOption();
+ }
+
/**
* 代理列表-全部成员
@@ -534,4 +544,13 @@
return mallMemberService.agentAddress();
}
+ /**
+ * 合伙人申请列表-更新
+ */
+ @PostMapping("agentVerifyUpdate")
+ @ControllerEndpoint(operation = "合伙人申请列表-更新", exceptionMessage = "操作失败")
+ public FebsResponse agentVerifyUpdate(@Valid AdminAgentVerifyVo adminAgentVerifyVo) {
+ return mallMemberService.agentVerifyUpdate(adminAgentVerifyVo);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
index b392bf8..b9b7639 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java
@@ -201,6 +201,12 @@
return iApiMallAgentService.agentApply(apiAgentApplyDto);
}
+ @ApiOperation(value = "代理申请信息")
+ @GetMapping(value = "/agentApplyInfo")
+ public FebsResponse agentApplyInfo() {
+ return memberService.agentApplyInfo();
+ }
+
@ApiOperation(value = "合伙人权益")
@GetMapping(value = "/agentDetail")
public FebsResponse agentDetail() {
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
index 970fe4e..25c2a31 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.entity.FebsConstant;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.MallAgentRecordMapper;
import cc.mrbird.febs.mall.mapper.MallSalesmanMapper;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.*;
@@ -23,6 +24,7 @@
private final IAdminMallMemberService mallMemberService;
private final MallSalesmanMapper mallSalesmanMapper;
+ private final MallAgentRecordMapper mallAgentRecordMapper;
public static long idFromMoneyFlow;
@@ -346,5 +348,21 @@
return FebsUtil.view("modules/mallMember/agentAchieveList");
}
+ /**
+ * 合伙人代理等级列表-选择
+ * @param id
+ * @param model
+ * @return
+ */
+ @GetMapping("agentVerify/{id}")
+ @RequiresPermissions("agentVerify:update")
+ public String agentVerify(@PathVariable long id, Model model) {
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(id);
+ AdminAgentVerifyVo data = new AdminAgentVerifyVo();
+ data.setId(mallAgentRecord.getId());
+ model.addAttribute("adminAgentVerifyVo", data);
+ return FebsUtil.view("modules/mallMember/agentVerify");
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java b/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java
index f4583b0..f878930 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallAgentRecord.java
@@ -30,7 +30,7 @@
//充值金额
private BigDecimal amount;
//代理等级
- private Integer agentLevel;
+ private String agentLevel;
//状态 1：:申请中 2：同意 3：拒绝
private Integer state;
@@ -53,4 +53,7 @@
@TableField(exist = false)
private String nickname;
+ @TableField(exist = false)
+ private String agentLevelName;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java
index c86b42f..0f873f3 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java
@@ -27,6 +27,7 @@
DataDictionaryCustom selectDicDataByTypeAndCode(@Param("type") String type, @Param("code") String code);
List<AdminAgentLevelOptionTreeVo> getAgentLevelOption();
+ List<AdminAgentLevelOptionTreeVo> agentLevelOption();
AdminRankAwardUpdateInfoVo getRankAwardUpdateInfoById(@Param("id")long id);
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallAgentRecordMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallAgentRecordMapper.java
index 7cc7f02..dda42c1 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallAgentRecordMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallAgentRecordMapper.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.mall.mapper;
import cc.mrbird.febs.mall.entity.MallAgentRecord;
+import cc.mrbird.febs.mall.vo.ApiMallAgentRecordVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,4 +16,6 @@
void updateStateByMemberId(@Param("memberId")Long memberId);
void deleteByMemberIdAndState(@Param("memberId")Long memberId, @Param("state")Integer applyIng);
+
+ ApiMallAgentRecordVo selectApiMallAgentRecordVoByMemberIdAndState(@Param("memberId")Long memberId, @Param("state")Integer applyIng);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
index 981a0cc..6959760 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallSalesmanMapper.java
@@ -39,4 +39,5 @@
List<AdminMallAgentRecordVo> selectAgentAddressProvince();
List<String> selectAgentAddressCity(@Param("province")String province);
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
index 9e2153f..86c2992 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
@@ -122,4 +122,8 @@
IPage<AdminMallAgentRecordVo> getAgentAchieveList(MallAgentRecord mallAgentRecord, QueryRequest request);
List<AdminMallAgentRecordVo> agentAddress();
+
+ List<AdminAgentLevelOptionTreeVo> agentLevelOption();
+
+ FebsResponse agentVerifyUpdate(AdminAgentVerifyVo adminAgentVerifyVo);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
index 1295350..1565337 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IApiMallMemberService.java
@@ -76,9 +76,11 @@
FebsResponse rechargeWallet(ApiRechargeWalletDto apiRechargeWalletDto);
- void updateMemberAgent(Long memberId);
+ void updateMemberAgent(Long memberId,String levelCode);
FebsResponse agentDetail();
FebsResponse activityInfo();
+
+ FebsResponse agentApplyInfo();
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
index f3fc8bf..3787c52 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -285,6 +285,31 @@
return dataDictionaryCustomMapper.getAgentLevelOption();
}
+
+ @Override
+ public List<AdminAgentLevelOptionTreeVo> agentLevelOption() {
+ return dataDictionaryCustomMapper.agentLevelOption();
+ }
+
+ @Override
+ public FebsResponse agentVerifyUpdate(AdminAgentVerifyVo adminAgentVerifyVo) {
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(adminAgentVerifyVo.getId());
+ if(ObjectUtil.isEmpty(mallAgentRecord)){
+ throw new FebsException("记录不存在");
+ }
+ BigDecimal amount = adminAgentVerifyVo.getAmount();
+ if(BigDecimal.ZERO.compareTo(amount) >= 0){
+ throw new FebsException("请输入正确的金额");
+ }
+ if(StrUtil.isEmpty(adminAgentVerifyVo.getLevelCode())){
+ throw new FebsException("请选择代理级别");
+ }
+ mallAgentRecord.setAgentLevel(adminAgentVerifyVo.getLevelCode());
+ mallAgentRecord.setAmount(adminAgentVerifyVo.getAmount());
+ mallAgentRecordMapper.updateById(mallAgentRecord);
+ return new FebsResponse().success().message("操作成功");
+ }
+
@Override
public IPage<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember) {
Long memberId = mallMember.getId();
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 e42a80e..9c61814 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
@@ -267,6 +267,10 @@
mallMemberVo.setIsAgent(1);
}else if(ObjectUtil.isNotEmpty(mallAgentRecordAgree)){
mallMemberVo.setIsAgent(2);
+ if(StrUtil.isNotEmpty(mallAgentRecordAgree.getAgentLevel())){
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode("AGENT_LEVEL_APPLY", mallAgentRecordAgree.getAgentLevel());
+ mallMemberVo.setAgentLevelName(dataDictionaryCustom.getDescription());
+ }
}else if(ObjectUtil.isNotEmpty(mallAgentRecordDisagree)){
mallMemberVo.setIsAgent(3);
}
@@ -784,12 +788,12 @@
}
@Override
- public void updateMemberAgent(Long memberId) {
+ public void updateMemberAgent(Long memberId,String levelCode) {
mallAgentRecordMapper.updateStateByMemberId(memberId);
//更新用户表中的LEVEL
MallMember mallMember = this.baseMapper.selectById(memberId);
- mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ mallMember.setLevel(levelCode);
this.baseMapper.updateById(mallMember);
}
@@ -825,6 +829,13 @@
return new FebsResponse().success().data(map);
}
+ @Override
+ public FebsResponse agentApplyInfo() {
+ Long memberId = LoginUserUtil.getLoginUser().getId();
+ ApiMallAgentRecordVo apiMallAgentRecordVo = mallAgentRecordMapper.selectApiMallAgentRecordVoByMemberIdAndState(memberId,MallAgentRecord.APPLY_ING);
+ return new FebsResponse().success().data(apiMallAgentRecordVo);
+ }
+
private String getXcxLoginUrl(String code) {
String wechatLoginUrl =xcxProperties.getWecharLoginUrl();
return String.format(wechatLoginUrl, xcxProperties.getXcxAppid(), xcxProperties.getXcxSecret(), code);
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVerifyVo.java b/src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVerifyVo.java
new file mode 100644
index 0000000..b0b9bb9
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVerifyVo.java
@@ -0,0 +1,18 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "AdminAgentVerifyVo", description = "信息返回类")
+public class AdminAgentVerifyVo {
+
+ //ID
+ private Long id;
+ //充值金额
+ private BigDecimal amount;
+ //代理等级
+ private String levelCode;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/vo/ApiMallAgentRecordVo.java b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallAgentRecordVo.java
new file mode 100644
index 0000000..f4ad739
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/vo/ApiMallAgentRecordVo.java
@@ -0,0 +1,47 @@
+package cc.mrbird.febs.mall.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "ApiMallAgentRecordVo", description = "返回参数类")
+public class ApiMallAgentRecordVo {
+ private Long id;
+ //申请人姓名
+ @ApiModelProperty(value = "申请人姓名")
+ private String name;
+ //电话
+ @ApiModelProperty(value = "电话")
+ private String phone;
+ //店铺名称（非必填）
+ @ApiModelProperty(value = "店铺名称（非必填）")
+ private String storeName;
+ //省
+ @ApiModelProperty(value = "省")
+ private String province;
+ //市
+ @ApiModelProperty(value = "市")
+ private String city;
+ //区、县
+ @ApiModelProperty(value = "区、县")
+ private String area;
+ //详细地址
+ @ApiModelProperty(value = "详细地址")
+ private String storeAddress;
+ //充值金额
+ @ApiModelProperty(value = "充值金额")
+ private BigDecimal amount;
+ //代理等级
+ @ApiModelProperty(value = "代理等级")
+ private String agentLevel;
+
+ @ApiModelProperty(value = "代理等级名称")
+ private String agentLevelName;
+
+ //状态 1：:申请中 2：同意 3：拒绝
+ @ApiModelProperty(value = "状态 1：:申请中 2：同意 3：拒绝")
+ private Integer state;
+}
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 37c2cde..137118f 100644
--- a/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
+++ b/src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -78,4 +78,7 @@
@ApiModelProperty(value = "是否是代理 1: 申请中 2：是 3：否")
private Integer isAgent;
+ @ApiModelProperty(value = "代理名称")
+ private String agentLevelName;
+
}
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index 53db50f..4e385ec 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -6,10 +6,7 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
-import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
-import cc.mrbird.febs.mall.entity.MallMemberWallet;
-import cc.mrbird.febs.mall.entity.MallMoneyFlow;
-import cc.mrbird.febs.mall.entity.MallOrderInfo;
+import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
@@ -73,6 +70,8 @@
private IApiMallMemberWalletService memberWalletService;
@Autowired
private IApiMallMemberService mallMemberService;
+ @Autowired
+ private MallAgentRecordMapper mallAgentRecordMapper;
@Autowired
private IXcxPayService iXcxPayService;
@@ -115,6 +114,7 @@
String rechargeNo = (String) jsonObject.get("rechargeNo");
Integer type = (Integer) jsonObject.get("type");
Long memberId = Long.parseLong(jsonObject.get("memberId").toString());
+ Long agentApplyId = Long.parseLong(jsonObject.get("agentApplyId").toString());
// 检验订单状态
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberId(rechargeNo,memberId);
// 校验签名
@@ -139,7 +139,8 @@
log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
//合伙人申请的充值，要更新会员状态为FIRST_LEVEL
if(2 == type){
- mallMemberService.updateMemberAgent(memberId);
+ MallAgentRecord mallAgentRecord = mallAgentRecordMapper.selectById(agentApplyId);
+ mallMemberService.updateMemberAgent(memberId,mallAgentRecord.getAgentLevel());
}
memberWalletService.addBalance(payMoney,memberId);
mallMoneyFlow.setStatus(2);
diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
index 1ab4486..69527a8 100644
--- a/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/pay/service/impl/XcxPayServiceImpl.java
@@ -79,8 +79,12 @@
String productNames = "小程序充值";
MallMember mallMember = mallMemberMapper.selectById(apiRechargeWalletDto.getMemberId());
String rechargeNo = apiRechargeWalletDto.getRechargeNo();
+ Long agentApplyId = apiRechargeWalletDto.getAgentApplyId() == null ? 0L : apiRechargeWalletDto.getAgentApplyId();
Boolean debug = xcxProperties.getDebug();
- String attrStr = "{'rechargeNo':"+rechargeNo+",'memberId':"+mallMember.getId()+",'type':"+apiRechargeWalletDto.getType()+"}";
+ String attrStr = "{'rechargeNo':"+rechargeNo
+ +",'memberId':"+mallMember.getId()
+ +",'agentApplyId':"+agentApplyId
+ +",'type':"+apiRechargeWalletDto.getType()+"}";
if (debug) {
payData = weixinServiceUtil.createRechargeWallet("[测试]" + productNames, rechargeNo,
1, mallMember.getOpenId(), attrStr);
diff --git a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
index ac88217..72da31a 100644
--- a/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
+++ b/src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
@@ -35,6 +35,11 @@
where a.type='AGENT_LEVEL' and a.code != 'ZERO_LEVEL'
</select>
+ <select id="agentLevelOption" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo">
+ select a.code id,a.description name from data_dictionary_custom a
+ where a.type='AGENT_LEVEL_APPLY'
+ </select>
+
<select id="getRankAwardUpdateInfoById" resultType="cc.mrbird.febs.mall.vo.AdminRankAwardUpdateInfoVo">
select a.* from data_dictionary_custom a
where a.id = #{id}
diff --git a/src/main/resources/mapper/modules/MallAgentRecordMapper.xml b/src/main/resources/mapper/modules/MallAgentRecordMapper.xml
index 5234f22..66fcefe 100644
--- a/src/main/resources/mapper/modules/MallAgentRecordMapper.xml
+++ b/src/main/resources/mapper/modules/MallAgentRecordMapper.xml
@@ -12,9 +12,11 @@
<select id="selectMallAgentRecordListInPage" resultType="cc.mrbird.febs.mall.entity.MallAgentRecord">
SELECT
a.*,
+ c.description agentLevelName,
b.name memberName
FROM mall_agent_record a
LEFT JOIN mall_member b on a.member_id = b.id
+ LEFT JOIN data_dictionary_custom c on a.agent_level = c.code
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
@@ -42,4 +44,14 @@
where member_id = #{memberId} and state = #{state}
</delete>
+ <select id="selectApiMallAgentRecordVoByMemberIdAndState" resultType="cc.mrbird.febs.mall.vo.ApiMallAgentRecordVo">
+ select a.*,
+ b.description agentLevelName
+ from mall_agent_record a
+ left join data_dictionary_custom b on a.agent_level = b.CODE
+ where a.member_id = #{memberId}
+ and a.state = #{state}
+ limit 1
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/agentVerify.html b/src/main/resources/templates/febs/views/modules/mallMember/agentVerify.html
new file mode 100644
index 0000000..a278e28
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/mallMember/agentVerify.html
@@ -0,0 +1,104 @@
+<style>
+ #agent-verify {
+ padding: 20px 25px 25px 0;
+ }
+
+ #agent-verify .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #agent-verify #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #agent-verify .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #agent-verify img{
+ max-width:100px
+ }
+
+</style>
+<div class="layui-fluid" id="agent-verify">
+ <form class="layui-form" action="" lay-filter="agent-verify-form">
+ <div class="layui-form-item febs-hide">
+ <label class="layui-form-label febs-form-item-require">用户id：</label>
+ <div class="layui-input-block">
+ <input type="text" name="id" data-th-value="${adminAgentSelectVo.id}">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">充值金额：</label>
+ <div class="layui-input-block">
+ <input type="text" name="amount" lay-verify="required" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">代理等级：</label>
+ <div class="layui-input-inline">
+ <select name="levelCode" class="agent-verify-category" id="levelSelect">
+ <option value="">请选择</option>
+ </select>
+ </div>
+ </div>
+
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="agent-verify-form-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'validate', 'treeSelect', 'eleTree', 'laydate','upload'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ formSelects = layui.formSelects,
+ treeSelect = layui.treeSelect,
+ form = layui.form,
+ laydate = layui.laydate,
+ eleTree = layui.eleTree,
+ adminAgentVerifyVo = [[${adminAgentVerifyVo}]],
+ $view = $('#agent-verify'),
+ upload = layui.upload,
+ validate = layui.validate;
+
+ form.render();
+ laydate.render({
+ elem: '#febs-form-group-date'
+ });
+
+ formSelects.render();
+
+ //(下拉框)
+ $.get(ctx + 'admin/mallMember/agentLevelOption/tree', function (data) {
+ for (var k in data)
+ {
+ $(".agent-verify-category").append("<option value='" + data[k].id + "'>" + data[k].name + "</option>");
+ }
+ layui.use('form', function () {
+ var form = layui.form;
+ form.render();
+ });
+ });
+ initVerifyValue();
+
+ function initVerifyValue() {
+ form.val("agent-verify-form", {
+ "id": adminAgentVerifyVo.id
+ });
+ }
+
+ form.on('submit(agent-verify-form-submit)', function (data) {
+ febs.post(ctx + 'admin/mallMember/agentVerifyUpdate', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-agent-apply-list').find('#reset').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html b/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
index df0777d..b31ba2e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallAgentRecord.html
@@ -98,8 +98,19 @@
layEvent = obj.event;
if (layEvent === 'agree') {
- febs.modal.confirm('通过', '通过用户的代理申请？', function () {
- agree(data.id);
+ // febs.modal.confirm('通过', '通过用户的代理申请？', function () {
+ // agree(data.id);
+ // });
+
+ febs.modal.open('代理申请审核', 'modules/mallMember/agentVerify/' + data.id, {
+ btn: ['确认','取消'],
+ yes: function (index, layero) {
+ $('#agent-verify').find('#submit').trigger('click');
+ $query.click();
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
});
}
if (layEvent === 'disagree') {
@@ -142,7 +153,7 @@
defaultToolbar:[],
cols: [[
{field:'memberName', title:'微信昵称', width:100, rowspan: 2,align: 'center'}
- ,{align: 'center', title: '基本信息', colspan: 7}
+ ,{align: 'center', title: '基本信息', colspan: 9}
,{field: 'state', title: '申请状态',
templet: function (d) {
if (d.state === 1) {
@@ -170,6 +181,8 @@
// {field: 'memberName', title: '微信昵称', minWidth: 150,align:'left'},
{field: 'name', title: '姓名', minWidth: 100,align:'left'},
{field: 'phone', title: '电话', minWidth: 100,align:'left'},
+ {field: 'amount', title: '充值金额', minWidth: 100,align:'left'},
+ {field: 'agentLevelName', title: '等级', minWidth: 100,align:'left'},
{field: 'province', title: '省', minWidth: 100,align:'left'},
{field: 'city', title: '市', minWidth: 100,align:'left'},
{field: 'area', title: '区、县', minWidth: 100,align:'left'},
--
Gitblit v1.9.1