批量开票之保村订单可开票时间

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

@@ -298,8 +298,8 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
     
     public PagedEntityBean<OrderListBean> queryCanInvoiceOrder(OrderQuery orderQuery) throws Exception{
         PagedEntityBean<OrderListBean> pagedEntityBean = new PagedEntityBean<OrderListBean>();
-    	String sql = "SELECT SQL_CALC_FOUND_ROWS od.orderId,od.OrderType,od.OrderNo,od.OrderName,od.Uid,od.OrderDate from ord_order od WHERE 1 = 1 AND od.uid=:uid AND od.orderDate >=:DecOfPreviousYear AND od.processStatus&16785491 = 19 AND od.invoiceId is  null AND od.canInvoiceDate<CURRENT_TIMESTAMP";
-        Session session = this.getSession();
+    	String sql = "SELECT SQL_CALC_FOUND_ROWS od.voucherAmount,od.prePayCardAmount,od.invoiceAmount,od.insuranceAmount,od.prePayAmount,od.orderId,od.orderId,od.OrderType,od.OrderNo,od.OrderName,od.Uid,od.OrderDate from ord_order od WHERE 1 = 1 AND od.uid=:uid AND od.orderDate >=:DecOfPreviousYear AND od.processStatus&16785491 = 19 AND od.OrderCategory not in (11,12) AND od.invoiceId is  null AND od.canInvoiceDate<CURRENT_TIMESTAMP";
+    	Session session = this.getSession();
         Query query = session.createSQLQuery(sql);
         query.setParameter("uid", orderQuery.getUid());
         query.setParameter("DecOfPreviousYear", DateUtil.getFirstDay(DateUtil.yearOfDate(new Date())-1, 12));
@@ -315,12 +315,7 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
         for (i = 0; i < results.size(); i++) {
         	OrderListBean item = new OrderListBean();
             Map map = (Map) results.get(i);
-            item.setOrderType(Integer.parseInt(map.get("OrderType").toString()));
-            item.setOrderNo(Long.parseLong(map.get("OrderNo").toString()));
-            item.setOrderId(Integer.parseInt(map.get("orderId").toString()));
-            item.setOrderName((String) map.get("OrderName"));
-            item.setUid((String) map.get("Uid"));
-            item.setOrderDate(DateUtil.parseDate(map.get("OrderDate").toString()));
+            BeanConverter.copyProperties(item, map);
             orderListItems.add(item);
         }
 
@@ -2318,6 +2313,15 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
         query.setParameter("invoiceId", invoiceId);
         query.executeUpdate();
 	}
+	
+	public void updateOrdersCanInvoiceDate(int orderId,Date canInvoiceDate){
+		String sql = "update ord_order od set  od.canInvoiceDate=:canInvoiceDate where od.orderId = :orderId";
+        Session session = this.getSession();
+        Query query = session.createSQLQuery(sql.toString());
+        query.setParameter("orderId", orderId);
+        query.setParameter("canInvoiceDate", canInvoiceDate);
+        query.executeUpdate();
+	}
 
 	public CommuneOrderItem findCommuneOrderItemById(Integer orderId){
 	    Query query = this.getSession().createQuery("from  CommuneOrderItem where orderId = :orderId");

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

@@ -1528,7 +1528,7 @@ public abstract class AbstractOrderService<H extends AbstractOrderBean<T>, T> ex
 
             this.invoiceinfoDao.saveOrUpdate(invoiceinfo);
             if(isSaveInvoice){
-            	this.getOrderDao().updateOrdersInvoiceId(order.getOrderId(), invoiceinfo.getIsInvoiced());
+            	this.getOrderDao().updateOrdersInvoiceId(order.getOrderId(), invoiceinfo.getInvoiceId());
             }
         } else {
             if (invoiceinfo != null) {

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

@@ -256,6 +256,9 @@ public class CommuneOrderService extends AbstractOrderService<CommuneOrderBean,
         //社员续费 add by caosy
         orderItem.setCommuneYears(communeOrderBean.getCommuneYears());
         orderItem.setRecommendUid(communeOrderBean.getRecommendUid());
+        
+        this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(new Date(), 1));
+        
         communeOrderItemDao.save(orderItem);
     }
     

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

@@ -845,7 +845,8 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
             orderItem.setVipFirstReduction(asmCourseResource.getVipFirstReduction());
             orderItem.setVipMaxRandom(asmCourseResource.getVipMaxRandom());
             orderItem.setVipMinRandom(asmCourseResource.getVipMinRandom());
-            
+            //更改可以开票时间
+            this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(orderItemBean.getPlayDate(), 1));
             this.getOrderItemDao().save(orderItem);
             try {
                 userService.saveOrderedCourse(asmCourseResource.getCourseId(), courseOrderBean.getUid());

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

@@ -982,6 +982,8 @@ public class EventActivityOrderService extends
             }
             eventActivityOrderItem.setTeeTime(teeTimeStr);
             
+            //更改可以开票时间
+            this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(eventActivityOrderItem.getPlayDate(), 1));
             this.getEventActivityOrderItemDao().save(eventActivityOrderItem);
             try {
                 userService.saveOrderedCourse(asmCourseResource.getCourseId(),

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

@@ -5,12 +5,14 @@ package com.ctrip.fun.golf.service.order;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.CollectionUtils;
 
+import com.ctrip.fun.common.core.util.DateUtil;
 import com.ctrip.fun.common.core.util.JsonUtil;
 import com.ctrip.fun.common.core.util.StringUtils;
 import com.ctrip.fun.common.vo.PagedResponseBean;
@@ -215,6 +217,7 @@ public class RechargeOrderService extends AbstractOrderService<RechargeOrderBean
 		RechargeOrderItem orderItem = new RechargeOrderItem();
 		orderItem.setOrderId(orderId);
 		orderItem.setRecommendCode(rechargeOrderBean.getRecommendCode());
+		this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(new Date(), 1));
 		rechargeOrderItemDao.save(orderItem);
 	}
 

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

@@ -235,6 +235,7 @@ public class TourOrderService extends AbstractOrderService<TourOrderBean, TourOr
             tourOrderItem.setSalePrice(salePrice);
             tourOrderItem.setExtraResourceFloorPrice(extraResourceFloorPrice);
             tourOrderItem.setExtraResourceSalePrice(extraResourceSalePrice);
+            this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(tourOrderItem.getDepartDate(), 1));
             this.tourOrderItemDao.save(tourOrderItem);
             // 2、保存TourOrderSupItem表（兼容以前没用配置TourOrderSupItem表的数据）
             Integer supplierIdBase = null;

src/main/java/com/ctrip/fun/mall/service/order/MallOrderService.java

@@ -1049,6 +1049,7 @@ public class MallOrderService extends AbstractOrderService<MallOrderBean, MallOr
             mallOrderItem.setCurrency(orderItemBean.getCurrency());
             mallOrderItem.setCashRebate(orderItemBean.getCashRebate());
             mallOrderItem.setCreatedTime(new Date());
+            this.getOrderDao().updateOrdersCanInvoiceDate(orderId, DateUtil.addDays(new Date(), 1));
             this.mallOrderItemDao.save(mallOrderItem);
         }