diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigController.java b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigController.java index 56156a7..35dc3f4 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigController.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigController.java @@ -47,7 +47,6 @@ public class JjrConfigController { jjrConfig.setCreateTime(sdf.format(new Date())); service.save(jjrConfig); } - applyService.setJjrRate(null); return Result.success(); } } diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigLevelController.java b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigLevelController.java index be896aa..032ceec 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigLevelController.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrConfigLevelController.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/commission/jjrConfigLevel") @Api(value = "分佣管理", tags = {"经纪人配置等级"}) @@ -22,7 +24,7 @@ public class JjrConfigLevelController { @GetMapping("/findList") @ApiOperation("查询列表") public Result findList(JjrConfigLevel jjrConfigLevel){ - return service.findList(jjrConfigLevel); + return Result.success().put("data",service.findList(jjrConfigLevel)); } @PostMapping("/add") diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrApplyDao.java b/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrApplyDao.java index 6c7ae54..ef02422 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrApplyDao.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrApplyDao.java @@ -17,5 +17,4 @@ public interface JjrApplyDao extends BaseMapper { int update(JjrApply jjrApply); int approve(JjrApply jjrApply); IPage findUserPage(Page page, @Param("params") JjrApply jjrApply); - int setRate(JjrApply jjrApply); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrConfigLevel.java b/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrConfigLevel.java index 9147779..ef06ee7 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrConfigLevel.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/entity/JjrConfigLevel.java @@ -31,7 +31,15 @@ public class JjrConfigLevel implements Serializable { */ private String level; /** - *邀请技师人数 + *最小邀请技师人数 + */ + private Integer minNumber; + /** + *最大邀请技师人数 + */ + private Integer maxNumber; + /** + *请技师人数 */ private String peopleNumber; /** diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrApplyService.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrApplyService.java index 3c0e989..61c11c8 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrApplyService.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrApplyService.java @@ -10,5 +10,4 @@ public interface JjrApplyService extends IService { int update(JjrApply jjrApply); void approve(JjrApply jjrApply); Result findUserPage(JjrApply jjrApply); - void setJjrRate(JjrApply jjrApply); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrConfigLevelService.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrConfigLevelService.java index 1364543..27cb8b7 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrConfigLevelService.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrConfigLevelService.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.sqx.common.utils.Result; import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel; +import java.util.List; + public interface JjrConfigLevelService extends IService { - Result findList(JjrConfigLevel jjrConfigLevel); + List findList(JjrConfigLevel jjrConfigLevel); int add(JjrConfigLevel jjrConfigLevel); int update(JjrConfigLevel jjrConfigLevel); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java index dd108c0..6f8d83d 100644 --- a/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java +++ b/src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrApplyServiceImpl.java @@ -8,7 +8,9 @@ import com.sqx.common.utils.Result; import com.sqx.modules.bl.commission.jjr.dao.JjrApplyDao; import com.sqx.modules.bl.commission.jjr.entity.JjrApply; import com.sqx.modules.bl.commission.jjr.entity.JjrConfig; +import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel; import com.sqx.modules.bl.commission.jjr.service.JjrApplyService; +import com.sqx.modules.bl.commission.jjr.service.JjrConfigLevelService; import com.sqx.modules.bl.commission.jjr.service.JjrConfigService; import com.sqx.modules.sys.entity.SysUserEntity; import org.apache.shiro.SecurityUtils; @@ -25,6 +27,9 @@ public class JjrApplyServiceImpl extends ServiceImpl impl @Autowired private JjrConfigService configService; + @Autowired + private JjrConfigLevelService configLevelService; + @Override public Result findPage(JjrApply jjrApply){ Page pages=new Page<>(jjrApply.getPage(),jjrApply.getLimit()); @@ -50,7 +55,6 @@ public class JjrApplyServiceImpl extends ServiceImpl impl jjrApply.setApproveTime(sdf.format(new Date())); jjrApply.setApproveUser(((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUserId()); baseMapper.approve(jjrApply); - setJjrRate(jjrApply); } @Override @@ -59,30 +63,4 @@ public class JjrApplyServiceImpl extends ServiceImpl impl return Result.success().put("data",new PageUtils(baseMapper.findUserPage(pages,jjrApply))); } - @Override - public void setJjrRate(JjrApply jjrApply){ - JjrConfig jjrConfig = configService.getOne(new QueryWrapper()); - if(jjrConfig != null){ - if(jjrApply == null){ - List list = baseMapper.findList(null); - for(int i=0;i implements JjrConfigLevelService { @Override - public Result findList(JjrConfigLevel jjrConfigLevel){ - return Result.success().put("data",baseMapper.findList(jjrConfigLevel)); + public List findList(JjrConfigLevel jjrConfigLevel){ + return baseMapper.findList(jjrConfigLevel); } @Override diff --git a/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml b/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml index f509452..4ec2ec5 100644 --- a/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml +++ b/src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml @@ -79,10 +79,4 @@ order by b.user_id - - update tb_user - set bl_jjr_rate=#{rate} - where user_id=#{userId} - - \ No newline at end of file diff --git a/src/main/resources/mapper/bl/commission/jjr/JjrConfigLevelDao.xml b/src/main/resources/mapper/bl/commission/jjr/JjrConfigLevelDao.xml index 71c1fdf..b4bb561 100644 --- a/src/main/resources/mapper/bl/commission/jjr/JjrConfigLevelDao.xml +++ b/src/main/resources/mapper/bl/commission/jjr/JjrConfigLevelDao.xml @@ -4,20 +4,21 @@ - insert into bl_jjr_config_level(level,people_number,rate,create_time) - values(#{level},#{peopleNumber},#{rate},#{createTime}) + insert into bl_jjr_config_level(level,min_number,max_number,rate,create_time) + values(#{level},#{minNumber},#{maxNumber},#{rate},#{createTime}) update bl_jjr_config_level set level=#{level}, - people_number=#{peopleNumber}, + min_number=#{minNumber}, + max_number=#{maxNumber}, rate=#{rate} where id=#{id}