添加付款人字段，查询接口增加显示付款人信息。

src/main/java/com/ekexiu/portal/dao/PayHistoryDao.java

@@ -1,18 +1,22 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.util.exception.JfwBaseException;
import com.ekexiu.portal.po.Operation;
import com.ekexiu.portal.po.PayHistory;
import com.ekexiu.portal.po.Professor;
@DAO
public abstract class PayHistoryDao {
@@ -23,23 +27,56 @@ public abstract class PayHistoryDao {
	@From(PayHistory.class)
	public abstract int update(Connection con, String payHistoryId, @Set int payStatus) throws SQLException;
	
	@SelectOne
	public abstract PayHistory query(Connection con, String payHistoryId) throws SQLException, JfwBaseException;
	
//	@SelectList
//	public abstract List<PayHistory> queryOper(Connection con, String operationId) throws SQLException;
	public PayHistory query(Connection con,String payHistoryId) throws SQLException, JfwBaseException{
        int _m_1 = 1;
        String sql = "SELECT PAY_HISTORY_ID,OPERATION_ID,PAID_MONEY,RETURN_MONEY,REMARK,ISONLINE,PAY_TYPE,PAY_STATUS,PAY_HISTORY.PROFESSOR_ID,PAY_HISTORY.CREATE_TIME,PROFESSOR.NAME FROM PAY_HISTORY LEFT JOIN PROFESSOR ON PAY_HISTORY.PROFESSOR_ID = PROFESSOR.ID WHERE PAY_HISTORY_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,payHistoryId);
            ResultSet rs = ps.executeQuery();
            try{
                if(rs.next()){
                   PayHistory _result = new PayHistory();
                    _result.setPayHistoryId(rs.getString(1));
                    _result.setOperationId(rs.getString(2));
                    _result.setPaidMoney(rs.getBigDecimal(3));
                    _result.setReturnMoney(rs.getBigDecimal(4));
                    String _m_2 = rs.getString(5);
                    if(rs.wasNull()){
                        _m_2 = null;
                    }
                    _result.setRemark(_m_2);
                    _result.setIsonline(rs.getInt(6));
                    _result.setPayType(rs.getInt(7));
                    _result.setPayStatus(rs.getInt(8));
                    Professor professor = new Professor();
                    professor.setId(rs.getString(9));
                    _result.setCreateTime(rs.getString(10));
                    professor.setName(rs.getString(11));
                    _result.setProfessor(professor);
                    return _result;
                }else{
                    throw new JfwBaseException(201);
                }
            }finally{
                try{rs.close();}catch(Exception _m_3){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_4){}
        }
    }
	
	public java.util.List<com.ekexiu.portal.po.PayHistory> queryDetail(java.sql.Connection con,java.lang.String operationId) throws java.sql.SQLException{
	public List<PayHistory> queryDetail(Connection con,String operationId) throws SQLException{
        int _m_1 = 1;
        String sql = "SELECT PAY_HISTORY_ID,PAY_HISTORY.OPERATION_ID,PAID_MONEY,RETURN_MONEY,REMARK,ISONLINE,PAY_TYPE,PAY_HISTORY.CREATE_TIME,OPERATION.DEAL_PRICE,OPERATION.CREATE_TIME FROM PAY_HISTORY LEFT JOIN OPERATION ON PAY_HISTORY.OPERATION_ID = OPERATION.OPERATION_ID WHERE PAY_HISTORY.OPERATION_ID = ?";
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
        String sql = "SELECT PAY_HISTORY_ID,PAY_HISTORY.OPERATION_ID,PAID_MONEY,RETURN_MONEY,REMARK,ISONLINE,PAY_TYPE,PAY_HISTORY.CREATE_TIME,OPERATION.DEAL_PRICE,OPERATION.CREATE_TIME,PAY_HISTORY.PROFESSOR_ID,PROFESSOR.NAME FROM PAY_HISTORY LEFT JOIN OPERATION ON PAY_HISTORY.OPERATION_ID = OPERATION.OPERATION_ID LEFT JOIN PROFESSOR ON PAY_HISTORY.PROFESSOR_ID = PROFESSOR.ID WHERE PAY_HISTORY.OPERATION_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,operationId);
            java.sql.ResultSet rs = ps.executeQuery();
            ResultSet rs = ps.executeQuery();
            try{
                java.util.List<com.ekexiu.portal.po.PayHistory> _result = new java.util.ArrayList<com.ekexiu.portal.po.PayHistory>();
                List<PayHistory> _result = new ArrayList<PayHistory>();
                while(rs.next()){
                    com.ekexiu.portal.po.PayHistory _obj =  new com.ekexiu.portal.po.PayHistory();
                    PayHistory _obj =  new PayHistory();
                    _obj.setPayHistoryId(rs.getString(1));
                    Operation operation = new Operation();
                    operation.setOperationId(rs.getString(2));
@@ -56,6 +93,10 @@ public abstract class PayHistoryDao {
                    operation.setDealPrice(rs.getBigDecimal(9));
                    operation.setCreateTime(rs.getString(10));
                    _obj.setOperation(operation);
                    Professor professor = new Professor();
                    professor.setId(rs.getString(11));
                    professor.setName(rs.getString(12));
                    _obj.setProfessor(professor);
                    _result.add(_obj);
                }
                return _result;

src/main/java/com/ekexiu/portal/po/PayHistory.java

@@ -22,7 +22,9 @@ public class PayHistory implements CreateTimeSupported {
	private int isonline;
	private int payType;
	private int payStatus;
	private String professorId;
	private Operation operation;
	private Professor professor;
	
	public Operation getOperation() {
		return operation;
@@ -31,6 +33,13 @@ public class PayHistory implements CreateTimeSupported {
		this.operation = operation;
	}
	
	public Professor getProfessor() {
		return professor;
	}
	public void setProfessor(Professor professor) {
		this.professor = professor;
	}
	
	@Column(DE.id_32)
	public String getPayHistoryId() {
		return payHistoryId;
@@ -102,4 +111,12 @@ public class PayHistory implements CreateTimeSupported {
		this.payStatus = payStatus;
	}
	
	@Column(DE.id_32)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	
}

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

@@ -50,32 +50,10 @@ public class PayHistoryService {
		return this.payHistoryDao.query(con, payHistoryId);
	}
	
//	@Get
//	@Path("/qaoper")
//	public List<PayHistory> queryOper(@JdbcConn Connection con, String operationId) throws SQLException {
//		return this.payHistoryDao.queryOper(con, operationId);
//	}
	
	@Get
	@Path("/qadetail")
	public List<PayHistory> queryDetail(@JdbcConn Connection con, String operationId) throws SQLException {
		return this.payHistoryDao.queryDetail(con, operationId);
	}
	
//	@Get
//	@Path("/qadetail")
//	public List<PayHistory> queryDetail(@JdbcConn Connection con, String operationId) throws SQLException {
//		List<PayHistory> historiesList = this.payHistoryDao.queryDetail(con, operationId);
//		for (PayHistory payHistory : historiesList) {
//			double remainMoney = payHistory.getOperation().getDealPrice().doubleValue();
//			if(payHistory.getPayType() == 0){
//				remainMoney = remainMoney - payHistory.getPaidMoney().doubleValue();
//			}
//			if(payHistory.getPayType() == 1){
//				remainMoney = remainMoney + payHistory.getReturnMoney().doubleValue();
//			}
//		}
//		return this.payHistoryDao.queryDetail(con, operationId);
//	}
	
}