Skip to content

caosy / fun-golf-service

Go to a project
Commit f3d96d5b by caosy
Options

导出优惠券

parent 54d9d76b
Inline Side-by-side
Showing with 48 additions and 33 deletions
src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java
...@@ -1046,27 +1046,30 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc ...@@ -1046,27 +1046,30 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
} }
orderListExcelBean.setRegisterTime(userExt.getRegisterTime()); orderListExcelBean.setRegisterTime(userExt.getRegisterTime());
} }
// 优惠券 if( orderQuery.getExportVoucher() != null && orderQuery.getExportVoucher() == true ){
// if(orderListExcelBean.getVoucherCount() > 0){ // 优惠券
// List<String> voucherList = new ArrayList<String>(); if(orderListExcelBean.getVoucherCount() > 0){
// String VoucherIds = orderListExcelBean.getVoucherIDList(); List<String> voucherList = new ArrayList<String>();
// String[] voucherIds = VoucherIds.split(","); String VoucherIds = orderListExcelBean.getVoucherIDList();
// if(voucherIds.length >0 && !("").equals(VoucherIds) && VoucherIds != null){ String[] voucherIds = VoucherIds.split(",");
// if(voucherIds.length >0 && !("").equals(VoucherIds) && VoucherIds != null){
// List<Integer> voucherInteger = new ArrayList<>();
// for(int i =0 ; i< voucherIds.length; i++){ List<Integer> voucherInteger = new ArrayList<>();
// voucherInteger.add(Integer.valueOf(voucherIds[i])); for(int i =0 ; i< voucherIds.length; i++){
// } voucherInteger.add(Integer.valueOf(voucherIds[i]));
// List<Voucher> voucher = voucherDao.findByIds(voucherInteger); }
// for(int i =0 ; i< voucher.size(); i++){ List<Voucher> voucher = voucherDao.findByIds(voucherInteger);
// for(int i =0 ; i< voucher.size(); i++){
// if(voucher != null){
// voucherList.add(voucher.get(i).getDescription()); if(voucher != null){
// } voucherList.add(voucher.get(i).getDescription());
// } }
// orderListExcelBean.setVoucherList(voucherList); }
// } orderListExcelBean.setVoucherList(voucherList);
// } }
}
}
OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(), orderListExcelBean.getConfirmType(), OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(), orderListExcelBean.getConfirmType(),
orderListExcelBean.getProcessStatus(), invoiceinfo == null ? false : true); orderListExcelBean.getProcessStatus(), invoiceinfo == null ? false : true);
orderListExcelBean.setOrderStatus(orderStatusEnum.getName()); orderListExcelBean.setOrderStatus(orderStatusEnum.getName());
......
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
...@@ -894,18 +894,30 @@ public class OpEventActivityOrderService ...@@ -894,18 +894,30 @@ public class OpEventActivityOrderService
BeanConverter.copyProperties(invoice, invoiceinfo); BeanConverter.copyProperties(invoice, invoiceinfo);
orderListExcelBean.setInvoice(invoice); orderListExcelBean.setInvoice(invoice);
} }
// 优惠券 if(orderQuery.getExportVoucher() != null && orderQuery.getExportVoucher() == true){
// if(orderListExcelBean.getVoucherCount() > 0){
// List<String> voucherList = new ArrayList<String>(); // 优惠券
// String[] voucherIds = orderListExcelBean.getVoucherIDList().split(","); if(orderListExcelBean.getVoucherCount() > 0){
// for(int i =0 ; i< voucherIds.length; i++){ List<String> voucherList = new ArrayList<String>();
// Voucher voucher = voucherDao.findById(Integer.valueOf(voucherIds[i])); String[] voucherIds = orderListExcelBean.getVoucherIDList().split(",");
// if(voucher != null){ if(voucherIds.length > 0 && !("").equals(voucherIds) && voucherIds != null){
// voucherList.add(voucher.getDescription()); List<Integer> voucherInteger = new ArrayList<>();
// } for(int i =0 ; i< voucherIds.length; i++){
// } voucherInteger.add(Integer.valueOf(voucherIds[i]));
// orderListExcelBean.setVoucherList(voucherList); }
// } List<Voucher> voucher = voucherDao.findByIds(voucherInteger);
for(int i =0 ; i< voucher.size(); i++){
if(voucher != null){
voucherList.add(voucher.get(i).getDescription());
}
}
orderListExcelBean.setVoucherList(voucherList);
}
}
}
OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus( OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(), orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(),
orderListExcelBean.getConfirmType(), orderListExcelBean.getProcessStatus(), orderListExcelBean.getConfirmType(), orderListExcelBean.getProcessStatus(),
......
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