发票校验

src/main/java/com/ctrip/fun/admin/controller/basic/InvoiceRequestController.java

@@ -6,14 +6,15 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import org.apache.commons.lang.StringUtils;
 import org.jsoup.helper.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.GrantedAuthority;
@@ -94,11 +95,35 @@ public class InvoiceRequestController {
         dto.setRequestPerson(SpringSecurityUtil.getCurrentUserName());
         InvoiceRequestBean bean = new InvoiceRequestBean();
         InvoiceOrderInfoBean invoiceOrder = new InvoiceOrderInfoBean();
-      
+        List<InvoiceOrderInfoBean> listInvoiceOrder = new ArrayList<>();
         String orders = "";
+        HashSet<String> set = new HashSet<>();
+        for (InvoiceOrderInfoBean invoiceOrderInfoBean : dto.getInvoiceOrderInfoBeans()) {
+        	if(!StringUtil.isBlank(invoiceOrderInfoBean.getOrderNo())){
+        		String orderNo1 = invoiceOrderInfoBean.getOrderNo().replaceAll(" ", ""); 
+        		invoiceOrderInfoBean.setOrderNo(orderNo1);
+        		listInvoiceOrder.add(invoiceOrderInfoBean);
+        	}
+        }
+        dto.setInvoiceOrderInfoBeans(listInvoiceOrder);
         for (InvoiceOrderInfoBean invoiceOrderInfoBean : dto.getInvoiceOrderInfoBeans()) {
         	invoiceOrderInfoBean.setCompanyIndex(dto.getCompanyIndex());
-        	invoiceOrderInfoBean.setOrderNo(invoiceOrderInfoBean.getOrderNo().replaceAll(" ", ""));
+        	String orderNo  = invoiceOrderInfoBean.getOrderNo();
+        	
+        	       	
+        	if(!StringUtil.isBlank(orderNo) && !orderNo.matches("^[0-9]*$")){
+        		invoiceOrder.setMsg(orderNo + "订单号需全部为数字");
+        		orders = orderNo;
+            	break;
+        	}          
+        	invoiceOrderInfoBean.setOrderNo(orderNo);
+        	if(!StringUtil.isBlank(orderNo) && set.contains(orderNo)){
+        		invoiceOrder.setMsg(orderNo + "订单号录入重复");
+        		orders = orderNo;
+        		break;
+        	}else{
+        		set.add(orderNo);
+        	}
         	invoiceOrder = invoiceRequestService.findInvoiceInfoByOrderNo("",invoiceOrderInfoBean);
 			if(!StringUtil.isBlank(invoiceOrder.getMsg())){
 				orders+=invoiceOrder.getOrderNo()+",";
@@ -110,6 +135,7 @@ public class InvoiceRequestController {
 				invoiceOrderInfoBean.setCourseName(invoiceOrder.getCourseName());
 			}			
 		}
+        
         if(orders!="" && !"".equals(orders)){
 
         	dto.setMsg(invoiceOrder.getMsg());