提现列表，创客相关

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

@@ -33,7 +33,7 @@ public interface MerchantProfitMapper extends BaseMapper<MerchantProfit> {
     List<MerchantProfit> queryMerchantProfitPage(Map map);
 
     Integer queryMerchantProfitPageCount(Map map);
-    Integer queryMerchantProfitPageCountV2(@Param("userId") String userId);
+    Integer queryMerchantProfitPageCountV2(@Param("userId") String userId, @Param("startTime") Date startTime,@Param("endTime") Date endTime);
 
     void saveMerchantProfitBatch(List<MerchantProfit> merchantProfitList);
     
@@ -135,6 +135,15 @@ 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);
+    @Select("SELECT\n" +
+            "\tcount(*) \n" +
+            "FROM\n" +
+            "\ttb_pluss_user_promotion \n" +
+            "WHERE\n" +
+            "\tparent_user_id = #{userId}\n" +
+            "\tAND type_code = #{typeCode}"+
+            "\tAND is_extend = '0'")
+    Integer getCountQuotaChild( @Param("userId") Long userId,@Param("typeCode") String typeCod);
     Integer getCountChildV2( @Param("userId") Long userId);
 
     List<MerChannelStatusVO> getChannelStatus(@Param("merchantCode") String merchantCode);

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

@@ -17,7 +17,7 @@ public interface UserMakerFlowMapper  extends BaseMapper<UserMakerFlow> {
             "\tmf.id,\n" +
             "\tmf.biz_code AS bizCode,\n" +
             "\tmf.biz_name AS bizName,\n" +
-            "\tbi.alias AS userName,\n" +
+            "\tmo.merchantName AS userName,\n" +
             "\tmf.amount AS lowerAmount,\n" +
             "\tmf.create_time AS createTime,\n" +
             "\tmo.consumeFee AS amount \n" +

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

@@ -922,6 +922,7 @@
         WHERE
              up.parent_user_id = #{userId}
           AND up.type_code = #{typeCode}
+          AND up.is_extend ='0'
         <if test="userName != null and userName != ''">
             AND ua.userName = #{userName}
         </if>
@@ -1074,6 +1075,7 @@
             user_id
             )
             AND v.userId != #{userId}
+            AND v.transDt BETWEEN #{startTime} AND #{endTime}
         ORDER BY
             v.id DESC
     </select>