|
@@ -7,6 +7,7 @@ import com.fs.common.core.redis.RedisCache;
|
|
|
import com.fs.common.exception.base.BaseException;
|
|
import com.fs.common.exception.base.BaseException;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
import com.fs.common.utils.StringUtils;
|
|
|
import com.fs.common.utils.date.DateUtil;
|
|
import com.fs.common.utils.date.DateUtil;
|
|
|
|
|
+import com.fs.common.utils.spring.SpringUtils;
|
|
|
import com.fs.company.domain.CompanyMiniapp;
|
|
import com.fs.company.domain.CompanyMiniapp;
|
|
|
import com.fs.company.service.ICompanyMiniappService;
|
|
import com.fs.company.service.ICompanyMiniappService;
|
|
|
import com.fs.course.domain.FsCoursePlaySourceConfig;
|
|
import com.fs.course.domain.FsCoursePlaySourceConfig;
|
|
@@ -52,9 +53,6 @@ public class IpadSendServer {
|
|
|
private final RedisCache redisCache;
|
|
private final RedisCache redisCache;
|
|
|
private final ICompanyMiniappService companyMiniappService;
|
|
private final ICompanyMiniappService companyMiniappService;
|
|
|
|
|
|
|
|
- @Value("${cloud_host.company_name}")
|
|
|
|
|
- private String signProjectName;
|
|
|
|
|
-
|
|
|
|
|
private void sendMiniProgram(BaseVo vo, QwSopCourseFinishTempSetting.Setting content, Map<String, FsCoursePlaySourceConfig> miniMap, Long companyId) {
|
|
private void sendMiniProgram(BaseVo vo, QwSopCourseFinishTempSetting.Setting content, Map<String, FsCoursePlaySourceConfig> miniMap, Long companyId) {
|
|
|
String appid = content.getMiniprogramAppid();
|
|
String appid = content.getMiniprogramAppid();
|
|
|
if(companyId != null && content.getMiniType() != null){
|
|
if(companyId != null && content.getMiniType() != null){
|
|
@@ -63,7 +61,7 @@ public class IpadSendServer {
|
|
|
if(!collect.isEmpty() && collect.get(0) != null && StringUtils.isNotEmpty(collect.get(0).getAppId())){
|
|
if(!collect.isEmpty() && collect.get(0) != null && StringUtils.isNotEmpty(collect.get(0).getAppId())){
|
|
|
appid = collect.get(0).getAppId();
|
|
appid = collect.get(0).getAppId();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ String signProjectName = SpringUtils.getProperty("cloud_host.company_name");
|
|
|
//区分新老用户,新用户发送备用小程序,老用户发送主小程序
|
|
//区分新老用户,新用户发送备用小程序,老用户发送主小程序
|
|
|
if(signProjectName.equals("济南联志健康")){
|
|
if(signProjectName.equals("济南联志健康")){
|
|
|
if(!vo.isRoom()){
|
|
if(!vo.isRoom()){
|