部分退款

src/main/java/com/ctrip/fun/golf/service/order/OpCourseOrderService.java

@@ -622,6 +622,7 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
                     order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.BARGAINED.getValue());
                     order.setOrderUserStatus(6);
                 } else {
+                	order.setProcessStatus(order.getProcessStatus() +3);
                     order.setProcessStatus(order.getProcessStatus() | OrderStatusBitEnum.PART_UNSUBSCRIBED.getValue());
                     order.setOrderUserStatus(5);
                 }
@@ -978,24 +979,30 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
         if (result != null) {
             List<Integer> orderIdList = new ArrayList<Integer>();
             List<String> uidList = new ArrayList<String>();
+           
             for (CourseOrderListExcelBean orderListBean : result) {
                 orderIdList.add(orderListBean.getOrderId());
                 uidList.add(orderListBean.getUid());
+                
             }
             List<OrderAssignment> orderAssignments = new ArrayList<OrderAssignment>();
             List<Invoiceinfo> invoiceinfos = new ArrayList<Invoiceinfo>();
             List<CustomerInfo> customerInfos = new ArrayList<CustomerInfo>();
             List<OrderPayinfoBean> payinfoList = new ArrayList<OrderPayinfoBean>();
+           
             List<UserExt> userExtList = new ArrayList<UserExt>();
             if (orderIdList.size() > 0) {
                 orderAssignments = this.getOrderAssignmentDao().getOrderAssignmentByOrderIds(orderIdList);
                 invoiceinfos = this.invoiceinfoDao.getInvoiceinfoByOrderIds(orderIdList);
                 customerInfos = this.customerInfoDao.getCustomerInfoList(orderIdList);
+                
                 payinfoList = getOrderPayinfoDao().getOrderPayinfoBeanList(orderIdList);
             }
             if (uidList.size() > 0) {
                 userExtList = this.userExtDao.getUserExtInfoByUids(uidList);
             }
+         
+            
             // 获取打球用户信息
             Map<Integer, List<CustomerInfoBean>> customerInfoMap = new HashMap<Integer, List<CustomerInfoBean>>();
             for (CustomerInfo cusInfo : customerInfos) {
@@ -1009,7 +1016,9 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
                 orderCustInfos.add(this.customerInfoBeanConvert(cusInfo));
                 customerInfoMap.put(cusInfo.getOrderID(), orderCustInfos);
             }
-
+          
+  
+            
             for (CourseOrderListExcelBean orderListExcelBean : result) {
                 OrderAssignment orderAssignment = this.findOrderAssignment(orderListExcelBean.getOrderId(), orderAssignments);
                 if (orderAssignment != null) {
@@ -1029,7 +1038,18 @@ 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);
+                }
                 OrderStatusEnum orderStatusEnum = OrderStatusEnum.getOrderStatus(orderListExcelBean.getOrderType(), orderListExcelBean.getPayMode(), orderListExcelBean.getConfirmType(),
                         orderListExcelBean.getProcessStatus(), invoiceinfo == null ? false : true);
                 orderListExcelBean.setOrderStatus(orderStatusEnum.getName());
@@ -1089,6 +1109,8 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
         bean.setQuantity(xsl.getQuantity());
         bean.setOutTradeId(xsl.getOutTradeId());
         bean.setUserType(xsl.getUserType());
+        bean.setVoucherCount(xsl.getVoucherCount());
+        bean.setVoucherIDList(xsl.getVoucherIDList());
         if (xsl.getOnlineOrderFlag() != null && !xsl.getOnlineOrderFlag()) {
             bean.setOrderSourceCategory("线下订单");
         } else {