企微查看权限优化，APP配置新增，APP红包优化

fs-admin/src/main/java/com/fs/qw/controller/QwCompanyController.java

@@ -57,9 +57,9 @@ public class QwCompanyController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){//查看部门所有主体信息
             qwCompany.setCreateDeptId(loginUser.getDeptId());
-            qwCompany.setCreateUserId(loginUser.getUserId());
+//            qwCompany.setCreateUserId(loginUser.getUserId());
         }
         List<QwCompany> list = qwCompanyService.selectQwCompanyList(qwCompany);
         return getDataTable(list);

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

@@ -34,7 +34,7 @@ public class FsCourseSendRewardUParam implements Serializable
     private Integer isRoom;
     private Integer sendType;
     private Long periodId;
-    @NotBlank(message = "小程序参数不能为空")
+//    @NotBlank(message = "小程序参数不能为空")
     private String appId; //前端传来的小程序的appid
 
     private String code;

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

@@ -1366,11 +1366,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
 
-        // 判断来源是否是app，如是app，则发放积分奖励
-        int sourceApp = 3;
-        if(sourceApp == param.getSource()){
-            return sendIntegralReward(param, user, log, config);
-        }
+//        // 判断来源是否是app，如是app，则发放积分奖励
+//        int sourceApp = 3;
+//        if(sourceApp == param.getSource()){
+//            return sendIntegralReward(param, user, log, config);
+//        }
 
         // 根据奖励类型发放不同奖励
         switch (config.getRewardType()) {
@@ -1618,8 +1618,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         // 准备发送红包参数
         WxSendRedPacketParam packetParam = new WxSendRedPacketParam();
         packetParam.setOpenId(user.getMpOpenId());
-        // 来源是小程序切换openId
-        if (param.getSource() == 2) {
+        // 来源是小程序或APP切换openId
+        if (param.getSource() == 2 || param.getSource() == 3) {
             //处理多小程序问题
 //            Company company = companyMapper.selectCompanyById(param.getCompanyId());
 //            if (company.getCourseMiniAppId()==null){

fs-service/src/main/resources/application-config-druid-yjb.yml

@@ -9,6 +9,9 @@ logging:
     com.github.binarywang.demo.wx.cp: DEBUG
     me.chanjar.weixin: DEBUG
 wx:
+  open:
+    appId: wx7796a33a71912e32
+    secret: 51601ec1e3247fe1615ef7b55baf95c7
   miniapp:
     configs:
       - appid: wx9e61312fe7ac85c4   #医健宝