From b08af71547dd7f9afd98d47f6ed0de9aff16acbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 6 Aug 2024 22:52:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fxy/controller/FxyApplyController.java | 14 +- .../fxy/controller/FxyDataController.java | 64 +++++++ .../bl/commission/fxy/dao/FxyApplyDao.java | 3 +- .../bl/commission/fxy/dao/FxyDataDao.java | 17 ++ .../bl/commission/fxy/entity/FxyApply.java | 21 ++- .../bl/commission/fxy/entity/FxyData.java | 162 ++++++++++++++++++ .../fxy/service/FxyApplyService.java | 4 +- .../fxy/service/FxyDataService.java | 11 ++ .../fxy/service/impl/FxyApplyServiceImpl.java | 11 +- .../fxy/service/impl/FxyDataServiceImpl.java | 57 ++++++ .../mapper/bl/commission/fxy/FxyApplyDao.xml | 29 ++-- .../mapper/bl/commission/fxy/FxyDataDao.xml | 146 ++++++++++++++++ .../mapper/bl/commission/jjr/JjrDataDao.xml | 3 +- 13 files changed, 514 insertions(+), 28 deletions(-) create mode 100644 src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyDataController.java create mode 100644 src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyDataDao.java create mode 100644 src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyData.java create mode 100644 src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyDataService.java create mode 100644 src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java create mode 100644 src/main/resources/mapper/bl/commission/fxy/FxyDataDao.xml diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyApplyController.java b/src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyApplyController.java index 6519344..6a76264 100644 --- a/src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyApplyController.java +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyApplyController.java @@ -53,11 +53,17 @@ public class FxyApplyController { return Result.success(); } - @GetMapping("/findUserPage") - @ApiOperation("查询（分页）") - public Result findUserPage(FxyApply fxyApply){ - return service.findUserPage(fxyApply); + @GetMapping("/findSuperiorFxyPage") + @ApiOperation("查询上级分销员（分页）") + public Result findSuperiorFxyPage(FxyApply fxyApply){ + return service.findSuperiorFxyPage(fxyApply); } + @PostMapping("/setSuperiorFxy") + @ApiOperation("设置上级分销员") + public Result setSuperiorFxy(FxyApply fxyApply){ + service.setSuperiorFxy(fxyApply); + return Result.success(); + } } diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyDataController.java b/src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyDataController.java new file mode 100644 index 0000000..62632de --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/controller/FxyDataController.java @@ -0,0 +1,64 @@ +package com.sqx.modules.bl.commission.fxy.controller; + +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.commission.fxy.entity.FxyData; +import com.sqx.modules.bl.commission.fxy.service.FxyDataService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/commission/fxyData") +@Api(value = "分佣管理", tags = {"分销员数据"}) +public class FxyDataController { + + @Autowired + private FxyDataService service; + + @GetMapping("/findPage") + @ApiOperation("查询（分页）") + public Result findPage(FxyData fxyData){ + return service.findPage(fxyData); + } + + @GetMapping("/invitationPage") + @ApiOperation("邀请技师或用户（分页）") + public Result invitationPage(FxyData fxyData){ + return service.invitationPage(fxyData); + } + + @GetMapping("/findOrderPage") + @ApiOperation("分销员订单（分页）") + public Result findOrderPage(FxyData fxyData){ + return service.findOrderPage(fxyData); + } +// +// @GetMapping("/artificerPage") +// @ApiOperation("技师（分页）") +// public Result artificerPage(FxyData fxyData){ +// return service.artificerPage(jjrData); +// } +// +// @PostMapping("/cancelInvitation") +// @ApiOperation("取消邀请技师") +// public Result cancelInvitation(FxyData fxyData){ +// service.cancelInvitation(jjrData); +// return Result.success(); +// } +// +// @GetMapping("/jjrList") +// @ApiOperation("经纪人列表") +// public Result jjrList(FxyData fxyData){ +// return service.findJjrPage(jjrData); +// } +// +// @PostMapping("/modifyJjr") +// @ApiOperation("技师修改经纪人") +// public Result modifyJjr(FxyData fxyData){ +// service.modifyJjr(jjrData); +// return Result.success(); +// } +} diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyApplyDao.java b/src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyApplyDao.java index 802a6a8..18fb501 100644 --- a/src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyApplyDao.java +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyApplyDao.java @@ -13,5 +13,6 @@ public interface FxyApplyDao extends BaseMapper { int add(FxyApply fxyApply); int update(FxyApply fxyApply); int approve(FxyApply fxyApply); - IPage findUserPage(Page page, @Param("params") FxyApply fxyApply); + IPage findSuperiorFxyPage(Page page, @Param("params") FxyApply fxyApply); + int setSuperiorFxy(FxyApply fxyApply); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyDataDao.java b/src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyDataDao.java new file mode 100644 index 0000000..8b25bf5 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/dao/FxyDataDao.java @@ -0,0 +1,17 @@ +package com.sqx.modules.bl.commission.fxy.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.sqx.modules.bl.commission.fxy.entity.FxyData; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface FxyDataDao extends BaseMapper { + IPage findPage(Page page, @Param("params") FxyData fxyData); + IPage invitationPage(Page page, @Param("params") FxyData fxyData); + IPage userPage(Page page, @Param("params") FxyData fxyData); + IPage findOrderPage(Page page, @Param("params") FxyData fxyData); + +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyApply.java b/src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyApply.java index 18418ae..ca4759b 100644 --- a/src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyApply.java +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyApply.java @@ -53,6 +53,21 @@ public class FxyApply implements Serializable { */ @TableField(exist = false) private String invitationCode; + /** + *分销员等级 + */ + @TableField(exist = false) + private String blFxyLevel; + /** + *上级分销员 + */ + @TableField(exist = false) + private String superiorFxy; + /** + *代理商 + */ + @TableField(exist = false) + private String agent; /** *备注 */ @@ -94,11 +109,5 @@ public class FxyApply implements Serializable { @TableField(exist = false) private Integer limit; - @TableField(exist = false) - private Integer userPage; - - @TableField(exist = false) - private Integer userLimit; - public FxyApply() {} } diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyData.java b/src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyData.java new file mode 100644 index 0000000..01b26d4 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/entity/FxyData.java @@ -0,0 +1,162 @@ +package com.sqx.modules.bl.commission.fxy.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * @description bl_fxy_data + * 分销员数据 + * @author caolei + * @date 2024-08-06 + */ +@Data +@TableName("bl_fxy_data") +public class FxyData implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId(type = IdType.AUTO) + /** + * ID + */ + private Long id; + /** + *技师用户ID + */ + @TableField(exist = false) + private Long artificerUserId; + /** + *经纪人用户ID + */ + @TableField(exist = false) + private Long userId; + /** + *姓名 + */ + @TableField(exist = false) + private String name; + /** + *电话 + */ + @TableField(exist = false) + private String phone; + /** + *头像 + */ + @TableField(exist = false) + private String avatar; + /** + *昵称 + */ + @TableField(exist = false) + private String userName; + /** + *分销员等级 + */ + @TableField(exist = false) + private Integer blFxyLevel; + /** + *邀请码 + */ + @TableField(exist = false) + private String invitationCode; + /** + *比例 + */ + @TableField(exist = false) + private BigDecimal rate; + /** + *备注 + */ + @TableField(exist = false) + private String remarks; + /** + *状态 + */ + @TableField(exist = false) + private Integer status; + /** + *创建时间 + */ + @TableField(exist = false) + private String createTime; + /** + *累计邀请用户 + */ + @TableField(exist = false) + private Integer userCount; + /** + *累计邀请下级分析员数量 + */ + @TableField(exist = false) + private Integer fxtCount; + /** + *累计成交订单数量 + */ + @TableField(exist = false) + private Integer ordersCount; + /** + *当日累计邀请用户 + */ + @TableField(exist = false) + private Integer curUserCount; + /** + *当日邀请下级分析员数量 + */ + @TableField(exist = false) + private Integer curFxyCount; + /** + *当日成交订单数量 + */ + @TableField(exist = false) + private Integer curOrdersCount; + /** + *累计获得佣金 + */ + @TableField(exist = false) + private BigDecimal money; + /** + *入住时间 + */ + @TableField(exist = false) + private String approveTime; + /** + *标识 1下级分销 2用户 + */ + @TableField(exist = false) + private String flag; + /** + *订单号 + */ + @TableField(exist = false) + private String tradeNo; + /** + *下单时间 + */ + @TableField(exist = false) + private String payTime; + /** + *开始时间 + */ + @TableField(exist = false) + private String startTime; + /** + *结束时间 + */ + @TableField(exist = false) + private String endTime; + + @TableField(exist = false) + private Integer page; + + @TableField(exist = false) + private Integer limit; + + public FxyData() {} +} diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyApplyService.java b/src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyApplyService.java index 8c1738a..68e8a14 100644 --- a/src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyApplyService.java +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyApplyService.java @@ -9,6 +9,6 @@ public interface FxyApplyService extends IService { int add(FxyApply fxyApply); int update(FxyApply fxyApply); int approve(FxyApply fxyApply); - Result findUserPage(FxyApply fxyApply); - + Result findSuperiorFxyPage(FxyApply fxyApply); + int setSuperiorFxy(FxyApply fxyApply); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyDataService.java b/src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyDataService.java new file mode 100644 index 0000000..ec2bae8 --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/service/FxyDataService.java @@ -0,0 +1,11 @@ +package com.sqx.modules.bl.commission.fxy.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.sqx.common.utils.Result; +import com.sqx.modules.bl.commission.fxy.entity.FxyData; + +public interface FxyDataService extends IService { + Result findPage(FxyData fxyData); + Result invitationPage(FxyData fxyData); + Result findOrderPage(FxyData fxyData); +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java index 1c4b254..47dca32 100644 --- a/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyApplyServiceImpl.java @@ -44,8 +44,13 @@ public class FxyApplyServiceImpl extends ServiceImpl impl } @Override - public Result findUserPage(FxyApply fxyApply){ - Page pages=new Page<>(fxyApply.getUserPage(),fxyApply.getUserLimit()); - return Result.success().put("data",new PageUtils(baseMapper.findUserPage(pages,fxyApply))); + public Result findSuperiorFxyPage(FxyApply fxyApply){ + Page pages=new Page<>(fxyApply.getPage(),fxyApply.getLimit()); + return Result.success().put("data",new PageUtils(baseMapper.findSuperiorFxyPage(pages,fxyApply))); + } + + @Override + public int setSuperiorFxy(FxyApply fxyApply){ + return baseMapper.setSuperiorFxy(fxyApply); } } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java new file mode 100644 index 0000000..89a43de --- /dev/null +++ b/src/main/java/com/sqx/modules/bl/commission/fxy/service/impl/FxyDataServiceImpl.java @@ -0,0 +1,57 @@ +package com.sqx.modules.bl.commission.fxy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.sqx.common.utils.PageUtils; +import com.sqx.common.utils.Result; +import com.sqx.modules.app.entity.UserMoneyDetails; +import com.sqx.modules.app.service.UserMoneyDetailsService; +import com.sqx.modules.artificer.entity.Period; +import com.sqx.modules.bl.commission.fxy.dao.FxyDataDao; +import com.sqx.modules.bl.commission.fxy.entity.FxyData; +import com.sqx.modules.bl.commission.fxy.service.FxyDataService; +import com.sqx.modules.bl.commission.jjr.dao.JjrDataDao; +import com.sqx.modules.bl.commission.jjr.entity.JjrConfig; +import com.sqx.modules.bl.commission.jjr.entity.JjrData; +import com.sqx.modules.bl.commission.jjr.service.JjrConfigService; +import com.sqx.modules.bl.commission.jjr.service.JjrDataService; +import com.sqx.modules.utils.PeriodUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class FxyDataServiceImpl extends ServiceImpl implements FxyDataService { + + @Override + public Result findPage(FxyData fxyData){ + Page pages=new Page<>(fxyData.getPage(),fxyData.getLimit()); + return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,fxyData))); + } + + @Override + public Result invitationPage(FxyData fxyData){ + Page pages=new Page<>(fxyData.getPage(),fxyData.getLimit()); + IPage iPage = null; + if(fxyData.getFlag().equals("1")){ + iPage = baseMapper.invitationPage(pages,fxyData); + }else{ + iPage = baseMapper.userPage(pages,fxyData); + } + return Result.success().put("data",new PageUtils(iPage)); + } + + @Override + public Result findOrderPage(FxyData fxyData){ + Page pages=new Page<>(fxyData.getPage(),fxyData.getLimit()); + return Result.success().put("data",new PageUtils(baseMapper.findOrderPage(pages,fxyData))); + } + +} \ No newline at end of file diff --git a/src/main/resources/mapper/bl/commission/fxy/FxyApplyDao.xml b/src/main/resources/mapper/bl/commission/fxy/FxyApplyDao.xml index ded8201..a5cb3ff 100644 --- a/src/main/resources/mapper/bl/commission/fxy/FxyApplyDao.xml +++ b/src/main/resources/mapper/bl/commission/fxy/FxyApplyDao.xml @@ -4,9 +4,12 @@ - select b.user_id,b.avatar,b.user_name,b.phone,b.invitation_code + + + update tb_user + set bl_fxy_code = #{invitationCode} + where user_id=#{userId} + + \ No newline at end of file diff --git a/src/main/resources/mapper/bl/commission/fxy/FxyDataDao.xml b/src/main/resources/mapper/bl/commission/fxy/FxyDataDao.xml new file mode 100644 index 0000000..e3b74ed --- /dev/null +++ b/src/main/resources/mapper/bl/commission/fxy/FxyDataDao.xml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml b/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml index 56dd836..8eafa7e 100644 --- a/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml +++ b/src/main/resources/mapper/bl/commission/jjr/JjrDataDao.xml @@ -6,7 +6,7 @@