From a8560eb20f89c32e9c2cdb3e137ece2fa3c10ec4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Jul 2021 16:32:15 +0800
Subject: [PATCH] fix
---
gc-user/src/main/java/com/xzx/gc/user/dto/AdddistribDto.java | 9 +
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 139 +++++++++++++++++++
gc-user/src/main/resources/mapper/user/AccountMapper.xml | 20 ++
gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java | 2
gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java | 24 ++
gc-user/src/main/java/com/xzx/gc/user/dto/DistribListDto.java | 23 +++
gc-user/src/main/java/com/xzx/gc/user/vo/DistribListVo.java | 25 +++
gc-user/src/main/resources/mapper/user/RedPaperRuleMapper.xml | 4
gc-user/src/main/java/com/xzx/gc/user/mapper/RedPaperRuleMapper.java | 2
gc-user/src/main/java/com/xzx/gc/user/dto/UpdateSettingDto.java | 31 ++++
gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java | 4
gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java | 91 ++++++++++++
12 files changed, 364 insertions(+), 10 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
index 341cad8..3f047aa 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/controller/AdminDistribController.java
@@ -1,10 +1,18 @@
package com.xzx.gc.user.controller;
+import cn.hutool.core.util.ObjectUtil;
+import com.xzx.gc.common.constant.CommonEnum;
import com.xzx.gc.common.constant.Constants;
+import com.xzx.gc.common.dto.log.OperationAppLog;
import com.xzx.gc.common.request.BaseController;
+import com.xzx.gc.entity.AccountInfo;
+import com.xzx.gc.entity.RedPaperRule;
import com.xzx.gc.model.JsonResult;
-import com.xzx.gc.user.dto.ViewSettingDto;
+import com.xzx.gc.user.dto.*;
+import com.xzx.gc.user.mapper.AccountMapper;
+import com.xzx.gc.user.mapper.RedPaperRuleMapper;
import com.xzx.gc.user.service.DistribService;
+import com.xzx.gc.user.vo.DistribListVo;
import com.xzx.gc.user.vo.ViewSettingVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -15,12 +23,22 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
@RestController
@Api(tags = {"分銷系統管理"})
public class AdminDistribController extends BaseController {
- @Autowired
+ @Resource
private DistribService distribService;
+
+ @Resource
+ private RedPaperRuleMapper redPaperRuleMapper;
+
+ @Autowired
+ private AccountMapper accountMapper;
/**
* 查看分銷系統设置详情
@@ -29,10 +47,75 @@
@ApiResponses({@ApiResponse( code = 200, message = "success", response = ViewSettingVo.class)})
@ApiOperation(value="分銷系統管理-查看分銷系統设置详情", notes="test: 仅0有正确返回")
public JsonResult<ViewSettingVo> viewSetting(@RequestBody ViewSettingDto viewSettingDto) {
- Long id = viewSettingDto.getId();
- ViewSettingVo viewSettingVo = distribService.viewSetting(id);
+ ViewSettingVo viewSettingVo = distribService.viewSetting("分销规则");
return JsonResult.success(viewSettingVo);
}
+ /**
+ * 更新分銷系統设置
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/distrib/updateSetting.json")
+ @ApiOperation(value="分銷系統管理--更新分銷系統设置", notes="test: 仅0有正确返回")
+ public JsonResult updateSetting(@RequestBody UpdateSettingDto model, HttpServletRequest request) {
+
+ RedPaperRule redPaperRule = redPaperRuleMapper.selectByRuleName("分销规则");
+ if(ObjectUtil.isEmpty(redPaperRule)){
+ distribService.addSetting(model);
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.USER_MODUL_NAME).operateAction("分銷系統管理--新增分銷系統设置").build();
+ mqUtil.sendApp(build);
+ }else{
+ Integer id = model.getId();
+ if(redPaperRule.getId() != id){
+ return JsonResult.failMessage("规则不存在！");
+ }
+ distribService.updateSetting(model);
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.USER_MODUL_NAME).operateAction("分銷系統管理--更新分銷系統设置-" + model.getId()).build();
+ mqUtil.sendApp(build);
+ }
+ return JsonResult.success("操作成功！");
+ }
+
+ @ApiOperation(value = "团长列表")
+ @ApiResponses(
+ @ApiResponse(code = 200, message = "success", response = DistribListVo.class)
+ )
+ @PostMapping(value = Constants.ADMIN_VIEW_PREFIX + "/distrib/distribList.json")
+ public JsonResult<Map<String, Object>> distribList(@RequestBody DistribListDto distribListDto) {
+ return JsonResult.success(distribService.distribList(distribListDto));
+ }
+
+ /**
+ * 新增团长
+ */
+ @PostMapping(Constants.ADMIN_VIEW_PREFIX + "/distrib/adddistrib.json")
+ @ApiOperation(value="分銷系統管理--新增团长", notes="test: 仅0有正确返回")
+ public JsonResult adddistrib(@RequestBody AdddistribDto model, HttpServletRequest request) {
+ String id = model.getId();
+ AccountInfo accountInfo = accountMapper.selectByPrimaryKey(id);
+ if(ObjectUtil.isEmpty(accountInfo)){
+ return JsonResult.failMessage("账户不存在！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getIsHead())
+ || accountInfo.getIsHead() == 1){
+ return JsonResult.failMessage("账户不能重复添加！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getDelFlag())
+ || accountInfo.getDelFlag() == 1){
+ return JsonResult.failMessage("账户已删除！");
+ }
+ if(ObjectUtil.isEmpty(accountInfo.getIsProhibit())
+ || accountInfo.getIsProhibit() == "1"){
+ return JsonResult.failMessage("账户已冻结！");
+ }
+ distribService.adddistrib(model);
+ OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request))
+ .methodName(Constants.USER_MODUL_NAME).operateAction("分銷系統管理--新增团长-"+id).build();
+ mqUtil.sendApp(build);
+ return JsonResult.success("操作成功！");
+ }
+
+
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/AdddistribDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/AdddistribDto.java
new file mode 100644
index 0000000..a735eb2
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/AdddistribDto.java
@@ -0,0 +1,9 @@
+package com.xzx.gc.user.dto;
+
+import lombok.Data;
+
+@Data
+public class AdddistribDto {
+
+ private String Id;
+}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/DistribListDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/DistribListDto.java
new file mode 100644
index 0000000..25dc84b
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/DistribListDto.java
@@ -0,0 +1,23 @@
+package com.xzx.gc.user.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "DistribListDto", description = "团长列表接收参数类")
+public class DistribListDto {
+
+ @ApiModelProperty(value = "第几页", required = true)
+ private int page;
+
+ @ApiModelProperty(value = "每一页数量", required = true)
+ private int limit;
+
+ @ApiModelProperty(value = "查询字段")
+ private String queryCol;
+
+ private String name;
+ private String Phone;
+
+}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/UpdateSettingDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/UpdateSettingDto.java
new file mode 100644
index 0000000..5ba5dee
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/UpdateSettingDto.java
@@ -0,0 +1,31 @@
+package com.xzx.gc.user.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class UpdateSettingDto {
+
+ @ApiModelProperty(value = "Id，没有可以不传")
+ private Integer id;
+
+ //首单奖励(FristReward)元
+ @ApiModelProperty(value = "首单奖励(FristReward)元")
+ private BigDecimal fristReward;
+
+ //团员在完成首单后，（orderNumFrist）笔单内，可以固定积分（regularPoint）+环保币（regularMoneyPercent）方式进行返佣团长
+ @ApiModelProperty(value = "团员在完成首单后，（orderNumFrist）笔单内，可以固定积分（regularPoint）+环保币（regularMoneyPercent）方式进行返佣团长")
+ private Integer orderNumFrist;
+ private Integer regularPoint;
+ private BigDecimal regularMoneyPercent;
+
+ //团员完成（FinishOrderNum）单后，团员每完成一单团长获得(pointReward)积分：
+ @ApiModelProperty(value = "团员完成（FinishOrderNum）单后，团员每完成一单团长获得(pointReward)积分：")
+ private Integer finishOrderNum;
+ private Integer pointReward;
+
+ @ApiModelProperty("0:不启用，1：启用")
+ private Short status;
+}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java b/gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java
index caa7cd2..8c579e2 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/dto/ViewSettingDto.java
@@ -1,9 +1,9 @@
package com.xzx.gc.user.dto;
+import com.xzx.gc.annotation.Query;
import lombok.Data;
@Data
public class ViewSettingDto {
- private Long id;
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
index 452b81f..4fc4dd8 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/AccountMapper.java
@@ -10,6 +10,8 @@
import com.xzx.gc.model.user.AccountVo;
import com.xzx.gc.model.user.UserInfoVo;
import com.xzx.gc.model.user.UserReq;
+import com.xzx.gc.user.dto.DistribListDto;
+import com.xzx.gc.user.vo.DistribListVo;
import com.xzx.gc.util.GcMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@@ -50,5 +52,7 @@
void insertScoreDetailsRet(ScoreDetails scoreDetailsRet);
AccountInfo selectOneByUserId(@Param("userId")String userId);
+
+ List<DistribListVo> selectDsitribListByQueryCol(@Param("record")DistribListDto distribListDto);
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/mapper/RedPaperRuleMapper.java b/gc-user/src/main/java/com/xzx/gc/user/mapper/RedPaperRuleMapper.java
index ac8ca35..95d9dc8 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/mapper/RedPaperRuleMapper.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/mapper/RedPaperRuleMapper.java
@@ -7,4 +7,6 @@
public interface RedPaperRuleMapper extends GcMapper<RedPaperRule> {
RedPaperRule getOne(@Param("now") String now, @Param("ruleType") String ruleType, @Param("partnerId") String partnerId);
+
+ RedPaperRule selectByRuleName(@Param("ruleStr")String ruleStr);
}
\ No newline at end of file
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index 9fb77d2..ae2af57 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -1,9 +1,13 @@
package com.xzx.gc.user.service;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.xzx.gc.common.exception.RestException;
+import com.xzx.gc.common.utils.StringUtils;
import com.xzx.gc.entity.AccountInfo;
import com.xzx.gc.entity.SysMessage;
import com.xzx.gc.entity.UserHeadRelate;
@@ -14,19 +18,42 @@
import com.xzx.gc.user.vo.HeadInfoVo;
import com.xzx.gc.user.vo.HeadProfitListVo;
import com.xzx.gc.user.vo.HeadTeamVo;
+import com.xzx.gc.user.dto.AdddistribDto;
+import com.xzx.gc.user.dto.DistribListDto;
+import com.xzx.gc.user.mapper.AccountMapper;
+import com.xzx.gc.user.mapper.SysMessageMapper;
+import com.xzx.gc.user.mapper.UserHeadRelateMapper;
+import com.xzx.gc.user.mapper.UserShareInfoMapper;
+import com.xzx.gc.user.vo.DistribListVo;
+import com.xzx.gc.user.vo.HeadInfoVo;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.xzx.gc.entity.RedPaperRule;
+import com.xzx.gc.model.JsonResult;
+import com.xzx.gc.user.dto.UpdateSettingDto;
+import com.xzx.gc.user.mapper.RedPaperRuleMapper;
+import com.xzx.gc.user.vo.JhyInfoListVo;
import com.xzx.gc.user.vo.ViewSettingVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
+import java.util.Map;
@Service
@Transactional
public class DistribService {
+ @Resource
+ private RedPaperRuleMapper redPaperRuleMapper;
@Autowired
private UserHeadRelateMapper userHeadRelateMapper;
@Autowired
@@ -38,8 +65,42 @@
@Autowired
private SysMessageMapper sysMessageMapper;
- public ViewSettingVo viewSetting(Long id) {
+ public ViewSettingVo viewSetting(String ruleStr) {
ViewSettingVo viewSettingVo = new ViewSettingVo();
+ RedPaperRule redPaperRule = redPaperRuleMapper.selectByRuleName(ruleStr);
+ if(ObjectUtil.isEmpty(redPaperRule)){
+ viewSettingVo.setFristReward(BigDecimal.ZERO);
+ viewSettingVo.setOrderNumFrist(0);
+ viewSettingVo.setRegularPoint(0);
+ viewSettingVo.setRegularMoneyPercent(BigDecimal.ZERO);
+ viewSettingVo.setFinishOrderNum(0);
+ viewSettingVo.setPointReward(0);
+ viewSettingVo.setStatus((short) 0);
+ }else{
+ String shareRatio = redPaperRule.getShareRatio();
+ if(StrUtil.isNotEmpty(shareRatio)){
+ List<String> shareRatios = StrUtil.split(shareRatio,',',false,false);
+ if(ObjectUtil.isNotEmpty(shareRatios)){
+ viewSettingVo.setId(redPaperRule.getId());
+ viewSettingVo.setFristReward(StrUtil.isEmpty(shareRatios.get(0))?BigDecimal.ZERO:new BigDecimal(shareRatios.get(0)));
+ viewSettingVo.setOrderNumFrist(StrUtil.isEmpty(shareRatios.get(1))?0:Integer.parseInt(shareRatios.get(1)));
+ viewSettingVo.setRegularPoint(StrUtil.isEmpty(shareRatios.get(2))?0:Integer.parseInt(shareRatios.get(2)));
+ viewSettingVo.setRegularMoneyPercent(StrUtil.isEmpty(shareRatios.get(3))?BigDecimal.ZERO:new BigDecimal(shareRatios.get(3)));
+ viewSettingVo.setFinishOrderNum(StrUtil.isEmpty(shareRatios.get(4))?0:Integer.parseInt(shareRatios.get(4)));
+ viewSettingVo.setPointReward(StrUtil.isEmpty(shareRatios.get(5))?0:Integer.parseInt(shareRatios.get(5)));
+ viewSettingVo.setStatus(redPaperRule.getStatus());
+ }
+ }else{
+ viewSettingVo.setId(redPaperRule.getId());
+ viewSettingVo.setFristReward(BigDecimal.ZERO);
+ viewSettingVo.setOrderNumFrist(0);
+ viewSettingVo.setRegularPoint(0);
+ viewSettingVo.setRegularMoneyPercent(BigDecimal.ZERO);
+ viewSettingVo.setFinishOrderNum(0);
+ viewSettingVo.setPointReward(0);
+ viewSettingVo.setStatus((short) 0);
+ }
+ }
return viewSettingVo;
}
@@ -103,4 +164,80 @@
PageHelper.startPage(teamDto.getPage(), teamDto.getLimit());
return userHeadRelateMapper.selectHeadTeamListInPage(teamDto.getUserId());
}
+
+ public void addSetting(UpdateSettingDto model) {
+ RedPaperRule redPaperRule = new RedPaperRule();
+ StringBuffer stringBuffer = new StringBuffer();
+ BigDecimal fristReward = ObjectUtil.isEmpty(model.getFristReward()) ? BigDecimal.ZERO : model.getFristReward();
+ stringBuffer.append(fristReward+",");
+ int orderNumFrist = ObjectUtil.isEmpty(model.getOrderNumFrist()) ? 0 : model.getOrderNumFrist();
+ stringBuffer.append(orderNumFrist+",");
+ int regularPoint = ObjectUtil.isEmpty(model.getRegularPoint()) ? 0 : model.getRegularPoint();
+ stringBuffer.append(regularPoint+",");
+ BigDecimal regularMoneyPercent = ObjectUtil.isEmpty(model.getRegularMoneyPercent()) ? BigDecimal.ZERO : model.getRegularMoneyPercent();
+ stringBuffer.append(regularMoneyPercent+",");
+ int finishOrderNum = ObjectUtil.isEmpty(model.getFinishOrderNum()) ? 0 : model.getFinishOrderNum();
+ stringBuffer.append(finishOrderNum+",");
+ int pointReward = ObjectUtil.isEmpty(model.getPointReward()) ? 0 : model.getPointReward();
+ stringBuffer.append(pointReward);
+ redPaperRule.setStatus((short) 0);
+ redPaperRule.setRuleName("分销规则");
+ redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,finish_order_num,point_reward");
+ redPaperRule.setShareRatio(stringBuffer.toString());
+ redPaperRuleMapper.insert(redPaperRule);
+ }
+
+ public void updateSetting(UpdateSettingDto model) {
+ RedPaperRule redPaperRule = redPaperRuleMapper.selectByPrimaryKey(model.getId());
+ if(ObjectUtil.isNotEmpty(redPaperRule)){
+ StringBuffer stringBuffer = new StringBuffer();
+ BigDecimal fristReward = ObjectUtil.isEmpty(model.getFristReward()) ? BigDecimal.ZERO : model.getFristReward();
+ stringBuffer.append(fristReward+",");
+ int orderNumFrist = ObjectUtil.isEmpty(model.getOrderNumFrist()) ? 0 : model.getOrderNumFrist();
+ stringBuffer.append(orderNumFrist+",");
+ int regularPoint = ObjectUtil.isEmpty(model.getRegularPoint()) ? 0 : model.getRegularPoint();
+ stringBuffer.append(regularPoint+",");
+ BigDecimal regularMoneyPercent = ObjectUtil.isEmpty(model.getRegularMoneyPercent()) ? BigDecimal.ZERO : model.getRegularMoneyPercent();
+ stringBuffer.append(regularMoneyPercent+",");
+ int finishOrderNum = ObjectUtil.isEmpty(model.getFinishOrderNum()) ? 0 : model.getFinishOrderNum();
+ stringBuffer.append(finishOrderNum+",");
+ int pointReward = ObjectUtil.isEmpty(model.getPointReward()) ? 0 : model.getPointReward();
+ stringBuffer.append(pointReward);
+ redPaperRule.setStatus(model.getStatus());
+ redPaperRule.setSharingProfitType("frist_reward,order_num_frist,regular_point,regular_money_percent,finish_order_num,point_reward");
+ redPaperRule.setShareRatio(stringBuffer.toString());
+ redPaperRuleMapper.updateByPrimaryKey(redPaperRule);
+ }
+ }
+
+ public Map<String, Object> distribList(DistribListDto distribListDto) {
+ PageHelper.startPage(distribListDto.getPage(), distribListDto.getLimit());
+ if(StrUtil.isNotEmpty(distribListDto.getQueryCol())){
+ String decode = StringUtils.encode(distribListDto.getQueryCol());
+ distribListDto.setName(decode);
+ distribListDto.setPhone(distribListDto.getQueryCol());
+ }
+ List<DistribListVo> distribListVos = accountMapper.selectDsitribListByQueryCol(distribListDto);
+ if(CollUtil.isNotEmpty(distribListVos)){
+ for(DistribListVo distribListVo : distribListVos){
+ String nickname = distribListVo.getNickname();
+ String decode = StringUtils.decode(nickname);
+ distribListVo.setNickname(decode);
+ }
+ }
+ PageInfo<DistribListVo> pageInfo = new PageInfo<>(distribListVos);
+ Map<String, Object> data = new HashMap<>();
+ int count = Convert.toInt(pageInfo.getTotal());
+ data.put("data", distribListVos);
+ data.put("count", count);
+ data.put("code", 0);
+ return data;
+ }
+
+ public void adddistrib(AdddistribDto model) {
+ String id = model.getId();
+ AccountInfo accountInfo = accountMapper.selectByPrimaryKey(id);
+ accountInfo.setIsHead(1);
+ accountMapper.updateByPrimaryKey(accountInfo);
+ }
}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/DistribListVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/DistribListVo.java
new file mode 100644
index 0000000..38d1e0e
--- /dev/null
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/DistribListVo.java
@@ -0,0 +1,25 @@
+package com.xzx.gc.user.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "DistribListVo", description = "团长返回参数类")
+public class DistribListVo {
+
+ private String id;
+
+ @ApiModelProperty(value = "昵称")
+ private String nickname;
+
+ @ApiModelProperty(value = "手机号码")
+ private String phone;
+
+ @ApiModelProperty(value = "注册时间")
+ private String registTime;
+
+ @ApiModelProperty(value = "是否为团长 1-是 2-否")
+ private String isHead;
+
+}
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java
index 2a32835..49fc677 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/ViewSettingVo.java
@@ -1,6 +1,7 @@
package com.xzx.gc.user.vo;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
@@ -9,9 +10,24 @@
@ApiModel(value = "ViewSettingVo", description = "后台分销系统设置接口返回参数类")
public class ViewSettingVo {
- //首单奖励
- private BigDecimal FristReward;
+ private Integer id;
- //团员在完成首单后，（请输入订单数量）笔单内，可以固定积分+环保币方式进行返佣团长
- private Integer orderNum;
+ //首单奖励(FristReward)元
+ @ApiModelProperty(value = "首单奖励(FristReward)元")
+ private BigDecimal fristReward;
+
+ //团员在完成首单后，（orderNumFrist）笔单内，可以固定积分（regularPoint）+环保币（regularMoneyPercent）方式进行返佣团长
+ @ApiModelProperty(value = "团员在完成首单后，（orderNumFrist）笔单内，可以固定积分（regularPoint）+环保币（regularMoneyPercent）方式进行返佣团长")
+ private Integer orderNumFrist;
+ private Integer regularPoint;
+ private BigDecimal regularMoneyPercent;
+
+ //团员完成（FinishOrderNum）单后，团员每完成一单团长获得(pointReward)积分：
+ @ApiModelProperty(value = "团员完成（FinishOrderNum）单后，团员每完成一单团长获得(pointReward)积分：")
+ private Integer finishOrderNum;
+ private Integer pointReward;
+
+ @ApiModelProperty("开关0：已经关闭，1：正常")
+ private Short status;
+
}
diff --git a/gc-user/src/main/resources/mapper/user/AccountMapper.xml b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
index 2cd6409..14f9d3d 100644
--- a/gc-user/src/main/resources/mapper/user/AccountMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/AccountMapper.xml
@@ -147,4 +147,24 @@
select * from xzx_account_info where user_id = #{userId}
</select>
+ <select id="selectDsitribListByQueryCol" resultType="com.xzx.gc.user.vo.DistribListVo">
+ SELECT
+ a.account_id id,
+ a.is_head isHead,
+ b.nick_name nickname,
+ b.regist_time registTime,
+ b.mobile_phone phone
+ FROM
+ xzx_account_info a
+ LEFT JOIN xzx_user_info b on a.user_id = b.user_id
+ <where>
+ 1=1
+ <if test="record.queryCol != null and record.queryCol != ''">
+ and (b.nick_name like concat('%',#{record.name},'%')
+ or mobile_phone like concat('%',#{record.phone},'%') )
+ </if>
+ </where>
+ order by id desc
+ </select>
+
</mapper>
diff --git a/gc-user/src/main/resources/mapper/user/RedPaperRuleMapper.xml b/gc-user/src/main/resources/mapper/user/RedPaperRuleMapper.xml
index a8b55be..6bcc8b1 100644
--- a/gc-user/src/main/resources/mapper/user/RedPaperRuleMapper.xml
+++ b/gc-user/src/main/resources/mapper/user/RedPaperRuleMapper.xml
@@ -17,4 +17,8 @@
</if>
limit 1
</select>
+
+ <select id="selectByRuleName" resultType="com.xzx.gc.entity.RedPaperRule">
+ select * from xzx_user_redpaper_rule where rule_name = #{ruleStr}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1