--注释掉咨询和资源积分内容；

src/main/java/com/ekexiu/portal/service/ConsultService.java

@@ -16,14 +16,18 @@ import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.dao.ConsultDao;
import com.ekexiu.portal.dao.ConsultRejectDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.TidingsDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.po.Consult;
import com.ekexiu.portal.po.ConsultReject;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.Tidings;
import com.ekexiu.portal.po.User;
import com.ekexiu.portal.pojo.EditProfessor;
@Path("/consult")
@@ -33,6 +37,8 @@ public class ConsultService {
	@Autowrie
	private ProfessorDao professorDao;
	@Autowrie
	private UserDao userDao;
	@Autowrie
	private ImageService imageService;
	@Autowrie
	private TidingsDao tidingsDao;
@@ -40,6 +46,8 @@ public class ConsultService {
	private ConsultRejectDao consultRejectDao;
	@Autowrie
	private GrowthLogService growthLogService;
	@Autowrie
	private SysService sysService;
	
	public ConsultDao getConsultDao() {
		return consultDao;
@@ -53,6 +61,12 @@ public class ConsultService {
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	public UserDao getUserDao() {
		return userDao;
	}
	public void setUserDao(UserDao userDao) {
		this.userDao = userDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
@@ -77,10 +91,16 @@ public class ConsultService {
	public void setGrowthLogService(GrowthLogService growthLogService) {
		this.growthLogService = growthLogService;
	}
	public SysService getSysService() {
		return sysService;
	}
	public void setSysService(SysService sysService) {
		this.sysService = sysService;
	}
	
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Consult consult) throws SQLException {
	public String insert(@JdbcConn(true) Connection con, Consult consult) throws SQLException, JfwBaseException {
		String consultId = StringUtil.buildUUID();
		consult.setConsultId(consultId);
		consult.setAssessStatus(0);
@@ -101,9 +121,29 @@ public class ConsultService {
		tidings.setReadStatus(1);
		this.tidingsDao.insert(con, tidings);
		//需求确认给专家增加积分
		if(consult.getDemandId() != null){
			this.growthLogService.demandConfirm(con, consult.getProfessorId());
//		if(consult.getDemandId() != null){
//			this.growthLogService.demandConfirm(con, consult.getProfessorId());
//		}
		/*Professor professor = this.professorDao.queryOne(con, consult.getProfessorId());
		User user = this.userDao.query(con, consult.getProfessorId());
		String email = null;
		String mobile = null;
		if((professor.getEmail() != null) && (!"".equals(professor.getEmail()))){
			email = professor.getEmail();
		}else if((user.getEmail() != null) && (!"".equals(user.getEmail()))){
			email = user.getEmail();
		}
		if((user.getMobilePhone() != null) && (user.getMobilePhone().trim().length() == 11)){
			mobile = user.getMobilePhone();
		}else if((professor.getPhone() != null) && (professor.getPhone().trim().length() == 11)){
			mobile = professor.getPhone();
		}
		if(email != null){
			this.sysService.sendConsultMail(email);
		}
		if(mobile != null){
			this.sysService.sendConsultSMS(mobile);
		}*/
		return consultId;
	}
	
@@ -120,7 +160,7 @@ public class ConsultService {
		//点击确认接受咨询，更新咨询状态为进行中
		this.consultDao.updateConsultStatus(con, consultId, 0);
		//接受咨询给专家增加积分
		this.growthLogService.consultReceive(con, consult.getProfessorId());
		//this.growthLogService.consultReceive(con, consult.getProfessorId());
	}
	
	@Post
@@ -152,7 +192,7 @@ public class ConsultService {
			int finishConsult = this.consultDao.queryReceiveConsult(con, consult.getProfessorId());
			this.professorDao.updateConsultCount(con, consult.getProfessorId(), finishConsult);
			//咨询完成给咨询者增加积分
			this.growthLogService.consultFinish(con, consult.getConsultantId());
			//this.growthLogService.consultFinish(con, consult.getConsultantId());
			return true;
		}
		return false;
@@ -168,11 +208,11 @@ public class ConsultService {
			BigDecimal avgStar = this.consultDao.queryStarLevel(con, consult.getProfessorId());
			this.professorDao.updateStarLevel(con, consult.getProfessorId(), avgStar);
			//评价一次咨询给咨询者增加积分
			this.growthLogService.consultAssess(con, consult.getConsultantId());
			//this.growthLogService.consultAssess(con, consult.getConsultantId());
			//获得4星及以上评价给专家增加积分
			if(assessStar > 3){
				this.growthLogService.receiveFourStar(con, consult.getProfessorId());
			}
//			if(assessStar > 3){
//				this.growthLogService.receiveFourStar(con, consult.getProfessorId());
//			}
			return true;
		}
		return false;

src/main/java/com/ekexiu/portal/service/ResourceService.java

@@ -120,7 +120,7 @@ public class ResourceService {
		}
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		this.growthLogService.addResource(con, resource.getProfessorId());
		//this.growthLogService.addResource(con, resource.getProfessorId());
		return resourceId;
	}
	
@@ -134,7 +134,7 @@ public class ResourceService {
		}
		resource.setResourceId(resourceId);
		this.resourceDao.insert(con, resource);
		this.growthLogService.addResource(con, resource.getProfessorId());
		//this.growthLogService.addResource(con, resource.getProfessorId());
		return resourceId;
	}
@@ -239,11 +239,11 @@ public class ResourceService {
	public boolean delete(@JdbcConn(true) Connection con, @PathVar String resourceId) throws SQLException {
		List<Operation> operations = this.operationDao.queryResourceId(con, resourceId);
		if(operations.isEmpty()){
			Resource resource = this.resourceDao.queryInfo(con, resourceId);
			//Resource resource = this.resourceDao.queryInfo(con, resourceId);
			this.imageDao.deleteRes(con, resourceId);
			this.resourceDao.delete(con, resourceId);
			this.watchDao.deleteWatch(con, resourceId);
			this.growthLogService.deleteResource(con, resource.getProfessorId());
			//this.growthLogService.deleteResource(con, resource.getProfessorId());
			return true;
		}else{
			return false;