首页余额，消耗，流量统计修改

fs-company/src/main/java/com/fs/company/controller/company/IndexStatisticsController.java

@@ -1,18 +1,35 @@
 package com.fs.company.controller.company;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.utils.PubFun;
 import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.date.DateUtil;
+import com.fs.company.domain.Company;
+import com.fs.company.domain.CompanyTrafficRecord;
+import com.fs.company.domain.CompanyTrafficRecordLog;
+import com.fs.company.mapper.CompanyMapper;
+import com.fs.company.mapper.CompanyMoneyLogsMapper;
+import com.fs.company.mapper.CompanyTrafficRecordLogMapper;
+import com.fs.company.mapper.CompanyTrafficRecordMapper;
 import com.fs.framework.security.LoginUser;
 import com.fs.framework.service.TokenService;
 import com.fs.statis.StatisticsRedisConstant;
 import com.fs.statis.dto.*;
 import com.fs.statis.service.IStatisticsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import static com.fs.statis.StatisticsRedisConstant.*;
 
@@ -30,6 +47,34 @@ public class IndexStatisticsController {
 
     @Autowired
     private IStatisticsService statisticsService;
+    @Autowired
+    private CompanyMoneyLogsMapper moneyLogsMapper;
+    @Autowired
+    private CompanyMapper companyMapper;
+    @Autowired
+    private CompanyTrafficRecordMapper companyTrafficRecordMapper;
+    @Autowired
+    private CompanyTrafficRecordLogMapper companyTrafficRecordLogMapper;
+    @Value("${cloud_host.company_name}")
+    private String signProjectName;
+
+    Function<Long, String> tranTraffic = traffic -> {
+        int unitInt = 1024;
+        BigDecimal unit = BigDecimal.valueOf(unitInt);
+        BigDecimal kb = BigDecimal.valueOf(traffic);
+        if(traffic < unitInt){
+            return traffic + "KB";
+        }
+        BigDecimal mb = kb.divide(unit, 2, RoundingMode.HALF_UP);
+        if(mb.doubleValue() < unitInt){
+            return mb + "MB";
+        }
+        BigDecimal gb = mb.divide(unit, 2, RoundingMode.HALF_UP);
+        if(gb.doubleValue() < unitInt){
+            return mb + "GB";
+        }
+        return gb.divide(unit, 2, RoundingMode.HALF_UP) + "TB";
+    };
 
     /**
      * 分析概览
@@ -62,9 +107,17 @@ public class IndexStatisticsController {
     public R rechargeComsumption(){
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long companyId = loginUser.getCompany().getCompanyId();
-
-        ConsumptionBalanceDataDTO consumptionBalanceDataDTO = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_BALANCE,companyId));
-        return R.ok().put("data", consumptionBalanceDataDTO);
+        ConsumptionBalanceDataDTO dto;
+        if("医健宝".equals(signProjectName)){
+            dto = new ConsumptionBalanceDataDTO();
+            Company company = companyMapper.selectCompanyById(companyId);
+            List<BigDecimal> subList = moneyLogsMapper.selectCompanyRedPackage(companyId);
+            dto.setBalance(company.getMoney());
+            dto.setTodayComsumption(subList.stream().map(BigDecimal::abs).reduce(BigDecimal.ZERO, BigDecimal::add));
+        }else{
+            dto = redisCache.getCacheObject(String.format("%s:%d",StatisticsRedisConstant.DATA_OVERVIEW_DEALER_BALANCE,companyId));
+        }
+        return R.ok().put("data", dto);
     }
 
     /**
@@ -75,7 +128,21 @@ public class IndexStatisticsController {
     public R getTrafficLog(){
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         Long companyId = loginUser.getCompany().getCompanyId();
-        TrafficLogDTO trafficLogDTO = redisCache.getCacheObject(String.format("%s:%d",DATA_OVERVIEW_TRAFFIC_LOG,companyId));
+        CompanyTrafficRecord companyTrafficRecord = companyTrafficRecordMapper.selectOne(new QueryWrapper<CompanyTrafficRecord>().eq("company_id", companyId));
+        TrafficLogDTO trafficLogDTO;
+        if("医健宝".equals(signProjectName)){
+            trafficLogDTO = new TrafficLogDTO();
+            if(companyTrafficRecord != null){
+                trafficLogDTO.setTraffic(tranTraffic.apply(companyTrafficRecord.getBalance()));
+                List<CompanyTrafficRecordLog> monthLogs = companyTrafficRecordLogMapper.selectMonth(companyId);
+                List<CompanyTrafficRecordLog> toDayLos = monthLogs.stream().filter(e -> DateUtil.dateToLocalDateTime(e.getCreateTime()).toLocalDate().equals(LocalDate.now())).collect(Collectors.toList());
+                Function<List<CompanyTrafficRecordLog>, Long> traffic = list -> list.stream().mapToLong(CompanyTrafficRecordLog::getTrafficAmount).sum();
+                trafficLogDTO.setToday(traffic.apply(toDayLos));
+                trafficLogDTO.setThisMonth(traffic.apply(monthLogs));
+            }
+        }else{
+            trafficLogDTO = redisCache.getCacheObject(String.format("%s:%d",DATA_OVERVIEW_TRAFFIC_LOG,companyId));
+        }
         return R.ok().put("data",trafficLogDTO);
     }
 

fs-service/src/main/java/com/fs/company/mapper/CompanyMoneyLogsMapper.java

@@ -326,4 +326,6 @@ public interface CompanyMoneyLogsMapper
     Integer selectCompanyMoneyLogsExport1Counts(@Param("maps")FsCompanyMoneyLogsExportParam param);
 
     List<CompanyRedPackage> selectCompanyRedPackageListVO(CompanyRedPackage companyRedPackage);
+
+    List<BigDecimal> selectCompanyRedPackage(@Param("companyId") Long companyId);
 }

fs-service/src/main/java/com/fs/company/mapper/CompanyTrafficRecordLogMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.company.domain.CompanyTrafficRecordLog;
 import com.fs.company.param.CompanyTrafficRecordLogQueryParam;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -11,4 +12,6 @@ import java.util.List;
 public interface CompanyTrafficRecordLogMapper extends BaseMapper<CompanyTrafficRecordLog> {
 
     List<CompanyTrafficRecordLog> list(CompanyTrafficRecordLogQueryParam record);
+
+    List<CompanyTrafficRecordLog> selectMonth(@Param("companyId") Long companyId);
 }

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -1353,11 +1353,7 @@ public class CompanyServiceImpl implements ICompanyService
                 companyMapper.updateCompany(company);
                 CompanyMoneyLogs log=new CompanyMoneyLogs();
                 log.setCompanyId(company.getCompanyId());
-                if(end != null && start.getHour() != end.getHour()){
-                    log.setRemark("扣除"+start.getHour() + "到" + end.getHour() +"点红包金额");
-                }else{
-                    log.setRemark("扣除"+start.getHour()+"点红包金额");
-                }
+                log.setRemark("扣除"+start.getHour() + "到" + end.getHour() +"点红包金额");
                 log.setMoney(money.multiply(new BigDecimal(-1)));
                 log.setLogsType(15);
                 log.setBalance(company.getMoney());

fs-service/src/main/resources/mapper/company/CompanyMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectCompanyById" parameterType="Long" resultMap="CompanyResult">
+    <select id="selectCompanyById" parameterType="Long" resultType="com.fs.company.domain.Company">
         <include refid="selectCompanyVo"/>
         where company_id = #{companyId}
     </select>

fs-service/src/main/resources/mapper/company/CompanyMoneyLogsMapper.xml

@@ -94,5 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{logsId}
         </foreach>
     </delete>
-    
+
+    <select id="selectCompanyRedPackage" resultType="java.math.BigDecimal">
+        select money from company_money_logs where logs_type = 15 and company_id = #{companyId} and DATE(create_time) = DATE(now())
+    </select>
 </mapper>

fs-service/src/main/resources/mapper/company/CompanyTrafficRecordLogMapper.xml

@@ -34,4 +34,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
+
+    <select id="selectMonth" resultType="com.fs.company.domain.CompanyTrafficRecordLog">
+        select * from company_traffic_record_log where company_id = #{companyId} and operation_type = 2 and date_format(create_time,'%y%m') = date_format(now(),'%y%m')
+    </select>
 </mapper>