|
|
@@ -43,6 +43,7 @@ public class ProjectWeChatInfoService extends SuperService {
|
|
|
return ResultContent.buildFail(String.format("项目oid不存在:%s", projectOid));
|
|
|
}
|
|
|
ProjectWeChatInfo projectWeChatInfo = projectWeChatInfoDao.findTopByProjectOid(projectOid);
|
|
|
+ ProjectWeChatInfo appIdTemp = projectWeChatInfoDao.findTopByAppId(projectWeChatInfo.getAppId());
|
|
|
if (ObjectUtils.isEmpty(projectWeChatInfo)) {
|
|
|
projectWeChatInfo = new ProjectWeChatInfo();
|
|
|
projectWeChatInfo.setIsDelete(Boolean.FALSE);
|
|
|
@@ -50,6 +51,15 @@ public class ProjectWeChatInfoService extends SuperService {
|
|
|
} else {
|
|
|
initUpdateEntity(projectWeChatInfo);
|
|
|
}
|
|
|
+ if (ObjectUtils.isNotEmpty(appIdTemp)
|
|
|
+ && !appIdTemp.getProjectOid().equals(projectOid)) {
|
|
|
+ String _name = "";
|
|
|
+ if (ObjectUtils.isNotEmpty(appIdTemp.getProjectInfo())) {
|
|
|
+ _name = appIdTemp.getProjectInfo().getName();
|
|
|
+ }
|
|
|
+ return ResultContent.buildFail(String.format("appId已绑定项目:"));
|
|
|
+ }
|
|
|
+
|
|
|
BeanUtils.copyProperties(param, projectWeChatInfo);
|
|
|
projectWeChatInfo.setProjectInfo(projectInfo);
|
|
|
projectWeChatInfo.setProjectName(projectInfo.getName());
|
|
|
@@ -106,6 +116,23 @@ public class ProjectWeChatInfoService extends SuperService {
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 更加当前的小程序appId 得到对应的项目oid (appId 存储在head里面)
|
|
|
+ *
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public String getProjectOidForXcx() {
|
|
|
+ String projectOid = "";
|
|
|
+ String appId = getHeadParam(new String[]{"appId", "appid"});
|
|
|
+ if (ObjectUtils.isNotEmpty(appId)) {
|
|
|
+ ProjectWeChatInfo projectWeChatInfo = projectWeChatInfoDao.findTopByAppIdOrderByUpdateTimeDesc(appId);
|
|
|
+ if (ObjectUtils.isNotEmpty(projectWeChatInfo)) {
|
|
|
+ projectOid = projectWeChatInfo.getProjectOid();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return projectOid;
|
|
|
+ }
|
|
|
+
|
|
|
public ProjectWeChatInfoModel toModel(ProjectWeChatInfo entity) {
|
|
|
ProjectWeChatInfoModel model = null;
|
|
|
if (ObjectUtils.isNotEmpty(entity)) {
|