Commit c5cf201c by 缪晖

订单聚合添加订单基础marketingType字段透传

parent 557f26b1
...@@ -1060,6 +1060,9 @@ public class OrderSdkAdapter { ...@@ -1060,6 +1060,9 @@ public class OrderSdkAdapter {
//发票信息 //发票信息
data.setOrderInvoice(orderInfoReqs.getOrderInvoice()); data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
//订单类型回传
data.setMarketingType(orderInfoReqs.getMarketingType());
return data; return data;
} }
......
...@@ -239,6 +239,11 @@ public class QueryOrdersResponse { ...@@ -239,6 +239,11 @@ public class QueryOrdersResponse {
*/ */
private String thirdOrderCode; private String thirdOrderCode;
/**
* 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
*/
private Integer marketingType;
/** /**
* 退款信息 * 退款信息
......
...@@ -1234,6 +1234,7 @@ public class OrderAdapter { ...@@ -1234,6 +1234,7 @@ public class OrderAdapter {
if (enableRefundCodes.contains(ordersBean.getStatus()) && PayStatus.HAVE_PAID.getCode().equals(ordersBean.getPayStatus())) { if (enableRefundCodes.contains(ordersBean.getStatus()) && PayStatus.HAVE_PAID.getCode().equals(ordersBean.getPayStatus())) {
responseVo.setEnableRefund(true); responseVo.setEnableRefund(true);
} }
responseVo.setMarketingType(ordersBean.getMarketingType());
list.add(responseVo); list.add(responseVo);
}); });
return list; return list;
......
...@@ -360,6 +360,11 @@ public class QueryOrderResponseVo { ...@@ -360,6 +360,11 @@ public class QueryOrderResponseVo {
*/ */
private String downstreamThirdOrderCode; private String downstreamThirdOrderCode;
/**
* 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
*/
private Integer marketingType;
@Data @Data
public static class OrderStatusFlow { public static class OrderStatusFlow {
/** /**
......
...@@ -158,7 +158,7 @@ public class OrderInfoReqs { ...@@ -158,7 +158,7 @@ public class OrderInfoReqs {
//门店订单序号 //门店订单序号
private Integer daySeq; private Integer daySeq;
//订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 //订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
private Integer marketingType; private Integer marketingType;
//销售类型对应的场景值 //销售类型对应的场景值
......
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 to comment