Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of…

Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -505,7 +505,7 @@ public class OrderSdkAdapter {
         } catch (ParseException e) {
             e.printStackTrace();
         }
-
+        orderConditionsReq.setBizTypes(queryOrdersRequest.getBizTypes());
 
         return orderConditionsReq;
     }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryOrdersByConditionsRequest.java

@@ -32,4 +32,5 @@ public class QueryOrdersByConditionsRequest extends BaseConfig {
     private String userId;
     //订单业务类型 1:普通订单 2:虚拟订单
     private Integer bizType;
+    private List<Integer> bizTypes;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/QueryOrdersRequest.java

@@ -3,6 +3,8 @@ package com.freemud.sdk.api.assortment.order.request.order;
 import com.freemud.sdk.api.assortment.order.config.BaseConfig;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class QueryOrdersRequest extends BaseConfig {
 
@@ -55,4 +57,6 @@ public class QueryOrdersRequest extends BaseConfig {
      */
     private String[] source;
 
+    private List<Integer> bizTypes;
+
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -829,6 +829,8 @@ public class OrderAdapter {
 //            queryOrdersDto.setStatus(statuses);
 //            queryOrdersDto.setType(new Integer[]{});
         }
+        //商品订单和卖券订单
+        queryOrdersDto.setBizTypes(Arrays.asList(1,6));
 
         return queryOrdersDto;
     }
@@ -1660,13 +1662,14 @@ public class OrderAdapter {
         productVo.setSpecification("");
         List<InventedParentActivityVo> inventedParentActivityVos = new ArrayList<>();
         String attributeNames = "";
-        if (StringUtils.isNotBlank(productBean.getAddInfo())) {
+        if (StringUtils.isNotBlank(productBean.getAddInfo()) && productBean.getAddInfo().contains("attributeNames")) {
             OrderProductAddInfo orderProductAddInfo = gson.fromJson(productBean.getAddInfo(), OrderProductAddInfo.class);
-            if(productBean.getAddInfo().contains("attributeNames")){
             attributeNames = orderProductAddInfo.getAttributeNames();
             productVo.setAttributeNames(attributeNames);
             productVo.setSpecification(attributeNames);
         }
+        if(StringUtils.isNotBlank(productBean.getExtInfo())){
+            OrderProductAddInfo orderProductAddInfo = gson.fromJson(productBean.getExtInfo(), OrderProductAddInfo.class);
             if(CollectionUtils.isNotEmpty(orderProductAddInfo.getProductBindingCoupons())){
                 for (ProductBindingCouponType productBindingCouponType : orderProductAddInfo.getProductBindingCoupons()){
                     InventedParentActivityVo inventedParentActivityVo = new InventedParentActivityVo();
@@ -1677,7 +1680,6 @@ public class OrderAdapter {
                 }
                 productVo.setInventedParentActivitiesVo(inventedParentActivityVos);
             }
-
         }
         productVo.setOriginalPrice(productBean.getPrice());
         productVo.setFinalPrice(productBean.getSalePrice());

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersDto.java

@@ -2,6 +2,8 @@ package cn.freemud.entities.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class QueryOrdersDto {
 
@@ -54,5 +56,6 @@ public class QueryOrdersDto {
      */
     private String[] source;
 
+    private List<Integer> bizTypes;
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderConditionsReq.java

@@ -106,6 +106,8 @@ public class OrderConditionsReq {
     //订单业务类型 1:普通订单 2:虚拟订单
     private Integer bizType;
 
+    private List<Integer> bizTypes;
+
     // 外部对象ID 如:活动ID
     private List<String> externalObjectIds;
     // 外部对象ID 如:活动类型

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderUserConditionsReq.java

@@ -52,4 +52,7 @@ public class OrderUserConditionsReq {
     //当前分页
     private Integer pageNum;
 
+    //订单类型集合
+    private List<Integer> bizTypes;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/QueryAfterSalesOrderConditionsReq.java

@@ -67,4 +67,6 @@ public class QueryAfterSalesOrderConditionsReq {
     private String trackingNo;
 
     protected Integer ver;
+
+    private List<Integer> bizTypes;
 }