医健宝扣除流量缺陷修复

fs-admin/src/main/java/com/fs/company/controller/CompanyTrafficController.java

@@ -71,5 +71,9 @@ public class CompanyTrafficController extends BaseController {
         return R.ok();
     }
 
-    /** 流量统计 TODO 待完善*/
+    /** 流量统计*/
+    @GetMapping(value = "/trafficStatistics")
+    public R trafficStatistics(CompanyTrafficRecord record) {
+        return R.ok().put("tatol","").put("dept","").put("company","");
+    }
 }

fs-common/src/main/java/com/fs/common/core/redis/RedisCache.java

@@ -233,11 +233,11 @@ public class RedisCache
         return redisTemplate.opsForValue().setIfAbsent(key, value, timeout, unit);
     }
 
-    public Long decr(String key, Long delta) {
+    public Long decr(final String key,final Long delta) {
         return redisTemplate.opsForValue().decrement(key, delta);
     }
 
-    public Long incr(String key, Long delta) {
+    public Long incr(final String key,final Long delta) {
         return redisTemplate.opsForValue().increment(key, delta);
     }
 }

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

@@ -57,7 +57,10 @@ public class CompanyTrafficRecordServiceImpl extends ServiceImpl<CompanyTrafficR
             // 获取公司ID
             Long companyId = companyTrafficRecord.getCompanyId();
             // 缓存 key=CACHE_KEY:deptId:companyId  value=剩余流量
-            redisCache.setCacheObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId, balance);
+            //序列化问题，使用incr创建缓存
+            //删除缓存
+            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId);
+            redisCache.incr(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId, balance);
             // 缓存 key=CACHE_KEY:deptId  value=部门ID
             calculateTotalTrafficByDeptId(deptId);
         }
@@ -190,7 +193,8 @@ public class CompanyTrafficRecordServiceImpl extends ServiceImpl<CompanyTrafficR
      */
     private void calculateTotalTrafficByDeptId(Long deptId) {
         Long totalTraffic = baseMapper.calculateTotalTrafficByDeptId(deptId);
-        redisCache.setCacheObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId, totalTraffic);
+        redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId);
+        redisCache.incr(CompanyTrafficConstants.CACHE_KEY + ":" + deptId, totalTraffic);
     }
 
     private boolean doLog(CompanyTrafficRecord companyTrafficRecord, CompanyTrafficRecordChargeParam record) {

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -846,10 +846,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     private Long updateRedisCache(Company company, Long traffic) throws Exception {
         // 分布式扣除流量
         String companyKey = CompanyTrafficConstants.CACHE_KEY + ":" + company.getDeptId() + ":" + company.getCompanyId();
-        String deptKey = CompanyTrafficConstants.CACHE_KEY + ":" + company.getCompanyId();
+        String deptKey = CompanyTrafficConstants.CACHE_KEY + ":" + company.getDeptId();
         String lockKey = companyKey + ":lock";
         //销售公司剩余流量
-        Long companyTraffic = redisCache.getCacheObject(companyKey);
+        Long companyTraffic = ((Integer)redisCache.getCacheObject(companyKey)).longValue();
         if(companyTraffic == null || companyTraffic<0){
             return companyTraffic == null?0:companyTraffic;
         }

fs-user-app/src/main/java/com/fs/app/controller/store/FsUserComplaintController.java

@@ -57,7 +57,7 @@ public class FsUserComplaintController extends AppBaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(fsUserComplaintService.selectFsUserComplaintById(id));
+        return AjaxResult.success(fsUserComplaintService.selectFsUserComplaintVoById(id));
     }
 
     /**