解决时间范围查询BUG

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCommissionServiceImpl.java

@@ -19,11 +19,11 @@ public class ChannelCommissionServiceImpl extends ServiceImpl<ChannelCommissionM
 
 	@Override
 	public int getChannelCommAmtCnt(String channelNo, int days) {
-		return getBaseMapper().getChannelCommAmtCnt(channelNo, days == 1?0: (~(days - 1)));
+		return getBaseMapper().getChannelCommAmtCnt(channelNo, days == 1?0:days);
 	}
 
 	@Override
 	public int getChannelSaleAmtCnt(String channelNo, int days) {
-		return getBaseMapper().getChannelSaleAmtCnt(channelNo, days == 1?0: (~(days - 1)));
+		return getBaseMapper().getChannelSaleAmtCnt(channelNo, days == 1?0:days);
 	}
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelUserRelServiceImpl.java

@@ -24,6 +24,6 @@ public class ChannelUserRelServiceImpl extends ServiceImpl<ChannelUserRelMapper,
 
 	@Override
 	public int getChannelNewUserCnt(String channelNo, int days) {
-		return getBaseMapper().getChannelNewUserCnt(channelNo, days == 1?0: (~(days - 1)));
+		return getBaseMapper().getChannelNewUserCnt(channelNo, days == 1?0:days);
 	}
 }

mp-service/src/main/resources/mapper/channel/ChannelCommissionMapper.xml

@@ -28,7 +28,7 @@
 		from mp_channel_commission t1
 		left join mp_channel t2 on t1.channel_id = t2.channel_id
 		where (t2.channel_no like concat(#{channelNo},'.%') or t2.channel_no = #{channelNo})
-		AND t1.created_time between DATE_ADD(CURDATE(),INTERVAL #{days} DAY) and NOW()
+		AND t1.created_time > DATE_SUB(CURDATE(),INTERVAL #{days} DAY)
 	</select>
 
 
@@ -40,7 +40,7 @@
 			from mp_channel_commission t1
 			left join mp_channel t2 on t1.channel_id = t2.channel_id
 			where (t2.channel_no like concat(#{channelNo},'.%') or t2.channel_no = #{channelNo})
-			AND t1.created_time between DATE_ADD(CURDATE(),INTERVAL #{days} DAY) and NOW()
+			AND t1.created_time > between DATE_SUB(CURDATE(),INTERVAL #{days} DAY)
 			GROUP BY t1.ticket_id
 		) t3
 	</select>

mp-service/src/main/resources/mapper/channel/ChannelUserRelMapper.xml

@@ -32,7 +32,7 @@
 		where (t2.channel_no like concat(#{channelNo}, '.%') or t2.channel_no = #{channelNo})
 		<if test="days != null">
 			<!-- AND date_format(t1.created_time,'%Y-%m-%d') between date_format(DATE_ADD(CURDATE(),INTERVAL #{days} DAY),'%Y-%m-%d') and date_format(CURDATE(),'%Y-%m-%d') -->
-			AND t1.created_time between DATE_ADD(CURDATE(),INTERVAL #{days} DAY) and NOW()
+			AND t1.created_time > DATE_SUB(CURDATE(),INTERVAL #{days} DAY)
 		 </if>
     </select>