From 2ea7a158627ace00d8ee6934361c5b64e6e85bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 26 Aug 2024 15:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E7=BA=AA=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/app/entity/UserEntity.java | 4 +++ .../ywy/controller/YwyApplyController.java | 7 +++++ .../bl/commission/ywy/dao/YwyApplyDao.java | 1 + .../bl/commission/ywy/entity/YwyApply.java | 9 +++++++ .../ywy/service/YwyApplyService.java | 1 + .../ywy/service/impl/YwyApplyServiceImpl.java | 27 +++++++++++++++++++ .../service/impl/TravelConfServiceImpl.java | 15 ++++++++--- .../mapper/bl/commission/ywy/YwyApplyDao.xml | 12 +++++++-- 8 files changed, 70 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/entity/UserEntity.java b/src/main/java/com/sqx/modules/app/entity/UserEntity.java index f4d10f2..b6152fb 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserEntity.java +++ b/src/main/java/com/sqx/modules/app/entity/UserEntity.java @@ -258,4 +258,8 @@ public class UserEntity implements Serializable { private String blFxyCode; + private Integer blIsYwy; + + private String blYwyCode; + } diff --git a/src/main/java/com/sqx/modules/bl/commission/ywy/controller/YwyApplyController.java b/src/main/java/com/sqx/modules/bl/commission/ywy/controller/YwyApplyController.java index 555a136..cf68c9d 100644 --- a/src/main/java/com/sqx/modules/bl/commission/ywy/controller/YwyApplyController.java +++ b/src/main/java/com/sqx/modules/bl/commission/ywy/controller/YwyApplyController.java @@ -53,6 +53,13 @@ public class YwyApplyController { return Result.success(); } + @PostMapping("/updateRate") + @ApiOperation("修改提成比例") + public Result updateRate(YwyApply ywyApply){ + service.updateRate(ywyApply); + return Result.success(); + } + @GetMapping("/findUserPage") @ApiOperation("查询（分页）") public Result findUserPage(YwyApply ywyApply){ diff --git a/src/main/java/com/sqx/modules/bl/commission/ywy/dao/YwyApplyDao.java b/src/main/java/com/sqx/modules/bl/commission/ywy/dao/YwyApplyDao.java index 9bda9a1..a32a595 100644 --- a/src/main/java/com/sqx/modules/bl/commission/ywy/dao/YwyApplyDao.java +++ b/src/main/java/com/sqx/modules/bl/commission/ywy/dao/YwyApplyDao.java @@ -13,5 +13,6 @@ public interface YwyApplyDao extends BaseMapper { int add(YwyApply ywyApply); int update(YwyApply ywyApply); int approve(YwyApply ywyApply); + int updateRate(YwyApply ywyApply); IPage findUserPage(Page page, @Param("params") YwyApply ywyApply); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/ywy/entity/YwyApply.java b/src/main/java/com/sqx/modules/bl/commission/ywy/entity/YwyApply.java index 2ec2033..d617168 100644 --- a/src/main/java/com/sqx/modules/bl/commission/ywy/entity/YwyApply.java +++ b/src/main/java/com/sqx/modules/bl/commission/ywy/entity/YwyApply.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; +import java.math.BigDecimal; /** * @description bl_ywy_apply @@ -76,6 +77,14 @@ public class YwyApply implements Serializable { *审批人 */ private Long approveUser; + /** + *比例 + */ + private BigDecimal rate; + /** + *代理商 + */ + private String agentName; /** *开始时间 */ diff --git a/src/main/java/com/sqx/modules/bl/commission/ywy/service/YwyApplyService.java b/src/main/java/com/sqx/modules/bl/commission/ywy/service/YwyApplyService.java index 536cab2..f03ac03 100644 --- a/src/main/java/com/sqx/modules/bl/commission/ywy/service/YwyApplyService.java +++ b/src/main/java/com/sqx/modules/bl/commission/ywy/service/YwyApplyService.java @@ -9,5 +9,6 @@ public interface YwyApplyService extends IService { int add(YwyApply ywyApply); int update(YwyApply ywyApply); int approve(YwyApply ywyApply); + int updateRate(YwyApply ywyApply); Result findUserPage(YwyApply ywyApply); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/ywy/service/impl/YwyApplyServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/ywy/service/impl/YwyApplyServiceImpl.java index fbd4b11..68778dd 100644 --- a/src/main/java/com/sqx/modules/bl/commission/ywy/service/impl/YwyApplyServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/ywy/service/impl/YwyApplyServiceImpl.java @@ -1,22 +1,34 @@ package com.sqx.modules.bl.commission.ywy.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.UserEntity; +import com.sqx.modules.app.service.UserService; import com.sqx.modules.bl.commission.ywy.dao.YwyApplyDao; import com.sqx.modules.bl.commission.ywy.entity.YwyApply; +import com.sqx.modules.bl.commission.ywy.entity.YwyConfig; import com.sqx.modules.bl.commission.ywy.service.YwyApplyService; +import com.sqx.modules.bl.commission.ywy.service.YwyConfigService; import com.sqx.modules.sys.entity.SysUserEntity; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.Date; @Service public class YwyApplyServiceImpl extends ServiceImpl implements YwyApplyService { + @Autowired + YwyConfigService ywyConfigService; + @Autowired + private UserService userService; + @Override public Result findPage(YwyApply ywyApply){ Page pages=new Page<>(ywyApply.getPage(),ywyApply.getLimit()); @@ -41,9 +53,24 @@ public class YwyApplyServiceImpl extends ServiceImpl impl SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); ywyApply.setApproveTime(sdf.format(new Date())); ywyApply.setApproveUser(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); + UserEntity userEntity = userService.selectUserById(ywyApply.getUserId()); + if(ywyApply.getStatus().equals(1)){ + YwyConfig ywyConfig = ywyConfigService.getOne(new QueryWrapper()); + ywyApply.setRate(ywyConfig.getSalesmanRate()); + userEntity.setBlIsYwy(1); + }else{ + ywyApply.setRate(BigDecimal.ZERO); + userEntity.setBlIsYwy(0); + } + userService.updateById(userEntity); return baseMapper.approve(ywyApply); } + @Override + public int updateRate(YwyApply ywyApply){ + return baseMapper.updateRate(ywyApply); + } + @Override public Result findUserPage(YwyApply ywyApply){ Page pages=new Page<>(ywyApply.getUserPage(),ywyApply.getUserLimit()); diff --git a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java index 05ca93b..7adb274 100644 --- a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java +++ b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java @@ -121,16 +121,23 @@ public class TravelConfServiceImpl extends ServiceImpl