Merge branch 'master' of http://47.115.223.229:8888/yangjun/sadjv3_java

src/main/java/com/sqx/modules/bl/commission/jjr/controller/JjrDataController.java

@@ -1,6 +1,7 @@
 package com.sqx.modules.bl.commission.jjr.controller;
 
 import com.sqx.common.utils.Result;
+import com.sqx.modules.app.entity.UserMoneyDetails;
 import com.sqx.modules.bl.commission.jjr.entity.JjrData;
 import com.sqx.modules.bl.commission.jjr.service.JjrDataService;
 import io.swagger.annotations.Api;
@@ -31,6 +32,12 @@ public class JjrDataController {
         return service.invitationArtificerPage(jjrData);
     }
 
+    @GetMapping("/moneyDetail")
+    @ApiOperation("获取经纪人收入详细信息")
+    public Result moneyDetail(UserMoneyDetails jjrData){
+        return service.moneyDetail(jjrData);
+    }
+
     @GetMapping("/artificerPage")
     @ApiOperation("技师（分页）")
     public Result artificerPage(JjrData jjrData){

src/main/java/com/sqx/modules/bl/commission/jjr/controller/app/AppJjrController.java

@@ -5,6 +5,7 @@ import com.sqx.common.utils.Result;
 import com.sqx.modules.app.annotation.Login;
 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.entity.JjrData;
 import com.sqx.modules.bl.commission.jjr.service.JjrApplyService;
 import com.sqx.modules.bl.commission.jjr.service.JjrConfigService;
@@ -116,4 +117,10 @@ public class AppJjrController {
         JjrConfig entity = configService.getOne(new QueryWrapper<JjrConfig>());
         return Result.success().put("data",entity);
     }
+
+    @GetMapping("/findList")
+    @ApiOperation("查询列表")
+    public Result findList(JjrConfigLevel jjrConfigLevel){
+        return Result.success().put("data",dataService.findList(jjrConfigLevel));
+    }
 }

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

@@ -3,7 +3,10 @@ package com.sqx.modules.bl.commission.jjr.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.common.utils.Result;
+import com.sqx.modules.app.entity.UserMoneyDetails;
 import com.sqx.modules.bl.commission.jjr.entity.JjrApply;
+import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
 import com.sqx.modules.bl.commission.jjr.entity.JjrData;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -15,6 +18,7 @@ public interface JjrDataDao extends BaseMapper<JjrData> {
     IPage<JjrData> findPage(Page<JjrData> page, @Param("params") JjrData jjrData);
     IPage<JjrData> invitationArtificerPage(Page<JjrData> page, @Param("params") JjrData jjrData);
     IPage<JjrData> artificerPage(Page<JjrData> page, @Param("params") JjrData jjrData);
+    IPage<UserMoneyDetails> moneyDetail(Page<UserMoneyDetails> page, @Param("params") UserMoneyDetails jjrData);
     IPage<JjrData> findJjrPage(Page<JjrData> page, @Param("params") JjrData jjrData);
     void cancelInvitation(JjrData jjrData);
     JjrData getByCode(String invitationCode);
@@ -22,4 +26,7 @@ public interface JjrDataDao extends BaseMapper<JjrData> {
     JjrData findJjr(JjrData jjrData);
     JjrData getByUserId(Long userId);
 
+    List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel);
+
+
 }

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

@@ -2,11 +2,16 @@ package com.sqx.modules.bl.commission.jjr.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.common.utils.Result;
+import com.sqx.modules.app.entity.UserMoneyDetails;
+import com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel;
 import com.sqx.modules.bl.commission.jjr.entity.JjrData;
 
+import java.util.List;
+
 public interface JjrDataService extends IService<JjrData> {
     Result findPage(JjrData jjrData);
     Result invitationArtificerPage(JjrData jjrData);
+    Result moneyDetail(UserMoneyDetails jjrData);
     Result artificerPage(JjrData jjrData);
     Result findJjrPage(JjrData jjrData);
     void cancelInvitation(JjrData jjrData);
@@ -17,4 +22,7 @@ public interface JjrDataService extends IService<JjrData> {
     Result incomeDetail(Long userId,Integer page, Integer limit);
     Result withdrawalDetail(Long userId,Integer page, Integer limit);
     JjrData getByUserId(Long userId);
+
+    List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel);
+
 }

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

@@ -12,6 +12,7 @@ import com.sqx.modules.artificer.entity.Period;
 import com.sqx.modules.bl.commission.jjr.dao.JjrDataDao;
 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.entity.JjrData;
 import com.sqx.modules.bl.commission.jjr.service.JjrConfigService;
 import com.sqx.modules.bl.commission.jjr.service.JjrDataService;
@@ -50,7 +51,11 @@ public class JjrDataServiceImpl extends ServiceImpl<JjrDataDao, JjrData> impleme
         Page<JjrData> pages=new Page<>(jjrData.getPage(),jjrData.getLimit());
         return Result.success().put("data",new PageUtils(baseMapper.artificerPage(pages,jjrData)));
     }
-
+    @Override
+    public Result moneyDetail(UserMoneyDetails jjrData) {
+        Page<UserMoneyDetails> pages=new Page<>(jjrData.getPage(),jjrData.getLimit());
+        return Result.success().put("data",new PageUtils(baseMapper.moneyDetail(pages,jjrData)));
+    }
     @Override
     public void cancelInvitation(JjrData jjrData){
         baseMapper.cancelInvitation(jjrData);
@@ -181,4 +186,9 @@ public class JjrDataServiceImpl extends ServiceImpl<JjrDataDao, JjrData> impleme
         return baseMapper.getByUserId(userId);
     }
 
+    @Override
+    public List<JjrConfigLevel> findList(JjrConfigLevel jjrConfigLevel){
+        return baseMapper.findList(jjrConfigLevel);
+    }
+
 }

src/main/java/com/sqx/modules/bl/commission/qds/entity/QdsApply.java

@@ -8,6 +8,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @description bl_qds_apply
@@ -110,5 +111,13 @@ public class QdsApply implements Serializable {
     @TableField(exist = false)
     private BigDecimal rate;
 
+    /**
+     *渠道名称
+     */
+    @TableField(exist = false)
+    private String qdmc;
+
     public QdsApply() {}
+
+    List<QdsCode> qdsCodeList;
 }

src/main/java/com/sqx/modules/bl/commission/ywy/controller/app/AppYwyController.java

@@ -1,6 +1,10 @@
 package com.sqx.modules.bl.commission.ywy.controller.app;
 
+import com.google.common.collect.Maps;
 import com.sqx.common.utils.Result;
+import com.sqx.modules.app.entity.UserEntity;
+import com.sqx.modules.app.service.impl.UserServiceImpl;
+import com.sqx.modules.bl.commission.qds.entity.QdsApply;
 import com.sqx.modules.bl.commission.ywy.entity.YwyApply;
 import com.sqx.modules.bl.commission.ywy.service.YwyApplyService;
 import io.swagger.annotations.Api;
@@ -11,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 
 @RestController
 @RequestMapping("/app/commission/ywy")
@@ -23,9 +29,32 @@ public class AppYwyController {
     @GetMapping("/apply")
     @ApiOperation("申请业务员")
     public Result apply(YwyApply ywyApply){
+        YwyApply entity = service.selectByUserId(ywyApply.getUserId());
+        if(entity!=null){
+            if(entity.getStatus().equals(0)){
+                return Result.error("申请审批中");
+            }
+            if(entity.getStatus().equals(1)){
+                return Result.error("申请审批通过，请重新登录");
+            }
+            if(entity.getStatus().equals(2)){
+                return Result.error("申请审批被驳回，驳回原因如下："+entity.getOpinion());
+            }
+        }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         ywyApply.setCreateTime(sdf.format(new Date()));
         service.add(ywyApply);
-        return Result.success();
+        return Result.success("申请成功，等待审批");
+    }
+
+    /**
+     * 查询邀请的渠道商
+     * @param ywyApply
+     * @return
+     */
+    @GetMapping("/queryQds")
+    @ApiOperation("渠道商查询")
+    public Result queryQds(YwyApply ywyApply){
+        return service.queryQds(ywyApply);
     }
 }

src/main/java/com/sqx/modules/bl/commission/ywy/dao/YwyApplyDao.java

@@ -3,10 +3,13 @@ package com.sqx.modules.bl.commission.ywy.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.qds.entity.QdsApply;
 import com.sqx.modules.bl.commission.ywy.entity.YwyApply;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 @Mapper
 public interface YwyApplyDao extends BaseMapper<YwyApply> {
     IPage<YwyApply> findPage(Page<YwyApply> page, @Param("params") YwyApply ywyApply);
@@ -19,4 +22,6 @@ public interface YwyApplyDao extends BaseMapper<YwyApply> {
     IPage<YwyApply> invitationQdsNotBindPage(Page<YwyApply> page, @Param("params") YwyApply ywyApply);
     int deleteQds(YwyApply ywyApply);
     int addQds(YwyApply ywyApply);
+
+    IPage<YwyApply> queryQds(Page<YwyApply> page,@Param("params") YwyApply ywyApply);
 }

src/main/java/com/sqx/modules/bl/commission/ywy/entity/YwyApply.java

@@ -84,6 +84,7 @@ public class YwyApply implements Serializable {
     /**
      *代理商
      */
+    @TableField(exist = false)
     private String agentName;
     /**
      *开始时间

src/main/java/com/sqx/modules/bl/commission/ywy/service/YwyApplyService.java

@@ -2,8 +2,11 @@ package com.sqx.modules.bl.commission.ywy.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.sqx.common.utils.Result;
+import com.sqx.modules.bl.commission.qds.entity.QdsApply;
 import com.sqx.modules.bl.commission.ywy.entity.YwyApply;
 
+import java.util.List;
+
 public interface YwyApplyService extends IService<YwyApply> {
     Result findPage(YwyApply ywyApply);
     int add(YwyApply ywyApply);
@@ -15,4 +18,7 @@ public interface YwyApplyService extends IService<YwyApply> {
     Result invitationQdsNotBindPage(YwyApply ywyApply);
     int deleteQds(YwyApply ywyApply);
     int addQds(YwyApply ywyApply);
+    YwyApply selectByUserId(Long userId);
+
+    Result queryQds(YwyApply ywyApply);
 }

src/main/java/com/sqx/modules/bl/commission/ywy/service/impl/YwyApplyServiceImpl.java

@@ -7,6 +7,8 @@ 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.app.service.impl.UserServiceImpl;
+import com.sqx.modules.bl.commission.qds.entity.QdsApply;
 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;
@@ -14,12 +16,14 @@ 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.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class YwyApplyServiceImpl extends ServiceImpl<YwyApplyDao, YwyApply> implements YwyApplyService {
@@ -99,4 +103,16 @@ public class YwyApplyServiceImpl extends ServiceImpl<YwyApplyDao, YwyApply> impl
         return baseMapper.addQds(ywyApply);
     }
 
+    @Override
+    public YwyApply selectByUserId(Long userId) {
+        QueryWrapper<YwyApply> queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectOne(queryWrapper.eq("user_id",userId));
+    }
+
+    public Result queryQds(YwyApply ywyApply){
+        UserEntity userEntity = userService.queryByUserId(ywyApply.getUserId());
+        ywyApply.setInvitationCode(userEntity.getInvitationCode());
+        Page<YwyApply> pages=new Page<>(ywyApply.getPage(),ywyApply.getLimit());
+        return Result.success().put("data",new PageUtils(baseMapper.queryQds(pages,ywyApply)));
+    }
 }

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

@@ -222,4 +222,19 @@
         where user_id = #{userId}
     </select>
 
+    <select id="findList" resultType="com.sqx.modules.bl.commission.jjr.entity.JjrConfigLevel">
+        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>
+
+    <select id="moneyDetail" resultType="com.sqx.modules.app.entity.UserMoneyDetails">
+        select *
+        from user_money_details
+        where state = 2
+          and type = 1
+          and bl_role = 4
+          and user_id = #{params.userId}
+        order by create_time desc
+    </select>
 </mapper>

src/main/resources/mapper/bl/commission/ywy/YwyApplyDao.xml

@@ -3,6 +3,27 @@
 
 <mapper namespace="com.sqx.modules.bl.commission.ywy.dao.YwyApplyDao">
 
+    <resultMap id="QdsApplyResult" type="com.sqx.modules.bl.commission.qds.entity.QdsApply">
+        <id column="id" property="id"/>
+        <result column="user_id" property="userId"/>
+        <result column="name" property="name"/>
+        <result column="phone" property="phone"/>
+        <result column="lm" property="lm"/>
+        <result column="remarks" property="remarks"/>
+        <result column="create_time" property="createTime"/>
+        <result column="status" property="status"/>
+        <result column="opinion" property="opinion"/>
+        <result column="approve_time" property="approveTime"/>
+        <result column="approve_user" property="approveUser"/>
+        <result column="avatar" property="avatar"/>
+        <result column="invitation_code" property="invitationCode"/>
+        <!-- 处理一对多的关系 -->
+        <collection property="qdsCodeList" ofType="com.sqx.modules.bl.commission.qds.entity.QdsCode">
+            <result column="qdmc" property="name"/>
+            <result column="rate" property="rate"/>
+        </collection>
+    </resultMap>
+
     <select id="findPage" resultType="com.sqx.modules.bl.commission.ywy.entity.YwyApply">
         select a.id,a.user_id,b.avatar,b.user_name,a.name,a.phone,a.remarks,a.create_time,a.status,a.opinion,a.rate,agent.user_name as agentName,b.invitation_code
         from bl_ywy_apply a
@@ -108,6 +129,29 @@
         </if>
         order by b.user_id
     </select>
+    <select id="queryQds" resultMap="QdsApplyResult">
+        select
+            qds.id,
+            qds.user_id,
+            qds.name,
+            qds.phone,
+            qds.lm,
+            qds.remarks,
+            qds.create_time,
+            qds.status,
+            qds.opinion,
+            qds.approve_time,
+            qds.approve_user,
+            tu.avatar,
+            tu.invitation_code,
+            bqc.name as qdmc,
+            bqc.rate as rate
+        from bl_qds_apply qds
+                 left join tb_user tu on qds.user_id = tu.user_id
+                 left join bl_qds_code bqc on tu.user_id = bqc.user_id
+        where qds.user_id in (select user_id from tb_user where bl_ywy_code = #{params.invitationCode})
+        order by qds.create_time desc, bqc.rate desc
+    </select>
 
     <update id="deleteQds" parameterType="com.sqx.modules.bl.commission.ywy.entity.YwyApply">
         update tb_user