Commit b3dfd73c by 王祖波

orderType

parent c6cc2bd0
......@@ -42,6 +42,11 @@ public class ContactOrderDetailDTO implements Serializable {
* 业务渠道
*/
private String channelCode;
/**
* 老订单类型
*/
private Integer orderType;
/**
* 1 线上; 2 线下
*/
......@@ -210,6 +215,14 @@ public class ContactOrderDetailDTO implements Serializable {
this.channelCode = channelCode;
}
public Integer getOrderType() {
return orderType;
}
public void setOrderType(Integer orderType) {
this.orderType = orderType;
}
public Integer getChannelType() {
return channelType;
}
......
......@@ -164,6 +164,8 @@ public class ContactOrderServiceImpl implements ContactOrderService {
List<ContactOrderDetailDTO> dtoList = new ArrayList<>();
for (TabContactOrder contactOrder : list) {
ContactOrderDetailDTO contactOrderDTO = EntityUtil.changeEntityNew(ContactOrderDetailDTO.class, contactOrder);
PlatformChannelEnum enumByChannelCode = PlatformChannelEnum.getEnumByChannelCode(contactOrder.getChannelCode());
contactOrderDTO.setOrderType(enumByChannelCode == null ? null : enumByChannelCode.getOrderTypeOld());
String goodsInfo = contactOrder.getGoodsInfo();
if (StringUtils.isNotBlank(goodsInfo)) {
contactOrderDTO.setGoodsInfoList(JSONArray.parseArray(goodsInfo, ContactOrderGoodsInfoDTO.class));
......
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