修改代理商分润查询逻辑

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantProxyDividendDao.java

@@ -19,6 +19,15 @@ public interface TenantProxyDividendDao extends BaseMapper<TenantProxyDividend>
 
     int insertBatch(@Param("entities") List<TenantProxyDividend> entities);
 
+    /**
+     * 代理商分润查询
+     *
+     * @param param 传入参数
+     *              <p> -  proxyId 代理商id
+     *              <p> -  recommenderId 推荐人id
+     *              <p> -  startData 开始日期 年月日
+     *              <p> -  endData 结束日期 年月日
+     */
     <T> IPage<T> queryProxyDividendInfo(Page<T> page, @Param("param") Map<String, Object> param);
 
 }

mec-biz/src/main/java/com/ym/mec/biz/service/TenantProxyDividendService.java

@@ -18,7 +18,7 @@ public interface TenantProxyDividendService extends IService<TenantProxyDividend
     TenantProxyDividendDao getDao();
 
     /**
-     * 分页查询代理商负责人数据
+     * 代理商分润查询
      *
      * @param param 传入参数
      *

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantProxyDividendServiceImpl.java

@@ -43,7 +43,7 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
     }
 
     /**
-     * 代理商人分润查询
+     * 代理商分润查询
      *
      * @param param 传入参数
      *              <p> -  proxyId 代理商id
@@ -57,7 +57,7 @@ public class TenantProxyDividendServiceImpl extends ServiceImpl<TenantProxyDivid
     @Override
     public ProxyDividendVo queryProxyDividend(Map<String, Object> param) {
         Optional.ofNullable(param.get("startData")).orElseThrow(() -> new BizException("查询的开始日期不能为空！"));
-        Optional.ofNullable(param.get("endData")).orElseThrow(() -> new BizException("查询的结束日期不能为空"));
+        Optional.ofNullable(param.get("endData")).orElseThrow(() -> new BizException("查询的结束日期不能为空！"));
         //拼接时分秒
         BiConsumer<String, String> addTimeCons = (key, time) -> Optional.ofNullable(param.get(key)).map(String::valueOf)
                 .ifPresent(date -> param.put(key, date + " " + time));

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantProxyInfoServiceImpl.java

@@ -195,6 +195,8 @@ public class TenantProxyInfoServiceImpl extends ServiceImpl<TenantProxyInfoDao,
         return baseMapper.queryUserList(param);
     }
 
+
+
     private SysUser getUser() {
         //修改机构基础信息
         return Optional.ofNullable(sysUserFeignService.queryUserInfo())

mec-biz/src/main/resources/config/mybatis/TenantProxyDividendMapper.xml

@@ -37,11 +37,11 @@
         left join tenant_info as c on a.tenant_id_ = c.id_
         left join sys_user as d on c.recommender_ = d.id_
         <where>
-            <if test="param.startDate != null">
-
+            <if test="param.proxyId != null">
+               AND a.proxy_id_ = #{param.proxyId}
             </if>
-            <if test="param.startDate != null">
-
+            <if test="param.recommenderId != null">
+                AND c.recommender_ = #{param.recommenderId}
             </if>
             <if test="param.startDate != null">
                 AND a.active_time_ <![CDATA[ >= ]]> #{param.startDate}

mec-web/src/main/java/com/ym/mec/web/controller/TenantProxyDividendController.java

@@ -41,8 +41,8 @@ public class TenantProxyDividendController extends BaseController {
             @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
             @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
     })
-    @ApiOperation("分页查询代理商负责人数据")
-    @PostMapping(value = "/queryProxyUser")
+    @ApiOperation("代理商分润查询")
+    @PostMapping(value = "/queryProxyDividend")
     public HttpResponseResult<ProxyDividendVo> queryProxyDividend(@RequestBody Map<String, Object> param) {
         return succeed(tenantProxyDividendService.queryProxyDividend(param));
     }