订单列表增加活动类型

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinStoreOrderListVo.java

@@ -56,6 +56,8 @@ public class GoblinStoreOrderListVo implements Cloneable {
     private String logisticsCompany;
     @ApiModelProperty(value = " 活动名称")
     private String marketName;
+    @ApiModelProperty(value = " 活动类型")
+    private String marketType;
     @ApiModelProperty(value = " 物流相关")
     private List<GoblinMailVo> goblinMailVoList;
     //todo hujiachen 缺发货时间

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinStoreOrderServiceImpl.java

@@ -80,6 +80,7 @@ public class GoblinStoreOrderServiceImpl implements IGoblinStoreOrderService {
             vo.setPayType(item.getPayType());
             vo.setPriceActual(item.getPriceActual());
             vo.setStatus(item.getStatus());
+            vo.setMarketType(item.getMarketType());
             vo.setPriceExpress(item.getPriceExpress());
             List<GoblinStoreOrderListSkuVo> orderListSkuVos = ObjectUtil.getGoblinStoreOrderListSkuVoArrayList();
             for (String skuId : item.getOrderSkuVoIds()) {