|
@@ -21,6 +21,7 @@ import com.zhongshu.card.server.core.service.base.CommonService;
|
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
import com.zhongshu.card.server.core.service.base.SuperService;
|
|
|
import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
|
|
import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
|
|
|
import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;
|
|
import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;
|
|
|
|
|
+import com.zhongshu.card.server.core.service.paySetting.OrgPaySettingJudgmentService;
|
|
|
import com.zhongshu.card.server.core.service.school.AreaServiceImpl;
|
|
import com.zhongshu.card.server.core.service.school.AreaServiceImpl;
|
|
|
import com.zhongshu.card.server.core.util.BeanUtils;
|
|
import com.zhongshu.card.server.core.util.BeanUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -67,6 +68,9 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private CommonService commonService;
|
|
private CommonService commonService;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private OrgPaySettingJudgmentService orgPaySettingJudgmentService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 同步设备 (设备基础信息)
|
|
* 同步设备 (设备基础信息)
|
|
|
*
|
|
*
|
|
@@ -286,6 +290,11 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
|
|
|
deviceInfo.setProjectOid(project.getOid());
|
|
deviceInfo.setProjectOid(project.getOid());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ // 检查设备关联的结构,是否可以收款
|
|
|
|
|
+ ResultContent resultContent = orgPaySettingJudgmentService.checkOrgPaySetting(deviceInfo.getProjectOid(), deviceInfo.getBeLongOid());
|
|
|
|
|
+ if (resultContent.isFailed()) {
|
|
|
|
|
+ return ResultContent.buildFail(resultContent.getMsg());
|
|
|
|
|
+ }
|
|
|
deviceInfoDao.save(deviceInfo);
|
|
deviceInfoDao.save(deviceInfo);
|
|
|
return ResultContent.buildSuccess();
|
|
return ResultContent.buildSuccess();
|
|
|
}
|
|
}
|