|
@@ -43,10 +43,7 @@ import io.renren.modules.qmjz.service.ScoreStuService;
|
|
|
import io.renren.modules.qmjz.service.TaskManageService;
|
|
import io.renren.modules.qmjz.service.TaskManageService;
|
|
|
import io.renren.modules.qmjz.service.WxConsumeInfoService;
|
|
import io.renren.modules.qmjz.service.WxConsumeInfoService;
|
|
|
import io.renren.modules.qmjz.utils.DateForStr;
|
|
import io.renren.modules.qmjz.utils.DateForStr;
|
|
|
-import io.renren.modules.qyh.entity.OrderEntity;
|
|
|
|
|
-import io.renren.modules.qyh.entity.PointsConfigEntity;
|
|
|
|
|
-import io.renren.modules.qyh.entity.StudentStatusEntity;
|
|
|
|
|
-import io.renren.modules.qyh.entity.TaskConfigEntity;
|
|
|
|
|
|
|
+import io.renren.modules.qyh.entity.*;
|
|
|
import io.renren.modules.qyh.mapper.PointsConfigMapper;
|
|
import io.renren.modules.qyh.mapper.PointsConfigMapper;
|
|
|
import io.renren.modules.qyh.mapper.StudentStatusMapper;
|
|
import io.renren.modules.qyh.mapper.StudentStatusMapper;
|
|
|
import io.renren.modules.qyh.model.bo.PayForBO;
|
|
import io.renren.modules.qyh.model.bo.PayForBO;
|
|
@@ -128,6 +125,10 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
|
|
|
private WorkStuService workStuService;
|
|
private WorkStuService workStuService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private ActivityStuService activityStuService;
|
|
private ActivityStuService activityStuService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private ExpertService expertService;
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private EnterpriseService enterpriseService;
|
|
|
|
|
|
|
|
@DataFilter(userId = "STAFFGUID", deptId = "TOPORGID", tableAlias = "mi")
|
|
@DataFilter(userId = "STAFFGUID", deptId = "TOPORGID", tableAlias = "mi")
|
|
|
@Override
|
|
@Override
|
|
@@ -1408,6 +1409,14 @@ public class MemberInfoServiceImpl extends ServiceImpl<MemberInfoDao, MemberInfo
|
|
|
public void deleteMemberInfo(Long[] ids) {
|
|
public void deleteMemberInfo(Long[] ids) {
|
|
|
MemberInfoEntity memberInfoEntity = new MemberInfoEntity();
|
|
MemberInfoEntity memberInfoEntity = new MemberInfoEntity();
|
|
|
for (Long id : ids) {
|
|
for (Long id : ids) {
|
|
|
|
|
+ ExpertEntity expertEntity = expertService.loadByMemberId(id, false);
|
|
|
|
|
+ if (ObjectUtil.isNotNull(expertEntity)) {
|
|
|
|
|
+ throw new RRException("该会员有行家,不能删除");
|
|
|
|
|
+ }
|
|
|
|
|
+ EnterpriseEntity enterpriseEntity = enterpriseService.loadByMemberId(id, false);
|
|
|
|
|
+ if (ObjectUtil.isNotNull(enterpriseEntity)) {
|
|
|
|
|
+ throw new RRException("该会员有企业,不能删除");
|
|
|
|
|
+ }
|
|
|
memberInfoEntity.setId(id);
|
|
memberInfoEntity.setId(id);
|
|
|
memberInfoEntity.setIsDeleted("0");
|
|
memberInfoEntity.setIsDeleted("0");
|
|
|
memberInfoEntity.setUpdateTime(LocalDateTime.now());
|
|
memberInfoEntity.setUpdateTime(LocalDateTime.now());
|