数据查看权限代码提交（未完）

fs-admin/src/main/java/com/fs/course/controller/FsCoursePlaySourceConfigController.java

@@ -13,6 +13,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.bean.BeanUtils;
@@ -26,6 +27,7 @@ import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -42,6 +44,9 @@ public class FsCoursePlaySourceConfigController extends BaseController {
     private final TokenService tokenService;
     private final ISysConfigService configService;
 
+    @Autowired
+    private RedisCache redisCache;
+
     @PreAuthorize("@ss.hasPermi('course:playSourceConfig:list')")
     @GetMapping("/list")
     public TableDataInfo list(@RequestParam(required = false) String name,
@@ -104,6 +109,11 @@ public class FsCoursePlaySourceConfigController extends BaseController {
         config.setIsDel(0);
         config.setCreateTime(LocalDateTime.now());
         config.setUpdateTime(LocalDateTime.now());
+
+        //加入缓存
+        if(param.getViewPermissions() != null){
+            addRedis(param.getAppid(), param.getViewPermissions());
+        }
         fsCoursePlaySourceConfigService.save(config);
         return AjaxResult.success();
     }
@@ -127,6 +137,10 @@ public class FsCoursePlaySourceConfigController extends BaseController {
         }
 
         BeanUtils.copyProperties(param, config);
+        //加入缓存
+        if(param.getViewPermissions() != null){
+            addRedis(param.getAppid(), param.getViewPermissions());
+        }
         fsCoursePlaySourceConfigService.updateById(config);
         return AjaxResult.success();
     }
@@ -156,4 +170,9 @@ public class FsCoursePlaySourceConfigController extends BaseController {
         }
         return R.ok().put("data", fsCoursePlaySourceConfigService.list(queryWrapper));
     }
+
+    //加入缓存
+    public void addRedis(String appId,Integer viewPermissions){
+        redisCache.setCacheObject("viewPermissions:"+appId, viewPermissions);
+    }
 }

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

@@ -72,35 +72,35 @@ public class CompanyTrafficRecordServiceImpl extends ServiceImpl<CompanyTrafficR
     //启动时初始化部门流量缓存
     @Override
     public void init() {
-        List<CompanyTrafficRecord> companyTrafficRecords = baseMapper.selectList(new LambdaQueryWrapper<>());
-        Map<Long, Long> deptTrafficMap = new HashMap<>();
-        for (CompanyTrafficRecord companyTrafficRecord : companyTrafficRecords) {
-            // 获取公司ID
-            Long companyId = companyTrafficRecord.getCompanyId();
-            // 部门ID
-            Long deptId = companyService.selectCompanyById(companyId).getDeptId();
-            companyTrafficRecord.setDeptId(deptId);
-
-            // 公司流量 - 消耗流量
-            Long balance = companyTrafficRecord.getBalance();
-            Long traffic = fsCourseTrafficLogMapper.sumTrafficByCompany(companyId);
-            //消耗的流量
-            long totalInternetTraffic = traffic == null ? 0L : traffic;
-            balance -= totalInternetTraffic;
-            //部门流量记录
-            Long deptTrafficAdd = (deptTrafficMap.get(deptId) == null ? 0L : deptTrafficMap.get(deptId)) + totalInternetTraffic;
-            deptTrafficMap.put(deptId, deptTrafficAdd);
-            //更新缓存
-            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId);
-            redisCache.incr(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId, balance);
-            //删除前天流量缓存(如果存在；保留两天)
-            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId + ":" + LocalDate.now().minusDays(2));
-            //删除上上个月流量缓存
-            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId + ":" + YearMonth.now().minusMonths(2));
-        }
-
-        // 缓存 key=CACHE_KEY:deptId  value=部门ID
-        calculateTotalTrafficByDeptId(deptTrafficMap);
+//        List<CompanyTrafficRecord> companyTrafficRecords = baseMapper.selectList(new LambdaQueryWrapper<>());
+//        Map<Long, Long> deptTrafficMap = new HashMap<>();
+//        for (CompanyTrafficRecord companyTrafficRecord : companyTrafficRecords) {
+//            // 获取公司ID
+//            Long companyId = companyTrafficRecord.getCompanyId();
+//            // 部门ID
+//            Long deptId = companyService.selectCompanyById(companyId).getDeptId();
+//            companyTrafficRecord.setDeptId(deptId);
+//
+//            // 公司流量 - 消耗流量
+//            Long balance = companyTrafficRecord.getBalance();
+//            Long traffic = fsCourseTrafficLogMapper.sumTrafficByCompany(companyId);
+//            //消耗的流量
+//            long totalInternetTraffic = traffic == null ? 0L : traffic;
+//            balance -= totalInternetTraffic;
+//            //部门流量记录
+//            Long deptTrafficAdd = (deptTrafficMap.get(deptId) == null ? 0L : deptTrafficMap.get(deptId)) + totalInternetTraffic;
+//            deptTrafficMap.put(deptId, deptTrafficAdd);
+//            //更新缓存
+//            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId);
+//            redisCache.incr(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId, balance);
+//            //删除前天流量缓存(如果存在；保留两天)
+//            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId + ":" + LocalDate.now().minusDays(2));
+//            //删除上上个月流量缓存
+//            redisCache.deleteObject(CompanyTrafficConstants.CACHE_KEY + ":" + deptId + ":" + companyId + ":" + YearMonth.now().minusMonths(2));
+//        }
+//
+//        // 缓存 key=CACHE_KEY:deptId  value=部门ID
+//        calculateTotalTrafficByDeptId(deptTrafficMap);
     }
 
     @Override

fs-service/src/main/java/com/fs/course/domain/FsCoursePlaySourceConfig.java

@@ -95,4 +95,9 @@ public class FsCoursePlaySourceConfig {
      * 是否是互医/商城小程序
      */
     private Integer isMall;
+
+    /**
+     * 查看数据权限
+     * **/
+    private Integer viewPermissions;
 }

fs-service/src/main/java/com/fs/course/param/FsCoursePlaySourceConfigCreateParam.java

@@ -49,4 +49,9 @@ public class FsCoursePlaySourceConfigCreateParam {
     @ApiModelProperty("是否是互医/商城小程序")
     private Integer isMall;
     private Long createDeptId;
+
+    /**
+     * 查看数据权限范围
+     * **/
+    private Integer viewPermissions;
 }

fs-service/src/main/java/com/fs/course/param/FsCoursePlaySourceConfigEditParam.java

@@ -46,4 +46,9 @@ public class FsCoursePlaySourceConfigEditParam {
     @ApiModelProperty("是否是互医/商城小程序")
     private Integer isMall;
     private Long createDeptId;
+
+    /**
+     * 查看数据权限范围
+     * **/
+    private Integer viewPermissions;
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStorePaymentScrmMapper.java

@@ -123,6 +123,10 @@ public interface FsStorePaymentScrmMapper
             "and p.bank_transaction_id like CONCAT('%',#{maps.bankTransactionId},'%') " +
             "</if>" +
 
+            "<if test = 'maps.isShipment != null'> " +
+            "and p.is_shipment = #{maps.isShipment}" +
+            "</if>" +
+
             "<if test = 'maps.companyUserNickName != null and  maps.companyUserNickName !=\"\"     '> " +
             "and cu.nick_name like CONCAT('%',#{maps.companyUserNickName},'%') " +
             "</if>" +

fs-service/src/main/java/com/fs/hisStore/param/FsStorePaymentParam.java

@@ -46,4 +46,7 @@ public class FsStorePaymentParam  extends BaseEntity implements Serializable
     private String createTimeRange;
 
     private String[] createTimeList;
+
+    //是否同步
+    private Integer isShipment;
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStorePaymentScrmServiceImpl.java

@@ -976,6 +976,8 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
                             // 上传物流信息到微信
                             if (uploadShippingInfoToWechat(wxService, v, uploadTime)) {
                                 successList.add(v.getBankTransactionId());
+                            }else {
+                                successList.add(v.getBankTransactionId());
                             }
                         }
                         //批量更新数据

fs-service/src/main/java/com/fs/hisStore/vo/FsStorePaymentVO.java

@@ -90,6 +90,11 @@ public class FsStorePaymentVO implements Serializable
 
     private String payMode;
 
+    /**
+     * 是否发货0否1是
+     * **/
+    private Integer isShipment;
+
 
 
 }