|
|
@@ -34,11 +34,9 @@ import com.fs.his.service.IFsShareMaterialService;
|
|
|
import com.fs.his.service.IFsSignArticleService;
|
|
|
import com.fs.ipad.IpadSendUtils;
|
|
|
import com.fs.ipad.vo.*;
|
|
|
-import com.fs.qw.domain.BindPhoneRedPacketRecord;
|
|
|
-import com.fs.qw.domain.QwUser;
|
|
|
-import com.fs.qw.domain.QwUserVideo;
|
|
|
-import com.fs.qw.domain.RedPacket;
|
|
|
+import com.fs.qw.domain.*;
|
|
|
import com.fs.qw.mapper.BindPhoneRedPacketRecordMapper;
|
|
|
+import com.fs.qw.mapper.QwCompanyMapper;
|
|
|
import com.fs.qw.mapper.QwExternalContactMapper;
|
|
|
import com.fs.qw.mapper.QwUserMapper;
|
|
|
import com.fs.qw.service.IQwUserService;
|
|
|
@@ -116,6 +114,8 @@ public class IpadSendServer {
|
|
|
private FeishuLinkErrorMapper feishuLinkErrorMapper;
|
|
|
@Autowired
|
|
|
private FeiShuService feiShuService;
|
|
|
+ @Autowired
|
|
|
+ private QwCompanyMapper qwCompanyMapper;
|
|
|
|
|
|
//销售的个人飞书应用账户缓存的key
|
|
|
private static final String FEISHU_COMPANY_USER_KEY = "feishu:account_company_user:";
|
|
|
@@ -257,13 +257,14 @@ public class IpadSendServer {
|
|
|
}
|
|
|
|
|
|
private void sendMiniProgram(BaseVo vo, QwSopCourseFinishTempSetting.Setting content, Map<String, FsCoursePlaySourceConfig> miniMap, Long companyId) {
|
|
|
- String appid = content.getMiniprogramAppid();
|
|
|
- if(companyId != null && content.getMiniType() != null){
|
|
|
- List<CompanyMiniapp> list = companyMiniappService.list(new QueryWrapper<CompanyMiniapp>().eq("company_id", companyId).eq("type", content.getMiniType()));
|
|
|
- if(!list.isEmpty() && list.get(0) != null && StringUtils.isNotEmpty(list.get(0).getAppId())){
|
|
|
- appid = list.get(0).getAppId();
|
|
|
- }
|
|
|
- }
|
|
|
+ QwCompany qwCompany = qwCompanyMapper.selectQwCompanyByCorpId(vo.getCorpId());
|
|
|
+ String appid = qwCompany.getMiniAppId();
|
|
|
+// if(companyId != null && content.getMiniType() != null){
|
|
|
+// List<CompanyMiniapp> list = companyMiniappService.list(new QueryWrapper<CompanyMiniapp>().eq("company_id", companyId).eq("type", content.getMiniType()));
|
|
|
+// if(!list.isEmpty() && list.get(0) != null && StringUtils.isNotEmpty(list.get(0).getAppId())){
|
|
|
+// appid = list.get(0).getAppId();
|
|
|
+// }
|
|
|
+// }
|
|
|
FsCoursePlaySourceConfig courseMaConfig = miniMap.get(appid);
|
|
|
if(courseMaConfig == null){
|
|
|
List<CompanyMiniapp> list = companyMiniappService.list(new QueryWrapper<CompanyMiniapp>().eq("company_id", companyId).eq("type", 1));
|