report

cif-service/src/main/java/com/txz/cif/dao/FlowMapper.java

@@ -2,6 +2,11 @@ package com.txz.cif.dao;
 
 import com.txz.cif.core.Mapper;
 import com.txz.cif.model.Flow;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.HashMap;
 
 public interface FlowMapper extends Mapper<Flow> {
+    @Select("SELECT COUNT(DISTINCT user_id)  c_flow WHERE type = #{type} and create_time > #{startTime} and create_time < #{endTime}")
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/dao/RechargeRecordMapper.java

@@ -5,13 +5,17 @@ import com.txz.cif.dao.impl.RechargeRecordMapperImpl;
 import com.txz.cif.model.RechargeRecord;
 import com.txz.cif.web.bo.RechargeRecordBO;
 import com.txz.cif.web.para.RecordParam;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.SelectProvider;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface RechargeRecordMapper extends Mapper<RechargeRecord> {
     
     @SelectProvider(type = RechargeRecordMapperImpl.class, method = "pageList")
     List<RechargeRecordBO> pageList(RecordParam param);
-    
+
+    @Select("SELECT COUNT(DISTINCT user_id)  c_recharge_record WHERE status = #{status} and create_time > #{startTime} and create_time < #{endTime}")
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/service/FlowService.java

@@ -4,6 +4,9 @@ import com.txz.cif.model.Flow;
 import com.txz.cif.core.Service;
 import com.txz.cif.model.RedEnvelope;
 import com.txz.cif.param.*;
+import tk.mybatis.mapper.entity.Condition;
+
+import java.util.HashMap;
 
 /**
  * Created by CodeGenerator on 2022/11/02.
@@ -58,4 +61,5 @@ public interface FlowService extends Service<Flow> {
     Result settle(RedEnvelope redEnvelope);
 
 
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/service/RechargeRecordService.java

@@ -5,6 +5,7 @@ import com.txz.cif.core.Service;
 import com.txz.cif.web.bo.RechargeRecordBO;
 import com.txz.cif.web.para.RecordParam;
 
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -20,4 +21,6 @@ public interface RechargeRecordService extends Service<RechargeRecord> {
     void closeRecharge();
     
     List<RechargeRecordBO> pageList(RecordParam param);
+
+    Integer countByUserId(HashMap map);
 }

cif-service/src/main/java/com/txz/cif/service/impl/FlowServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 
 /**
  * Created by CodeGenerator on 2022/11/02.
@@ -345,5 +346,10 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         return Result.genSuccessResult();
     }
 
+    @Override
+    public Integer countByUserId(HashMap map) {
+        return cFlowMapper.countByUserId(map);
+    }
+
 
 }

cif-service/src/main/java/com/txz/cif/service/impl/RechargeRecordServiceImpl.java

@@ -18,6 +18,7 @@ import tk.mybatis.mapper.entity.Example;
 
 import javax.annotation.Resource;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -80,9 +81,14 @@ public class RechargeRecordServiceImpl extends AbstractService<RechargeRecord> i
                     .build());
         }
     }
-    
+
     @Override
     public List<RechargeRecordBO> pageList(RecordParam param) {
         return rechargeRecordMapper.pageList(param);
     }
+
+    @Override
+    public Integer countByUserId(HashMap map) {
+        return rechargeRecordMapper.countByUserId(map);
+    }
 }

cif-service/src/main/java/com/txz/cif/web/mng/ReportController.java

@@ -76,14 +76,27 @@ public class ReportController extends AbstractApiController {
             Integer num = userService.countByCondition(c);
             return ResultGenerator.genSuccessResult(num);
         } else if (query.getType() == 4){
-            Condition  c = new Condition(RechargeRecord.class);
-            c.createCriteria().andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
-                    .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00")
-                    .andEqualTo("status",2);
-            c.setDistinct(true);
-            c.setCountProperty("user_id");
-            Integer num = rechargeRecordService.countByCondition(c);
+            HashMap map = new HashMap();
+            map.put("status",2);
+            map.put("startTime",query.getDay()+" 00:00:00");
+            map.put("endTime",query.getDay()+" 23:59:59");
+//            Condition  c = new Condition(RechargeRecord.class);
+//            c.createCriteria().andEqualTo("status",2).andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
+//                    .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
+            Integer num = rechargeRecordService.countByUserId(map);
             return ResultGenerator.genSuccessResult(num);
+        } else if (query.getType() == 5){
+//            Condition  c = new Condition(Flow.class);
+//            c.createCriteria().andEqualTo("type",6).andLessThanOrEqualTo("createTime",query.getDay()+" 23:59:59")
+//                    .andGreaterThanOrEqualTo("createTime",query.getDay()+" 00:00:00");
+//            c.setDistinct(true);
+//            c.setCountProperty("user_id");
+
+            HashMap map = new HashMap();
+            map.put("type",6);
+            map.put("startTime",query.getDay()+" 00:00:00");
+            map.put("endTime",query.getDay()+" 23:59:59");
+            Integer integer = flowService.countByUserId(map);
         }
         return ResultGenerator.genSuccessResult(BigDecimal.ZERO);
     }