11-21 活动列表筛选，金豆消费优化

src/main/java/com/example/demo/mapper/cash/CashCollectionMapper.java

@@ -49,7 +49,7 @@ public interface CashCollectionMapper {
     //根据精网号获取市场名
     String getMarketNameByJwcode(Integer jwcode);
     //获取收款活动列表
-    List<RechargeActivity> getActivityList();
+    List<RechargeActivity> getActivityList(@Param("now")LocalDateTime now);
     //查找未同步的订单
     List<GOrder>getUnSync(@Param("size")int size);
     //给同步过去的gOrder设置同步状态

src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java

@@ -158,7 +158,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     //筛选查询直播消费
     @Override
     public Object selectLiveBy(Integer pageNum, Integer pageSize, BeanConsumeLive beanConsumeLive) {
-        PageHelper.startPage(pageNum, pageSize);
+
         String channel=roleMapper.getChannel(beanConsumeLive.getRoleId());
         if (channel==null){
             return "角色频道有误";
@@ -166,7 +166,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
         if (!channel.equals("全部")){
             beanConsumeLive.setLiveChannel(channel);
         }
-
+        PageHelper.startPage(pageNum, pageSize);
         List<BeanConsumeLive> beanConsumeLives = liveMapper.selectLiveBy(beanConsumeLive);
         //int total = liveMapper.selectLiveCount(beanConsumeLive);
         return new PageInfo<>(beanConsumeLives);
@@ -174,7 +174,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
     //筛选查询铁粉消费
     @Override
     public Object selectFanBy(Integer pageNum, Integer pageSize, BeanConsumeFan beanConsumeFan) {
-        PageHelper.startPage(pageNum, pageSize);
+
         String channel=roleMapper.getChannel(beanConsumeFan.getRoleId());
         if (channel==null){
             return "角色频道有误";
@@ -182,6 +182,7 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
         if (!channel.equals("全部")){
             beanConsumeFan.setChannel(channel);
         }
+        PageHelper.startPage(pageNum, pageSize);
         List<BeanConsumeFan> beanConsumeFans = beanConsumeMapper.selectFanBy(beanConsumeFan);
         return new PageInfo<>(beanConsumeFans);
     }

src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java

@@ -326,7 +326,8 @@ public User getNameAndMarket(Integer jwcode) {
     //获取收款活动列表
     @Override
     public List<RechargeActivity> getActivityList() {
-        return cashCollectionMapper.getActivityList();
+        LocalDateTime now = LocalDateTime.now();
+        return cashCollectionMapper.getActivityList(now);
     }
 
     //同步g_order订单到cash_record表

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -222,7 +222,7 @@
         select ra.id,ra.activity_name,ra.business_belong,m.name as area,ra.status
         from recharge_activity ra
         left join market m on m.id=ra.area
-        where  ra.flag=1
+        where  ra.flag=1 and ra.status=1 and  #{now} between start_time and end_time
         </select>
     <!--查找未同步的订单-->
     <select id="getUnSync" resultType="com.example.demo.domain.entity.GOrder">