Skip to content

caosy / fun-golf-service

Go to a project
Commit f5cb6f19 by caosy
Options

去除导出

parent 44419b9a
Inline Side-by-side
Showing with 32 additions and 22 deletions
src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java
......@@ -3,6 +3,7 @@ package com.ctrip.fun.golf.service.order;
import java.io.ObjectInputStream.GetField;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
......@@ -1041,17 +1042,26 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
orderListExcelBean.setRegisterTime(userExt.getRegisterTime());
}
// 优惠券
if(orderListExcelBean.getVoucherCount() > 0){
List<String> voucherList = new ArrayList<String>();
String[] voucherIds = orderListExcelBean.getVoucherIDList().split(",");
for(int i =0 ; i< voucherIds.length; i++){
Voucher voucher = voucherDao.findById(Integer.valueOf(voucherIds[i]));
if(voucher != null){
voucherList.add(voucher.getDescription());
}
}
orderListExcelBean.setVoucherList(voucherList);
}
// if(orderListExcelBean.getVoucherCount() > 0){
// List<String> voucherList = new ArrayList<String>();
// String VoucherIds = orderListExcelBean.getVoucherIDList();
// 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++){
// voucherInteger.add(Integer.valueOf(voucherIds[i]));
// }
// 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(orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(), orderListExcelBean.getConfirmType(),
orderListExcelBean.getProcessStatus(), invoiceinfo == null ? false : true);
orderListExcelBean.setOrderStatus(orderStatusEnum.getName());
......
src/main/java/com/ctrip/fun/golf/service/order/OpEventActivityOrderService.java
......@@ -889,17 +889,17 @@ public class OpEventActivityOrderService
orderListExcelBean.setInvoice(invoice);
}
// 优惠券
if(orderListExcelBean.getVoucherCount() > 0){
List<String> voucherList = new ArrayList<String>();
String[] voucherIds = orderListExcelBean.getVoucherIDList().split(",");
for(int i =0 ; i< voucherIds.length; i++){
Voucher voucher = voucherDao.findById(Integer.valueOf(voucherIds[i]));
if(voucher != null){
voucherList.add(voucher.getDescription());
}
}
orderListExcelBean.setVoucherList(voucherList);
}
// if(orderListExcelBean.getVoucherCount() > 0){
// List<String> voucherList = new ArrayList<String>();
// String[] voucherIds = orderListExcelBean.getVoucherIDList().split(",");
// for(int i =0 ; i< voucherIds.length; i++){
// Voucher voucher = voucherDao.findById(Integer.valueOf(voucherIds[i]));
// if(voucher != null){
// voucherList.add(voucher.getDescription());
// }
// }
// orderListExcelBean.setVoucherList(voucherList);
// }
OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(
orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(),
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