推广部分最后修改

pluss-dao-bundle/src/main/java/cn/pluss/platform/mapper/MerchantProfitMapper.java

@@ -5,6 +5,7 @@ import cn.pluss.platform.dto.MerchantFeeDTO;
 import cn.pluss.platform.entity.MerchantChannelStatus;
 import cn.pluss.platform.entity.MerchantProfit;
 import cn.pluss.platform.vo.DeviceGoodsVO;
+import cn.pluss.platform.vo.MerChannelStatusVO;
 import cn.pluss.platform.vo.MerchantProfitVO;
 import cn.pluss.platform.vo.ProfitOrderVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -32,6 +33,7 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
     List<MerchantProfit> queryMerchantProfitPage(Map map);
 
     Integer queryMerchantProfitPageCount(Map map);
+    Integer queryMerchantProfitPageCountV2(@Param("userId") String userId);
 
     void saveMerchantProfitBatch(List<MerchantProfit> merchantProfitList);
     
@@ -118,7 +120,12 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
     BigDecimal getConsumeFeeTeamToday(@Param("userId") String userId);
 
     List<MerchantProfitVO> getTeamList(@Param("typeCode") String typeCode, @Param("userId") Long userId,
-                                       @Param("userName") String userName);
+                                       @Param("userName") String userName, @Param("pageSize") Integer pageSize,
+                                       @Param("offset") Integer offset);
+    List<MerchantProfitVO> getMerchantTeamList(@Param("typeCode") String typeCode, @Param("userId") Long userId,
+                                       @Param("userName") String userName, @Param("pageSize") Integer pageSize,
+                                       @Param("offset") Integer offset);
+
 
     @Select("SELECT\n" +
             "\tcount(*) \n" +
@@ -128,8 +135,9 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
             "\tparent_user_id = #{userId}\n" +
             "\tAND type_code = #{typeCode}")
     Integer getCountChild( @Param("userId") Long userId,@Param("typeCode") String typeCod);
+    Integer getCountChildV2( @Param("userId") Long userId);
 
-    List<MerchantChannelStatus> getChannelStatus(@Param("merchantCode") String merchantCode);
+    List<MerChannelStatusVO> getChannelStatus(@Param("merchantCode") String merchantCode);
 
     /**
      * 直属交易
@@ -138,10 +146,12 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
      * @param offset
      * @return
      */
-    List<ProfitOrderVO> directlyOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset);
+    List<ProfitOrderVO> directlyOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset,
+                                      @Param("startTime") String startTime, @Param("endTime") String endTime);
     /**
      * 团队交易
      */
-    List<ProfitOrderVO> teamOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset);
+    List<ProfitOrderVO> teamOrder(@Param("userId") Long userId,@Param("pageSize") Integer pageSize,@Param("offset") Integer offset,
+                                  @Param("startTime") String startTime, @Param("endTime") String endTime);
 }
 

pluss-dao-bundle/src/main/resources/mapper/MerchantProfit-sqlmap.xml

@@ -880,7 +880,8 @@
             LEFT JOIN tb_pluss_merchant_base_info b ON b.userId = p.user_id
             LEFT JOIN tb_pluss_merchant_order v ON v.merchantCode = b.merchantCode
         WHERE
-            FIND_IN_SET( p.user_id, ID._ids )
+             b.userId != #{userId}
+          AND FIND_IN_SET( p.user_id, ID._ids )
           AND v.status = 1
     </select>
     <select id="getConsumeFeeTeamToday" resultType="java.math.BigDecimal">
@@ -925,14 +926,65 @@
             AND ua.userName = #{userName}
         </if>
         order by ua.userId DESC
+        LIMIT #{pageSize} OFFSET #{offset}
     </select>
-    <select id="getChannelStatus" resultType="cn.pluss.platform.entity.MerchantChannelStatus">
+
+    <select id="getMerchantTeamList" resultType="cn.pluss.platform.vo.MerchantProfitVO">
+        SELECT
+            p.user_id AS id,
+            u.loginName AS phone,
+            ua.userName,
+            pr.createTime AS createDt,
+            p.parent_user_id,
+            pr.trueName AS parentTrueName,
+            p.type_code,
+            IFNULL( k.sumConsumeFee, 0 ) AS consumeFee,
+            IFNULL( k.yestedayConsumeFee, 0 ) AS yestedayConsumeFee,
+            IFNULL(n.num,0) as countNum,
+            k.merchantCode
+        FROM
+            (
+                SELECT
+                    @ids AS _ids,
+                    ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids,
+            @l := @l + 1 AS LEVEL
+        FROM
+            tb_pluss_user_promotion,
+            ( SELECT @ids := #{userId}, @l := 0 ) b
+        WHERE @ids IS NOT NULL ) ID,
+            tb_pluss_user_promotion p
+            LEFT JOIN tb_pluss_user_info u ON p.user_id = u.id
+            LEFT JOIN tb_pluss_user_info pr ON p.parent_user_id = pr.id
+            left join view_order_user_num n on p.user_id=n.userId
+            LEFT JOIN tb_pluss_user_app ua ON n.userId = ua.userId
+            LEFT JOIN (
+            SELECT
+            i.userId,
+            i.merchantCode,
+            IFNULL( sum( i.sumConsumeFee ), 0 ) AS sumConsumeFee,
+            IFNULL( sum( i.yestedayConsumeFee ), 0 ) AS yestedayConsumeFee
+            FROM
+            view_order_info i
+            GROUP BY
+            i.userId
+            ) k ON p.user_id = k.userId
+        WHERE
+            FIND_IN_SET( p.user_id, ID._ids )
+          AND p.user_id != #{userId}
+        <if test="userName != null and userName != ''">
+          AND u.trueName = #{userName}
+        </if>
+        ORDER BY
+            user_id
+        LIMIT #{pageSize} OFFSET #{offset}
+    </select>
+    <select id="getChannelStatus" resultType="cn.pluss.platform.vo.MerChannelStatusVO">
         SELECT
             `status`, authorizationStatus,remark,virChannelFlag
         FROM
             tb_pluss_merchant_channel_status
         WHERE merchantCode = #{merchantCode}
-
+        AND virChannelFlag != 1
     </select>
     <select id="directlyOrder" resultType="cn.pluss.platform.vo.ProfitOrderVO">
         SELECT
@@ -943,6 +995,12 @@
         FROM
             view_base_order v
         WHERE v.userId in (select p.user_id from tb_pluss_user_promotion p where p.parent_user_id= #{userId})
+        <if test="startTime != null">
+            AND v.createDt &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND v.createDt &lt;= #{endTime}
+        </if>
         order by v.id desc
         limit #{pageSize}  offset #{offset}
     </select>
@@ -978,8 +1036,80 @@
             user_id
             )
         and  v.userId!=#{userId}
+        <if test="startTime != null">
+            AND v.createDt &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND v.createDt &lt;= #{endTime}
+        </if>
         ORDER BY
             v.id desc
         limit #{pageSize}  offset #{offset}
     </select>
+    <select id="queryMerchantProfitPageCountV2" resultType="java.lang.Integer">
+        SELECT
+            COUNT(v.userId)
+        FROM
+            view_base_order v
+        WHERE
+                v.userId IN (
+                SELECT
+                    p.user_id
+                FROM
+                    (
+                        SELECT
+                            @ids AS _ids,
+                            ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids,
+                    @l := @l + 1 AS LEVEL
+        FROM
+            tb_pluss_user_promotion,
+            ( SELECT @ids := #{userId}, @l := 0 ) b
+        WHERE
+            @ids IS NOT NULL
+            ) ID,
+            tb_pluss_user_promotion p
+        WHERE
+            FIND_IN_SET( p.user_id, ID._ids )
+        ORDER BY
+            user_id
+            )
+            AND v.userId != #{userId}
+        ORDER BY
+            v.id DESC
+    </select>
+    <select id="getCountChildV2" resultType="java.lang.Integer">
+        SELECT
+            count(p.user_id)
+        FROM
+            (
+                SELECT
+                    @ids AS _ids,
+                    ( SELECT @ids := GROUP_CONCAT( user_id ) FROM tb_pluss_user_promotion WHERE FIND_IN_SET( parent_user_id, @ids ) ) AS cids,
+            @l := @l + 1 AS LEVEL
+        FROM
+            tb_pluss_user_promotion,
+            ( SELECT @ids := #{userId}, @l := 0 ) b
+        WHERE @ids IS NOT NULL ) ID,
+            tb_pluss_user_promotion p
+            LEFT JOIN tb_pluss_user_info u ON p.user_id = u.id
+            LEFT JOIN tb_pluss_user_info pr ON p.parent_user_id = pr.id
+            LEFT JOIN view_order_user_num n ON p.user_id = n.userId
+            LEFT JOIN tb_pluss_user_app ua ON n.userId = ua.userId
+            LEFT JOIN (
+            SELECT
+            i.userId,
+            i.merchantCode,
+            IFNULL( sum( i.sumConsumeFee ), 0 ) AS sumConsumeFee,
+            IFNULL( sum( i.yestedayConsumeFee ), 0 ) AS yestedayConsumeFee
+            FROM
+            view_order_info i
+            GROUP BY
+            i.userId
+            ) k ON p.user_id = k.userId
+        WHERE
+            FIND_IN_SET( p.user_id, ID._ids )
+          AND p.user_id != #{userId}
+        ORDER BY
+            user_id
+    </select>
 </mapper>

pluss-dao-bundle/src/main/resources/mapper/UserApp-sqlmap.xml

@@ -1674,6 +1674,7 @@
         LEFT JOIN tb_pluss_user_promotion up ON ua.userId = up.parent_user_id
         WHERE
         up.parent_user_id = #{userId}
+        AND up.type_code = 'MC'
         AND up.create_time <![CDATA[ >= ]]> #{startTime}
         AND up.create_time <![CDATA[ <= ]]> #{endTime}
     </select>