返现功能还原

src/main/java/com/ctrip/fun/golf/service/assemble/AsmCourseResourceService.java

@@ -1322,7 +1322,7 @@ public class AsmCourseResourceService {
             bean.setCancelTips(model.getCancelTips());
             bean.setPaymentType(model.getPaymentType());
             bean.setResourceName(model.getResourceName());
-            bean.setCashRebate(model.getCashRebate());
+//            bean.setCashRebate(model.getCashRebate());
 //            bean.setProductName(model.getName()); // db中无ProductName，取name
             bean.setProductName(model.getProductName()); 
             map.put(bean.getResourceId(), bean);

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

@@ -486,7 +486,8 @@ public class CourseOrderService extends AbstractOrderService<CourseOrderBean, Co
             if (courseOrderBean.getResourceList() != null) {
                 for (CourseOrderResourceBean courseOrderResourceBean : courseOrderBean.getResourceList()) {
                     if (courseOrderResourceBean.getCashRebate() != null) {
-                        totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate().multiply(BigDecimal.valueOf(courseOrderBean.getCustomerInfoList().size())));
+                    	totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate());
+//                        totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate().multiply(BigDecimal.valueOf(courseOrderBean.getCustomerInfoList().size())));
                     }
 
                 }