Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop

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

@@ -2223,9 +2223,9 @@ public class OrderAdapter {
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品
+                        createOrderComboProduct.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
                         List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
                         product.getMaterialList().forEach(cartMaterial -> {
-                            product.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
                             materialProducts.add(convent2MCCafeOrderProductDemo(cartMaterial, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
                         });
                         createOrderComboProduct.setMaterialProduct(materialProducts);
@@ -2234,9 +2234,9 @@ public class OrderAdapter {
                 createOrderProductDemoDto.setComboProduct(comboProducts);
             } else if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getMaterialList())) {
                 //加料商品
+                createOrderProductDemoDto.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
                 List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
                 cartGoodsDetailDto.getMaterialList().forEach(product -> {
-                    product.setProductType(ProductType.MATERIALPRODUCT_UPPRICE.getCode());
                     materialProducts.add(convent2MCCafeOrderProductDemo(product, ProductType.LITTLE_MATERIAL_PRODUCT.getCode()));
                 });
                 createOrderProductDemoDto.setMaterialProduct(materialProducts);

order-management/src/main/java/cn/freemud/management/entities/dto/response/coupon/McdNetCouponInfoRespDto.java

@@ -98,6 +98,8 @@ public class McdNetCouponInfoRespDto {
      * 券状态
      */
     private Integer status;
+
+    private Integer extend_type;
     /**
      * 只有商品券时返回
      */

order-management/src/main/java/cn/freemud/management/entities/dto/response/coupon/McdNetCouponProductRespDto.java

@@ -23,6 +23,13 @@ public class McdNetCouponProductRespDto {
     private String mcd_productCode;
 
     /**
+     * 开个店商品id
+     */
+    private String sku_id;
+
+    private String spu_id;
+
+    /**
      * 商品名称
      */
     private String name;