经纪人

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();
     }
 }

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")

src/main/java/com/sqx/modules/bl/commission/jjr/dao/JjrApplyDao.java

@@ -17,5 +17,4 @@ public interface JjrApplyDao extends BaseMapper<JjrApply> {
     int update(JjrApply jjrApply);
     int approve(JjrApply jjrApply);
     IPage<JjrApply> findUserPage(Page<JjrApply> page, @Param("params") JjrApply jjrApply);
-    int setRate(JjrApply jjrApply);
 }

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;
     /**

src/main/java/com/sqx/modules/bl/commission/jjr/service/JjrApplyService.java

@@ -10,5 +10,4 @@ public interface JjrApplyService extends IService<JjrApply> {
     int update(JjrApply jjrApply);
     void approve(JjrApply jjrApply);
     Result findUserPage(JjrApply jjrApply);
-    void setJjrRate(JjrApply jjrApply);
 }

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<JjrConfigLevel> {
-    Result findList(JjrConfigLevel jjrConfigLevel);
+    List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel);
     int add(JjrConfigLevel jjrConfigLevel);
     int update(JjrConfigLevel jjrConfigLevel);
 }

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<JjrApplyDao, JjrApply> impl
     @Autowired
     private JjrConfigService configService;
 
+    @Autowired
+    private JjrConfigLevelService configLevelService;
+
     @Override
     public Result findPage(JjrApply jjrApply){
         Page<JjrApply> pages=new Page<>(jjrApply.getPage(),jjrApply.getLimit());
@@ -50,7 +55,6 @@ public class JjrApplyServiceImpl extends ServiceImpl<JjrApplyDao, JjrApply> 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<JjrApplyDao, JjrApply> impl
         return Result.success().put("data",new PageUtils(baseMapper.findUserPage(pages,jjrApply)));
     }
 
-    @Override
-    public void setJjrRate(JjrApply jjrApply){
-        JjrConfig jjrConfig = configService.getOne(new QueryWrapper<JjrConfig>());
-        if(jjrConfig != null){
-            if(jjrApply == null){
-                List<JjrApply> list = baseMapper.findList(null);
-                for(int i=0;i<list.size();i++){
-                    JjrApply entity = list.get(i);
-                    BigDecimal rate = jjrConfig.getRate();
-                    rate = rate.divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
-                    entity.setRate(rate);
-                    baseMapper.setRate(entity);
-                }
-            }else{
-                JjrApply entity = baseMapper.selectById(jjrApply.getId());
-                if(jjrApply.getStatus() == 1){
-                    BigDecimal rate = jjrConfig.getRate();
-                    rate = rate.divide(new BigDecimal(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
-                    entity.setRate(rate);
-                }else if(jjrApply.getStatus() == 2){
-                    entity.setRate(BigDecimal.ZERO);
-                }
-                baseMapper.setRate(entity);
-            }
-        }
-    }
 }

src/main/java/com/sqx/modules/bl/commission/jjr/service/impl/JjrConfigLevelServiceImpl.java

@@ -8,13 +8,14 @@ import com.sqx.modules.bl.commission.jjr.service.JjrConfigLevelService;
 import org.springframework.stereotype.Service;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class JjrConfigLevelServiceImpl extends ServiceImpl<JjrConfigLevelDao, JjrConfigLevel> implements JjrConfigLevelService {
 
     @Override
-    public Result findList(JjrConfigLevel jjrConfigLevel){
+    public List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel){
-        return Result.success().put("data",baseMapper.findList(jjrConfigLevel));
+        return baseMapper.findList(jjrConfigLevel);
     }
 
     @Override

src/main/resources/mapper/bl/commission/jjr/JjrApplyDao.xml

@@ -79,10 +79,4 @@
         order by b.user_id
     </select>
 
-    <update id="setRate" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrApply">
-        update tb_user
-        set bl_jjr_rate=#{rate}
-        where user_id=#{userId}
-    </update>
-
 </mapper>

src/main/resources/mapper/bl/commission/jjr/JjrConfigLevelDao.xml

@@ -4,20 +4,21 @@
 <mapper namespace="com.sqx.modules.bl.commission.jjr.dao.JjrConfigLevelDao">
 
     <select id="findList" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel">
-        select id,level,people_number,rate,create_time
+        select id,level,min_number,max_number,rate,create_time,concat(min_number,'至',max_number,'人') as peopleNumber
         from bl_jjr_config_level
         order by id desc
     </select>
 
     <insert id="add" useGeneratedKeys="true"  keyProperty="id" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel">
-        insert into bl_jjr_config_level(level,people_number,rate,create_time)
+        insert into bl_jjr_config_level(level,min_number,max_number,rate,create_time)
-        values(#{level},#{peopleNumber},#{rate},#{createTime})
+        values(#{level},#{minNumber},#{maxNumber},#{rate},#{createTime})
     </insert>
 
     <update id="update" parameterType="com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel">
         update bl_jjr_config_level
         set level=#{level},
-            people_number=#{peopleNumber},
+            min_number=#{minNumber},
+            max_number=#{maxNumber},
             rate=#{rate}
         where id=#{id}
     </update>