add the vipdiscount of orderlist

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

@@ -396,7 +396,7 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
         PagedEntityBean<CourseOrderListItemBean> pagedEntityBean = new PagedEntityBean<CourseOrderListItemBean>();
         // String sel =
         // "select a.OrderID , a.OrderType , a.TempOrderNo , a.OrderNo , DATE_FORMAT(a.OrderDate, '%Y-%m-%d %H:%i:%s') as OrderDate , a.OrderName , a.ProcessStatus , a.OrderUserStatus , a.PayMode , b.CourseProductID , b.ProductName , DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i:%s') as PlayDate , b.TeeTime , a.Uid , a.Amount , a.TotalAmount , a.Remark from ord_order a LEFT JOIN ORD_OrderItem b on a.OrderID=b.OrderID where (a.OrderType=1 or (a.OrderType=0 and a.OrderUserStatus!=8 and DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i') > DATE_FORMAT(now(), '%Y-%m-%d %H:%i'))) ";
-        String sel = "select SQL_CALC_FOUND_ROWS a.OrderID ,a.confirmType ,a.isThird, a.OrderType , a.TempOrderNo , a.OrderNo , DATE_FORMAT(a.OrderDate, '%Y-%m-%d %H:%i:%s') as OrderDate , a.OrderName , a.ProcessStatus , a.OrderUserStatus , a.PayMode ,b.resourceId, b.CourseProductID , b.ProductName , DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i:%s') as PlayDate , b.TeeTime , a.Uid , a.Amount , a.TotalAmount , a.Remark from ord_order a inner JOIN ORD_OrderItem b on a.OrderID=b.OrderID where 1=1  and a.`enable` = true ";
+        String sel = "select SQL_CALC_FOUND_ROWS a.OrderID ,a.confirmType ,a.isThird, a.OrderType , a.TempOrderNo , a.OrderNo , DATE_FORMAT(a.OrderDate, '%Y-%m-%d %H:%i:%s') as OrderDate , a.OrderName , a.ProcessStatus , a.OrderUserStatus , a.PayMode ,b.resourceId, b.CourseProductID , b.ProductName , DATE_FORMAT(b.PlayDate, '%Y-%m-%d %H:%i:%s') as PlayDate , b.TeeTime , a.Uid , a.Amount , a.TotalAmount, a.vipmemberDiscount, a.Remark from ord_order a inner JOIN ORD_OrderItem b on a.OrderID=b.OrderID where 1=1  and a.`enable` = true ";
         String cond = "";
 
         if (null != queryBean.getUid() && !"".equals(queryBean.getUid())) {
@@ -448,6 +448,9 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
                 item.setConfirmType((Integer) map.get("confirmType"));
                 item.setIsThird((Integer) map.get("isThird"));
                 item.setResourceId((Integer) map.get("resourceId"));
+                //增加vip优惠价格
+                item.setDiscountAfterOrderAmount(BigDecimal.valueOf(Double.parseDouble(map.get("vipmemberDiscount").toString())));
+                
                 orderListItems.add(item);
             }