销售提交发票功能优化

src/main/java/com/ctrip/fun/golf/dao/basic/InvoiceRequestDao.java

@@ -61,6 +61,7 @@ public class InvoiceRequestDao extends GenericHibernateDao<InvoiceRequest, Integ
         List<InvoiceRequest> list = query.list();
         
         
+
         Query queryCount = session.createSQLQuery(" SELECT FOUND_ROWS() ");
         int count = ((BigInteger) queryCount.uniqueResult()).intValue();
        

src/main/java/com/ctrip/fun/golf/domain/basic/InvoiceRequest.java

@@ -53,7 +53,7 @@ public class InvoiceRequest implements java.io.Serializable {
     private String  expressNo;
     
     //发票邮递时间
-    private Date  sendTime;
+    private String  sendTime;
     
     //未开票原因
     private String  refusedReason;
@@ -156,12 +156,12 @@ public class InvoiceRequest implements java.io.Serializable {
 	}
 
 	@Column(name = "sendTime")
-	public Date getSendTime() {
+	public String getSendTime() {
 		return sendTime;
 	}
 
 	
-	public void setSendTime(Date sendTime) {
+	public void setSendTime(String sendTime) {
 		this.sendTime = sendTime;
 	}
 

src/main/java/com/ctrip/fun/golf/service/basic/InvoiceRequestService.java

@@ -127,10 +127,14 @@ public class InvoiceRequestService extends GenericService<InvoiceRequestDao, Inv
             }
         }else{
         	BeanConverter.copyProperties(entity, dbRequest);
+        	if(StringUtils.isEmpty(invoiceRequestBean.getExpressNo())){
+        		entity.setStatus(2);//已否决
+        	}else{
+        		entity.setStatus(3);//已开票
+        	}
         	entity.setExpressNo(invoiceRequestBean.getExpressNo());
         	entity.setRefusedReason(invoiceRequestBean.getRefusedReason());
         	entity.setSendTime(invoiceRequestBean.getSendTime());
-        	entity.setStatus(2);
         }
         getEntityDao().merge(entity);
     }