Commit 9013d23d by unknown

add the delay order

parent f8d73ef7
......@@ -1436,6 +1436,9 @@ public class OrderDao extends GenericHibernateDao<Order, Integer> {
} else if (orderQuery.getOrderSourceCategory() == OrderSourceCategoryEnum.OFFLINE.getValue()) {
sb.append(" and od.onlineOrderFlag = false ");
}
if(orderQuery.getDelayOrder() != null && orderQuery.getDelayOrder()){
sb.append(" and od.channel1 = 'Off_D' and od.channel2='01'");
}
if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
sb.append(" and (");
int index = 0;
......
......@@ -55,6 +55,8 @@ public class OrderExcelDao extends GenericHibernateDao<OrderListExcel, Integer>
+ ",orderitem.quantity"
+ ",od.userType"
+ ",od.insuranceAmount"
+ ",od.channel1"
+ ",od.channel2"
+" from ord_order od join ord_orderitem orderitem on od.OrderID=orderitem.OrderID"
+" join prd_course course on course.id=orderitem.courseId"
+" left join prd_resourceprice prc on orderitem.PlayDate = prc.priceDate AND orderitem.ResourceID = prc.ResourceID"
......@@ -140,6 +142,11 @@ public class OrderExcelDao extends GenericHibernateDao<OrderListExcel, Integer>
} else if (orderQuery.getOrderSourceCategory() == OrderSourceCategoryEnum.OFFLINE.getValue()) {
sb.append(" and od.onlineOrderFlag = false ");
}
if(orderQuery.getDelayOrder() != null && orderQuery.getDelayOrder()){
sb.append(" and od.channel1 = 'Off_D' and od.channel2='01'");
}
if (orderQuery.getOrderStatuses() != null && orderQuery.getOrderStatuses().size() > 0) {
sb.append(" and (");
int index = 0;
......
......@@ -168,6 +168,16 @@ public class OrderListExcel {
* 保险金额
* */
private Double insuranceAmount;
/**
*后台下单渠道1
**/
private String channel1;
/**
*后台下单渠道2
**/
private String channel2;
public long getOrderNo() {
return orderNo;
......@@ -631,6 +641,23 @@ public class OrderListExcel {
public void setInsuranceAmount(Double insuranceAmount) {
this.insuranceAmount = insuranceAmount;
}
public String getChannel1() {
return channel1;
}
public void setChannel1(String channel1) {
this.channel1 = channel1;
}
public String getChannel2() {
return channel2;
}
public void setChannel2(String channel2) {
this.channel2 = channel2;
}
......
......@@ -1073,6 +1073,12 @@ public class OpCourseOrderService extends AbstractOpOrderService<CourseOrderProc
}
//增加保险 add by caosy
bean.setInsuranceAmount(xsl.getInsuranceAmount());
//add by caosy for delay order
if("Off_D".equals(xsl.getChannel1())&& "01".equals(xsl.getChannel2())){
bean.setDelayOrder(true);
}else{
bean.setDelayOrder(false);
}
return bean;
}
......
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