Merge remote-tracking branch 'origin/master'

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

@@ -132,6 +132,7 @@ public class CompanyController extends BaseController
                 callerService.updateCompanyVoiceCaller(caller);
             }
         }
+        company.setUpdateMiniApp(true);
         return toAjax(companyService.updateCompany(company));
     }
 

fs-admin/src/main/java/com/fs/his/controller/FsCompanyController.java

@@ -145,6 +145,7 @@ public class FsCompanyController extends BaseController
     public AjaxResult edit(@RequestBody Company company)
     {
         company.setMoney(null);
+        company.setUpdateMiniApp(true);
         return toAjax(companyService.updateCompany(company));
     }
 

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -12,6 +12,7 @@ import com.fs.company.domain.CompanyMiniapp;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyMiniappService;
 import com.fs.company.service.ICompanyUserService;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.*;
 import com.fs.course.mapper.*;
@@ -136,6 +137,8 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
     private IQwSopTempContentService qwSopTempContentService;
     @Autowired
     private IQwSopTempVoiceService qwSopTempVoiceService;
+    @Autowired
+    private CloudHostProper cloudHostProper;
 
     // Blocking queues with bounded capacity to implement backpressure
     private final BlockingQueue<QwSopLogs> qwSopLogsQueue = new LinkedBlockingQueue<>(20000);
@@ -1261,6 +1264,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         link.setCorpId(logVo.getCorpId());
         link.setCourseId(courseId.longValue());
         link.setQwExternalId(Long.parseLong(externalId));
+        link.setProjectCode(cloudHostProper.getProjectCode());
 
         if (StringUtil.strIsNullOrEmpty(isOfficial)){
             link.setLinkType(3);

fs-service/src/main/java/com/fs/company/domain/Company.java

@@ -121,6 +121,9 @@ public class Company extends BaseEntity
     @TableField(exist = false)
     private List<String> miniAppServer;
 
+    @TableField(exist = false)
+    private boolean updateMiniApp;
+
     /** 后台制单是否需要付款 默认1 0-否 1-是*/
     private Integer isPay;
 

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

@@ -265,7 +265,9 @@ public class CompanyServiceImpl implements ICompanyService
     public int updateCompany(Company company)
     {
         company.setUpdateTime(DateUtils.getNowDate());
-        bindMiniApp(company);
+        if(company.isUpdateMiniApp()){
+            bindMiniApp(company);
+        }
         return companyMapper.updateCompany(company);
     }
     // 绑定小程序

fs-service/src/main/java/com/fs/config/cloud/CloudHostProper.java

@@ -12,4 +12,7 @@ public class CloudHostProper {
 
     @Value("${headerImg.imgUrl}")
     private String headerImg;
+
+    @Value("${cloud_host.projectCode}")
+    private String projectCode;
 }

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

@@ -66,4 +66,7 @@ public class FsCourseLink extends BaseEntity
     private String uNo;
 //    private String link_uuid;
 
+    @ApiModelProperty(value = "项目唯一标识(PS:MYHK)")
+    private String projectCode;
+
 }

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

@@ -45,4 +45,7 @@ public class FsCourseRealLink implements Serializable
     private String chatId;
 
     private Long projectId;//项目ID
+
+    @ApiModelProperty(value = "项目唯一标识(PS:MYHK)")
+    private String projectCode;
 }

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

@@ -265,6 +265,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             fsUserCourseVideo.setListingStartTime(null);
             fsUserCourseVideo.setListingEndTime(null);
         }
+        String videoRedisKey = "h5user:video:duration:" + fsUserCourseVideo.getVideoId();
+        redisCache.setCacheObject(videoRedisKey, fsUserCourseVideo.getDuration());
         return fsUserCourseVideoMapper.updateFsUserCourseVideo(fsUserCourseVideo);
     }
 

fs-service/src/main/java/com/fs/his/service/impl/FsStorePaymentServiceImpl.java

@@ -491,25 +491,12 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService {
         }
         result.put("mchId",config.getMchId()+"");
         result.put("isNew",config.getIsNew());
-
-        // 获取配置信息 (这个地方返回炮灰服务号落地url,调用地方太多，无法一级一级下传，直接再拿一次)
-        String courseJson = configService.selectConfigByKey("course.config");
-        CourseConfig courseConfig = JSONUtil.toBean(courseJson, CourseConfig.class);
-        result.put("h5RewardUrl", Optional.ofNullable(courseConfig)
-                .map(CourseConfig::getUserCourseH5Reward)
-                .orElse(null));
-
         System.out.println("红包返回："+result);
         return result;
     }
 
     // 内部方法：处理新版本的发红包逻辑
     private R sendRedPacketV3Internal(WxSendRedPacketParam param, RedPacketConfig config) {
-        //炮灰小程序,发服务号
-        if (param.getSource()==1 && param.getUser().getMpOpenId()!=null && StringUtils.isNotEmpty(param.getMpAppId())){
-            config.setAppId(param.getMpAppId());
-            param.setOpenId(param.getUser().getMpOpenId());
-        }
 
         WxPayConfig payConfig = new WxPayConfig();
         BeanUtils.copyProperties(config, payConfig);

fs-service/src/main/java/com/fs/sop/service/impl/SopUserLogsInfoServiceImpl.java

@@ -12,6 +12,7 @@ import com.fs.common.utils.date.DateUtil;
 import com.fs.company.domain.CompanyMiniapp;
 import com.fs.company.mapper.CompanyUserMapper;
 import com.fs.company.service.ICompanyMiniappService;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.FsCourseDomainName;
 import com.fs.course.domain.FsCourseLink;
@@ -158,6 +159,8 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
 
     @Autowired
     private ICompanyMiniappService companyMiniappService;
+    @Autowired
+    private CloudHostProper cloudHostProper;
 
     @Override
     public void save(SopUserLogsInfo sopUserLogsInfo) {
@@ -1476,6 +1479,7 @@ public class SopUserLogsInfoServiceImpl implements ISopUserLogsInfoService {
         }
 
         link.setCreateTime(sendTime);
+        link.setProjectCode(cloudHostProper.getProjectCode());
 
         return link;
     }

fs-service/src/main/resources/application-config-dev.yml

@@ -99,6 +99,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 金康健
+  projectCode: DEV
 headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
 ipad:

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 北京存在文化
+  projectCode: BJCZWH
 headerImg:
   imgUrl:
 

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 百年康成
+  projectCode: BNKC
 headerImg:
   imgUrl: https://bnkc-1363824368.cos.ap-chongqing.myqcloud.com/fs/logo/bnkc.png
 ipad:

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 德瑞康
+  projectCode: DRK
 headerImg:
   imgUrl: https://drk-1363981074.cos.ap-chongqing.myqcloud.com/fs/logo/30d7a0d1ec31e5ac16c6e96d5ca76ad.png
 ipad:

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 德瑞康
+  projectCode: DRK
 headerImg:
   imgUrl: https://drk-1363981074.cos.ap-chongqing.myqcloud.com/fs/logo/30d7a0d1ec31e5ac16c6e96d5ca76ad.png
 ipad:

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

@@ -99,6 +99,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 福本源
+  projectCode: FBY
 headerImg:
   imgUrl: https://fbylive.obs.cn-southwest-2.myhuaweicloud.com/fs/20250730/1753840024082.png
 ipad:

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

@@ -83,6 +83,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 恒春来
+  projectCode: HCL
 #看课授权时显示的头像
 headerImg:
   imgUrl: http://hcl-1b2b.obs.cn-south-1.myhuaweicloud.com/fs/20250815/1755228988455.png

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

@@ -78,6 +78,7 @@ tencent_cloud_config:
   proxy: hdt
 cloud_host:
   company_name: 弘德堂
+  projectCode: HDT
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png

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

@@ -71,6 +71,7 @@ tencent_cloud_config:
   proxy: fzhyt
 cloud_host:
   company_name: 宏医堂
+  projectCode: HYT
 headerImg:
   imgUrl: https
 ipad:

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

@@ -83,6 +83,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 弘珍医药
+  projectCode: HZYY
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://hzyy.obs.cn-north-4.myhuaweicloud.com/fs/20250616/1750067609692.png

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 金康健
+  projectCode: JKJ
 headerImg:
   imgUrl: https://jkj-1323137866.cos.ap-chongqing.myqcloud.com/fs/logo/jkj.png
 ipad:

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 金牛明医
+  projectCode: JNMY
 headerImg:
   imgUrl: https
 ipad:

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

@@ -83,6 +83,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 九州在线
+  projectCode: JZZX
 headerImg:
   imgUrl: https://jiuzhouzaixian.obs.cn-southwest-2.myhuaweicloud.com/fs/20250623/1750665141214.png
 ipad:

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

@@ -75,6 +75,7 @@ tencent_cloud_config:
   proxy: kyt
 cloud_host:
   company_name: 宽益堂
+  projectCode: KYT
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/kuanyitang/20250813/6b3b62e01672407c98f0561b73e35f6a.jpg

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

@@ -66,6 +66,7 @@ tencent_cloud_config:
   proxy: lm
 cloud_host:
   company_name: 良苗教育
+  projectCode: LMJY
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://liangmiao.obs.cn-southwest-2.myhuaweicloud.com/fs/20250626/1750922536598.png

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

@@ -83,6 +83,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 同顺堂
+  projectCode: QDTST
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://qdtst-1360717104.cos.ap-nanjing.myqcloud.com/qdtst-1360717104/20250624/937019e4090f46788ef29c4e7df479c3.jpg

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

@@ -75,6 +75,7 @@ tencent_cloud_config:
   proxy: sft
 cloud_host:
   company_name: 四福堂
+  projectCode: SFT
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://sft-1361917636.cos.ap-chongqing.myqcloud.com/sft/20250606/b08b1a6212f44f2998423c8c5d7712ee.png

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

@@ -75,6 +75,7 @@ tencent_cloud_config:
   proxy: sxjz
 cloud_host:
   company_name: 今正科技
+  projectCode: SXJZ
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png

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

@@ -75,6 +75,7 @@ tencent_cloud_config:
   proxy: syysy
 cloud_host:
   company_name: 益善缘
+  projectCode: SYYSY
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/ysy/20250820/2c47e4f105b641b4a49df50a77338e32.png

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 武汉惠名
+  projectCode: WHHM
 headerImg:
   imgUrl: https://whhm-1361716159.cos.ap-chongqing.myqcloud.com/fs/logo/8d71d552783718d726149312bfca24a.png
 ipad:

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

@@ -83,6 +83,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 小访客
+  projectCode: XFK
 headerImg:
   imgUrl: https://xiaofangke-1360933944.cos.ap-nanjing.myqcloud.com/xiaofangke/20250610/9c3fb587d224492e8b61f5dece0b8b7b.png
 ipad:

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 襄之棠
+  projectCode: XZT
 headerImg:
   imgUrl: https://drk-1363981074.cos.ap-chongqing.myqcloud.com/fs/logo/30d7a0d1ec31e5ac16c6e96d5ca76ad.png
 ipad:

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

@@ -78,6 +78,7 @@ tmp_secret_config:
   proxy: fs
 cloud_host:
   company_name: 医健宝
+  projectCode: YJB
 headerImg:
   imgUrl: https://drk-1363981074.cos.ap-chongqing.myqcloud.com/fs/logo/30d7a0d1ec31e5ac16c6e96d5ca76ad.png
 ipad:

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

@@ -75,6 +75,7 @@ tencent_cloud_config:
   proxy: yzt
 cloud_host:
   company_name: 易诊通
+  projectCode: YZT
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://yztcourse-1325300895.cos.ap-guangzhou.myqcloud.com/yztcourse/20250523/e04871a98cc84be39a7f60c084698e21.jpg

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

@@ -65,6 +65,7 @@ tencent_cloud_config:
   proxy: zsjk
 cloud_host:
   company_name: 中食健康
+  projectCode: ZSJK
 headerImg:
   imgUrl: https://zs-1362480099.cos.ap-beijing.myqcloud.com/fs/20250618/4839e2ff3bdb4908b459abea45a04f4b.png
 ipad:

fs-service/src/main/resources/application-config-myhk.yml

@@ -80,6 +80,7 @@ tencent_cloud_config:
   proxy: myhk
 cloud_host:
   company_name: 木易华康
+  projectCode: MYHK
 #看课授权时显示的头像
 headerImg:
   imgUrl: https://fs-1346741853.cos.ap-chengdu.myqcloud.com/fs/20250323/6189704f2e134b84ad9c9e7c9999f103.jpg

fs-service/src/main/resources/application-config-zkzh.yml

@@ -114,6 +114,7 @@ tencent_cloud_config:
   proxy: zkzh
 cloud_host:
   company_name: 中康
+  projectCode: ZKZH
 headerImg:
   imgUrl: https://zkzh-2025.oss-cn-beijing.aliyuncs.com/fs/20250619/e31b5e051a474a7a9b4ad02575b46196.png