部分退款

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

@@ -63,6 +63,8 @@ public class EventActivityOrderExcelDao extends GenericHibernateDao<EventActivit
             + ",orderitem.floorPrice"
             + ",od.remark"
             + ",od.platform"
+            +",od.voucherCount"
+            +",od.voucherIDList"
             + ",od.onlineOrderFlag"
             + ",(SELECT ord_payinfo.prePayAmount FROM ord_payinfo WHERE ord_payinfo.OrderID = od.OrderID ORDER BY ord_payinfo.id LIMIT 0,1) as depositAmount"
             + ",orderitem.quantity as quantity"

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

@@ -884,11 +884,13 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
     
     public List<Order> queryEventActivityOrders(Date priceDate, String playerPhone) {
       String sql = "select t.orderId from ord_eventactivityorderitem t "
-      		+ "join ord_customerinfo c on t.orderId=c.OrderID where c.MobileNo=:phone and t.playDate=:playDate";
+      		+ "join ord_customerinfo c on t.orderId=c.OrderID JOIN event_customerinfo  e on e.orderId = t.orderId "
+    		+ "where c.MobileNo=:phone and t.playDate=:playDate  and e.validFlag = 1 and e.mobilePhone = :phone";
       Session session = this.getSession();
       Query query = session.createSQLQuery(sql);
       query.setParameter("playDate", priceDate);
       query.setParameter("phone", playerPhone);
+      query.setParameter("phone", playerPhone);
       query.setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP);
       List<Map<String, Object>> list = query.list();
       if (list == null || list.isEmpty()) {

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

@@ -59,6 +59,8 @@ public class OrderExcelDao extends GenericHibernateDao<OrderListExcel, Integer>
             + ",od.insuranceAmount"
             + ",od.channel1"
             + ",od.channel2"
+            +",od.voucherCount"
+            +",od.voucherIDList"
             +" from ord_order od join ord_orderitem orderitem on od.OrderID=orderitem.OrderID"
             +" join prd_course course on course.id=orderitem.courseId"
             +" left join prd_resourceprice prc on orderitem.PlayDate = prc.priceDate AND orderitem.ResourceID = prc.ResourceID"

src/main/java/com/ctrip/fun/golf/domain/order/EventActivityOrderListExcel.java

@@ -124,6 +124,17 @@ public class EventActivityOrderListExcel {
     private Date playDate;
     
     private String platform; 
+    
+    /**
+     * 劵数量
+     */
+    private Integer voucherCount;
+    
+    /**
+     * 劵使用的情况
+     */
+    private String voucherIDList;
+    
 
     public String getUid() {
         return uid;
@@ -379,4 +390,20 @@ public class EventActivityOrderListExcel {
 		this.platform = platform;
 	}
 
+	public Integer getVoucherCount() {
+		return voucherCount;
+	}
+
+	public void setVoucherCount(Integer voucherCount) {
+		this.voucherCount = voucherCount;
+	}
+
+	public String getVoucherIDList() {
+		return voucherIDList;
+	}
+
+	public void setVoucherIDList(String voucherIDList) {
+		this.voucherIDList = voucherIDList;
+	}
+
 }

src/main/java/com/ctrip/fun/golf/domain/order/OrderListExcel.java

@@ -186,8 +186,20 @@ public class OrderListExcel {
      *后台下单渠道2
      **/
     private String channel2;
+    
+    /**
+     * 劵数量
+     */
+    private Integer voucherCount;
+    
+    /**
+     * 劵使用的情况
+     */
+    private String voucherIDList;
+
+   
 
-    public long getOrderNo() {
+	public long getOrderNo() {
         return orderNo;
     }
 
@@ -682,6 +694,21 @@ public class OrderListExcel {
 		this.prePayCardRefundAmount = prePayCardRefundAmount;
 	}
 
+	 public Integer getVoucherCount() {
+			return voucherCount;
+	}
+
+	public void setVoucherCount(Integer voucherCount) {
+		this.voucherCount = voucherCount;
+	}
+
+	public String getVoucherIDList() {
+		return voucherIDList;
+	}
+
+	public void setVoucherIDList(String voucherIDList) {
+		this.voucherIDList = voucherIDList;
+	}
     
     
 

src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java

@@ -888,7 +888,18 @@ public class OpEventActivityOrderService
                     BeanConverter.copyProperties(invoice, invoiceinfo);
                     orderListExcelBean.setInvoice(invoice);
                 }  
-
+                // 优惠券
+                if(orderListExcelBean.getVoucherCount() > 0){
+                	 List<String> voucherList = new ArrayList<String>();
+                	String[] voucherIds =  orderListExcelBean.getVoucherIDList().split(",");
+                	for(int i =0 ; i< voucherIds.length; i++){
+                		Voucher voucher = voucherDao.findById(Integer.valueOf(voucherIds[i]));
+                		if(voucher != null){
+                			voucherList.add(voucher.getDescription());
+                		}                		
+                	}
+                	orderListExcelBean.setVoucherList(voucherList);
+                }
                 OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
                         orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(),
                         orderListExcelBean.getConfirmType(), orderListExcelBean.getProcessStatus(),
@@ -943,6 +954,8 @@ public class OpEventActivityOrderService
         } else {
             bean.setOrderSourceCategory("线上订单");
         }
+        bean.setVoucherCount(xsl.getVoucherCount());
+        bean.setVoucherIDList(xsl.getVoucherIDList());
         return bean;
     }