Commit 545f1e07 by zhangchen

发票提交重复验证

parent c96b3358
......@@ -5,7 +5,9 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletRequest;
......@@ -23,7 +25,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.alibaba.fastjson.JSON;
import com.ctrip.fun.admin.form.PaginationForm;
import com.ctrip.fun.admin.form.basic.InvoiceRquestDto;
import com.ctrip.fun.admin.service.basic.InvoiceRequestExcelExportService;
......@@ -83,25 +87,35 @@ public class InvoiceRequestController {
*/
@RequestMapping(value = "/create", method = RequestMethod.POST)
public String createVoucher(@Valid @ModelAttribute("dto") InvoiceRquestDto dto,
BindingResult bindingResult, ModelMap model) {
dto.setRequestPerson(SpringSecurityUtil.getCurrentUserName());
InvoiceRequestBean bean = new InvoiceRequestBean();
BeanConverter.copyProperties(bean, dto);
invoiceRequestService.add("", bean);
return "redirect:list";
//
// dto.setRequestPerson(SpringSecurityUtil.getCurrentUserName());
BindingResult bindingResult, ModelMap model, HttpServletResponse res) {
// dto.setRequestPerson(SpringSecurityUtil.getCurrentUserName());
// InvoiceRequestBean bean = new InvoiceRequestBean();
// for (InvoiceOrderInfoBean invoiceOrderInfoBean : dto.getInvoiceOrderInfoBeans()) {
// invoiceRequestService.findInvoiceInfoByOrderNo(invoiceOrderInfoBean.getOrderNo());
// if(){
//
// }
// }
//
// BeanConverter.copyProperties(bean, dto);
// invoiceRequestService.add("", bean);
// return "redirect:list";
//InvoiceOrderInfoBean invoiceOrderInfo = null;
dto.setRequestPerson(SpringSecurityUtil.getCurrentUserName());
InvoiceRequestBean bean = new InvoiceRequestBean();
InvoiceOrderInfoBean invoiceOrder = new InvoiceOrderInfoBean();
//List<String> invoiceOrders = new ArrayList<String>();
String orders = "";
for (InvoiceOrderInfoBean invoiceOrderInfoBean : dto.getInvoiceOrderInfoBeans()) {
invoiceOrder = invoiceRequestService.findInvoiceInfoByOrderNo("",invoiceOrderInfoBean.getOrderNo());
if(invoiceOrder!=null){
//invoiceOrders.add(invoiceOrder.getOrderNo());
orders+=invoiceOrder.getOrderNo()+",";
}
}
if(orders!="" && !"".equals(orders)){
model.addAttribute("orderValue", "该订单号或者支付凭证号已存在"+orders);
return "redirect:create";
}else{
BeanConverter.copyProperties(bean, dto);
invoiceRequestService.add("", bean);
return "redirect:list";
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment