Commit 33e846af by Huang Linyu

后台下单不能返现

parent 16b5838f
......@@ -1322,6 +1322,7 @@ public class AsmCourseResourceService {
bean.setCancelTips(model.getCancelTips());
bean.setPaymentType(model.getPaymentType());
bean.setResourceName(model.getResourceName());
bean.setCashRebate(model.getCashRebate());
// bean.setProductName(model.getName()); // db中无ProductName,取name
bean.setProductName(model.getProductName());
map.put(bean.getResourceId(), bean);
......
......@@ -33,6 +33,7 @@ import com.ctrip.fun.common.vo.operation.ResourceConfirmTypeEnum;
import com.ctrip.fun.common.vo.order.CourseOrderBean;
import com.ctrip.fun.common.vo.order.CourseOrderListItemBean;
import com.ctrip.fun.common.vo.order.CourseOrderResourceBean;
import com.ctrip.fun.common.vo.order.CustomerInfoBean;
import com.ctrip.fun.common.vo.order.OrderQuery;
import com.ctrip.fun.common.vo.order.OrderSourceEnum;
import com.ctrip.fun.common.vo.order.OrderStatusEnum;
......@@ -485,7 +486,7 @@ 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());
totalCashRebate = totalCashRebate.add(courseOrderResourceBean.getCashRebate().multiply(BigDecimal.valueOf(courseOrderBean.getCustomerInfoList().size())));
}
}
......
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