Merge branch 'f-6.6.4' of 192.168.10.6:caosy/fun-golf-service into f-6.6.4

src/main/java/com/ctrip/fun/golf/dao/order/OrderDao.java

@@ -1173,13 +1173,25 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
     public PagedResponseBean<CourseOrderFinanceBean> queryCourseOrderForFinance(CourseOrderFinanceQuery courseOrderFinanceQuery) {
         StringBuilder sb = new StringBuilder(300);
 
-        sb.append(" select SQL_CALC_FOUND_ROWS invo.invoiceId,od.orderType,od.confirmType,od.orderId,od.cashRebate, course.id as courseId,course.name as courseName,orderitem.SupplierID as supplierId,orderitem.SupplierName as supplierName, orderItem.playDate as playDate,orderItem.resourceId as resourceId,orderitem.realPayTime as teeTime, od.orderNO as orderNo,orderitem.quantity as playNums,orderItem.floorPrice as costForPerson,orderItem.floorPrice*orderitem.quantity as costForOrder,orderitem.Amount AS amount,orderitem.SalePrice AS salePrice, od.payMode,od.processStatus,sup.SettlementType as settlementType,od.offlinePayType,orderitem.productManager");
+        sb.append("SELECT SQL_CALC_FOUND_ROWS invo.invoiceId, od.orderType, od.confirmType, od.orderId, od.cashRebate , od.orderNO AS orderNo, od.payMode, od.processStatus, od.offlinePayType, od.uid , od.ContactName AS contactName, od.orderName, course.districtId, orderitem.Commission AS commission, od.actualAmount , od.orderDate, od.payDate, od.orderSource, od.orderStatus, od.notifyFlag , od.actualSettleAmout, od.settleObj, od.settleDate, od.finComment, od.prePayCardAmount , od.voucherAmount, od.refundAmount, od.outTradeId, od.onlineOrderFlag, od.userType , od.insuranceAmount, od.channel1, od.channel2, course.id AS courseId, course.name AS courseName , orderitem.SupplierID AS supplierId, orderitem.SupplierName AS supplierName, orderItem.playDate AS playDate, orderItem.resourceId AS resourceId, orderitem.realPayTime AS teeTime , orderitem.quantity AS playNums, orderItem.floorPrice AS costForPerson, orderItem.floorPrice * orderitem.quantity AS costForOrder, orderitem.Amount AS amount , orderitem.SalePrice AS salePrice, sup.SettlementType AS settlementType, orderitem.productManager");
         sb.append(" from ord_order od "
                 + "join ord_orderitem orderitem on (od.OrderID=orderitem.OrderID)"
                 + "join prd_course course on (course.id=orderitem.courseId) left join ord_invoiceinfo invo on (od.OrderId=invo.OrderId) LEFT JOIN opr_supplier sup ON (orderitem.SupplierID = sup.ID) where  od.OrderCategory = "
                 + OrderCategoryEnum.COURSE.getKey());
         Map<String, Object> parameters = new HashMap<String, Object>();
 
+//        if (courseOrderFinanceQuery.getOrderNo() != null && courseOrderFinanceQuery.getOrderNo() != 0) {
+        if (courseOrderFinanceQuery.getOrderNo() != null && courseOrderFinanceQuery.getOrderNo() != 0) {
+            sb.append(" and od.OrderNo=:orderNo ");
+            parameters.put("orderNo", courseOrderFinanceQuery.getOrderNo());
+        }
+        if (org.apache.commons.lang.StringUtils.isNotEmpty( courseOrderFinanceQuery.getOrderName() )) {
+            sb.append(" AND od.OrderName like '%"+courseOrderFinanceQuery.getOrderName()+"%'");
+        }
+        if (org.apache.commons.lang.StringUtils.isNotEmpty( courseOrderFinanceQuery.getContactName() )) {
+            sb.append(" AND od.ContactName like '%"+courseOrderFinanceQuery.getContactName()+"%'");
+        }
+        
         if (courseOrderFinanceQuery.getCourseId() != null && courseOrderFinanceQuery.getCourseId() != 0) {
             sb.append(" and course.id=:courseId ");
             parameters.put("courseId", courseOrderFinanceQuery.getCourseId());

src/main/java/com/ctrip/fun/golf/service/finance/CourseFinanceService.java

@@ -16,14 +16,21 @@ import com.ctrip.fun.common.vo.finance.CourseOrderFinanceBean;
 import com.ctrip.fun.common.vo.finance.CourseOrderFinanceQuery;
 import com.ctrip.fun.common.vo.operation.SupplierSettlementTypeEnum;
 import com.ctrip.fun.common.vo.order.OfflinePayTypeEnum;
+import com.ctrip.fun.common.vo.order.OrderPayinfoBean;
 import com.ctrip.fun.common.vo.order.OrderStatusEnum;
 import com.ctrip.fun.common.vo.product.ProductPayModeEnum;
+import com.ctrip.fun.golf.dao.basic.DistrictDao;
 import com.ctrip.fun.golf.dao.order.CustomerInfoDao;
 import com.ctrip.fun.golf.dao.order.InvoiceinfoDao;
+import com.ctrip.fun.golf.dao.order.OrderAssignmentDao;
 import com.ctrip.fun.golf.dao.order.OrderDao;
+import com.ctrip.fun.golf.dao.order.OrderPayinfoDao;
 import com.ctrip.fun.golf.dao.product.ResourcePriceDao;
+import com.ctrip.fun.golf.domain.basic.District;
 import com.ctrip.fun.golf.domain.order.CustomerInfo;
 import com.ctrip.fun.golf.domain.order.Invoiceinfo;
+import com.ctrip.fun.golf.domain.order.OrderAssignment;
+import com.ctrip.fun.golf.domain.order.OrderPayinfo;
 import com.ctrip.fun.golf.domain.product.ResourcePrice;
 
 /**
@@ -39,6 +46,12 @@ public class CourseFinanceService {
     private CustomerInfoDao customerInfoDao = null;
 
     private ResourcePriceDao resourcePriceDao = null;
+    
+    private DistrictDao districtDao = null;
+    
+    private OrderPayinfoDao orderPayinfoDao = null;
+    
+    private OrderAssignmentDao orderAssignmentDao = null;
 
     private Invoiceinfo findInvoiceinfo(Integer orderId, List<Invoiceinfo> invoiceinfos) {
         for (Invoiceinfo invoiceinfo : invoiceinfos) {
@@ -96,6 +109,9 @@ public class CourseFinanceService {
                     }
                 }
             }
+
+            
+            
             for (CourseOrderFinanceBean courseOrderFinanceBean : result) {
                 Invoiceinfo invoiceinfo = this.findInvoiceinfo(courseOrderFinanceBean.getOrderId(), invoiceinfos);
                 OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(courseOrderFinanceBean.getOrderType(), courseOrderFinanceBean.getPayMode(),
@@ -122,6 +138,36 @@ public class CourseFinanceService {
                 if (courseOrderFinanceBean.getOfflinePayType() != null && courseOrderFinanceBean.getOfflinePayType() != 0) {
                     courseOrderFinanceBean.setOfflinePayTypeMsg(OfflinePayTypeEnum.valueOf(courseOrderFinanceBean.getOfflinePayType()).getMsg());
                 }
+                List<CustomerInfo> customerInfos = this.customerInfoDao.getCustomerByOrderID(courseOrderFinanceBean.getOrderId());
+
+                if(customerInfos.size()>=4){
+                	courseOrderFinanceBean.setPlayer4(customerInfos.get(3).getCname());
+                } 
+                if(customerInfos.size()>=3){
+                	courseOrderFinanceBean.setPlayer3(customerInfos.get(2).getCname());
+                } 
+                if(customerInfos.size()>=2){
+                	courseOrderFinanceBean.setPlayer2(customerInfos.get(1).getCname());
+                } 
+                if(customerInfos.size()>=1){
+                	courseOrderFinanceBean.setPlayer1(customerInfos.get(0).getCname());
+                }
+                // todo: restrictName
+                if(courseOrderFinanceBean.getDistrictId()!=null){
+	                District distinct = districtDao.findById(courseOrderFinanceBean.getDistrictId());
+	                courseOrderFinanceBean.setDistrictName(distinct.getName());
+                }
+                List<Integer> orderIds = new ArrayList<Integer>();
+                orderIds.add(courseOrderFinanceBean.getOrderId());
+                List<OrderPayinfoBean> orderPayInfoList = orderPayinfoDao.getOrderPayinfoBeanList(orderIds);
+                if(orderPayInfoList.size()>0){
+                	courseOrderFinanceBean.setPayeeName(orderPayInfoList.get(0).getPayeeName());
+                }
+                List<OrderAssignment> orderAssignments  = orderAssignmentDao.getOrderAssignmentByOrderIds(orderIds);         // 接管人
+                if(orderAssignments.size()>0){
+                	courseOrderFinanceBean.setReceiver(orderAssignments.get(0).getEid());
+                }
+                
             }
         }
         return pagedResponseBean;
@@ -166,4 +212,28 @@ public class CourseFinanceService {
         this.resourcePriceDao = resourcePriceDao;
     }
 
+	public DistrictDao getDistrictDao() {
+		return districtDao;
+	}
+
+	public void setDistrictDao(DistrictDao districtDao) {
+		this.districtDao = districtDao;
+	}
+
+	public OrderPayinfoDao getOrderPayinfoDao() {
+		return orderPayinfoDao;
+	}
+
+	public void setOrderPayinfoDao(OrderPayinfoDao orderPayinfoDao) {
+		this.orderPayinfoDao = orderPayinfoDao;
+	}
+
+	public OrderAssignmentDao getOrderAssignmentDao() {
+		return orderAssignmentDao;
+	}
+
+	public void setOrderAssignmentDao(OrderAssignmentDao orderAssignmentDao) {
+		this.orderAssignmentDao = orderAssignmentDao;
+	}
+
 }

src/main/resources/finance.spring.xml

@@ -55,6 +55,9 @@
 		<property name="invoiceinfoDao" ref="invoiceinfoDao"></property>
 		<property name="orderDao" ref="orderDao"></property>
 		<property name="resourcePriceDao" ref="resourcePriceDao"></property>
+		<property name="districtDao" ref="districtDao"></property>
+		<property name="orderPayinfoDao" ref="orderPayinfoDao"></property>
+		<property name="orderAssignmentDao" ref="orderAssignmentDao"></property>
 	</bean>
 
 	<bean name="tourFinanceService" class="com.ctrip.fun.golf.service.finance.TourFinanceService">