APP微信授权修复、首页统计

fs-admin/src/main/java/com/fs/api/controller/IndexStatisticsController.java

@@ -12,6 +12,7 @@ import com.fs.company.domain.Company;
 import com.fs.company.service.ICompanyService;
 import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.ConfigUtil;
+import com.fs.his.vo.SysDeptConfigLogVo;
 import com.fs.his.vo.SystemGoodsStatisticsVo;
 import com.fs.his.vo.SystemOrderStatisticsVo;
 import com.fs.his.vo.SystemUserStatisticsVo;
@@ -990,6 +991,35 @@ public class IndexStatisticsController {
         if(automaticTodayUserList != null && !automaticTodayUserList.isEmpty()) {
             userInfoVo.setAutomaticTodayUser(fileStatistics(automaticTodayUserList, param));
         }
+
+        //部门信息数据
+        List<SysDeptConfigLogVo> configLogVoList = redisCache.getCacheObject(REDIS_KEY_PREFIX+"dept");
+        if(configLogVoList != null && !configLogVoList.isEmpty()){
+            List<SysDeptConfigLogVo> filteredList = configLogVoList.stream()
+                    .filter(vo -> {
+                        if (param.getDeptId() == null && param.getCompanyId() == null) {
+                            return true;
+                        }
+                        if (param.getDeptId() != null) {
+                            return Objects.equals(vo.getDeptId(), param.getDeptId());
+                        }
+                        return false;
+                    })
+                    .collect(Collectors.toList());
+
+            if(!filteredList.isEmpty()){
+                BigDecimal totalRedPackage = filteredList.stream()
+                        .map(SysDeptConfigLogVo::getRedPackage)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                Long totalFlowNum = filteredList.stream()
+                        .mapToLong(SysDeptConfigLogVo::getFlowNum)
+                        .sum();
+                userInfoVo.setRedPackage(totalRedPackage);
+                userInfoVo.setFlowNum(totalFlowNum);
+            }
+        }
+
+
         return R.ok().put("data",userInfoVo);
     }
 
@@ -1023,6 +1053,8 @@ public class IndexStatisticsController {
         return num;
     }
 
+
+
     /**
      * 校验是否总公司部门
      * **/

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -78,6 +78,7 @@ import com.fs.sop.domain.QwSopTempVoice;
 import com.fs.sop.service.IQwSopTempVoiceService;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
+import com.fs.system.mapper.SysDeptConfigLogMapper;
 import com.fs.system.service.ISysConfigService;
 import com.google.gson.Gson;
 import lombok.extern.slf4j.Slf4j;
@@ -236,6 +237,9 @@ public class Task {
     @Autowired
     private FsStoreProductScrmMapper storeProductScrmMapper;
 
+    @Autowired
+    private SysDeptConfigLogMapper sysDeptConfigLogMapper;
+
     //统计redis_key
     private final String REDIS_KEY_PREFIX = "system:statistics:";
 
@@ -1673,6 +1677,9 @@ public class Task {
        //商品总数
        redisCache.setCacheObject(REDIS_KEY_PREFIX+"goods",storeProductScrmMapper.selectGoodsStatistics());
 
+       //获取部门剩余流量和红包
+       redisCache.setCacheObject(REDIS_KEY_PREFIX+"dept",sysDeptConfigLogMapper.selectSysDeptConfigLogListInfo());
+
        log.info("定时任务结束-----------------------------------------》:{}","END");
     }
 

fs-service/src/main/java/com/fs/his/vo/SysDeptConfigLogVo.java

@@ -0,0 +1,19 @@
+package com.fs.his.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 部门剩余数据
+ * **/
+@Data
+public class SysDeptConfigLogVo implements Serializable {
+    //部门id
+    private Long deptId;
+    //部门红包
+    private BigDecimal redPackage;
+    //部门流量
+    private Long flowNum;
+}

fs-service/src/main/java/com/fs/qw/service/impl/QwExternalContactServiceImpl.java

@@ -3782,7 +3782,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
         }
 
         QwCompany qwCompany = iQwCompanyService.getQwCompanyByRedis(corpId);
-
+        log.info("获取企业微信信息------------------》：{}",qwCompany);
         attachments.forEach(att -> {
             // 生成短链的条件判断
             if ("link".equals(att.getMsgtype())
@@ -3834,6 +3834,7 @@ public class QwExternalContactServiceImpl extends ServiceImpl<QwExternalContactM
                         try {
 
                             String mediaId =(String)redisCache.getCacheObject("miniprogram:"+corpId+":"+att.getMiniprogram().getCourseId());
+                            logger.info("小程序mediaId:------------------>{}"+mediaId);
                             if (!StringUtil.strIsNullOrEmpty(mediaId)){
 
                                 FsCourseLinkCreateParam param = new FsCourseLinkCreateParam();

fs-service/src/main/java/com/fs/statis/vo/StatisticsUserInfoVo.java

@@ -3,6 +3,7 @@ package com.fs.statis.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * 销售用户信息
@@ -17,4 +18,8 @@ public class StatisticsUserInfoVo implements Serializable {
     private Long automaticTotalUser;
     //自动今日新增会员数量
     private Long automaticTodayUser;
+    //剩余红包
+    private BigDecimal redPackage;
+    //剩余流量
+    private Long flowNum;
 }

fs-service/src/main/java/com/fs/system/mapper/SysDeptConfigLogMapper.java

@@ -2,6 +2,7 @@ package com.fs.system.mapper;
 
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.his.vo.SysDeptConfigLogVo;
 import com.fs.system.domain.SysDeptConfigLog;
 
 /**
@@ -58,4 +59,11 @@ public interface SysDeptConfigLogMapper extends BaseMapper<SysDeptConfigLog>{
      * @return 结果
      */
     int deleteSysDeptConfigLogByIds(Long[] ids);
+
+    /**
+     * 查询系统部门资源配置使用记录列表
+     *
+     * @return 系统部门资源配置使用记录集合
+     */
+    List<SysDeptConfigLogVo> selectSysDeptConfigLogListInfo();
 }

fs-service/src/main/resources/mapper/deptConfigLog/SysDeptConfigLogMapper.xml

@@ -99,4 +99,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectSysDeptConfigLogListInfo" resultType="com.fs.his.vo.SysDeptConfigLogVo">
+        SELECT
+            dept_id,
+            red_package,
+            flow_num
+        FROM
+            sys_dept_config
+    </select>
 </mapper>

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -195,6 +195,11 @@ public class AppLoginController extends AppBaseController{
                     userMap.setUserId(user.getUserId());
                     userMap.setAppId(updatedAppId);
                     userService.updateFsUser(userMap);
+                }else if(user.getMaOpenId() == null || "".equals(user.getMaOpenId())){
+                    FsUser userUpdate = new FsUser();
+                    userUpdate.setUserId(user.getUserId());
+                    userUpdate.setMaOpenId(openid);
+                    userService.updateFsUser(userUpdate);
                 }
 
                 if (StringUtils.isNotEmpty(param.getJpushId())) {