关联微盟商品

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -209,7 +209,7 @@ public class ContentMaterialController {
     @ResponseBody
     @RequestMapping("/get-material")
     public RestResponse<ContentMaterialInfoVO> getMaterialMember(String enterpriseId,Long contentMaterialId,String clerkId) {
-        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.getMaterialMember(enterpriseId, contentMaterialId, clerkId);
+        ServiceResponse<ContentMaterialDTO> response = contentMaterialApiService.getMaterialMember(enterpriseId, contentMaterialId, clerkId, "");
         if (!response.isSuccess()) {
             return RestResponse.failure(response.getCode(), response.getMessage());
         }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialSaveQO.java

@@ -3,6 +3,7 @@ package com.gic.haoban.manage.web.qo.content;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gic.content.api.dto.material.ContentMaterialRelationThirdDTO;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;
 
@@ -100,6 +101,11 @@ public class ContentMaterialSaveQO {
      */
     private List<String> contentGoodsIdList;
 
+    /**
+     * 关联第三方商品id列表
+     */
+    private List<ContentMaterialRelationThirdDTO> thirdGoodsList;
+
     public Long getContentMaterialId() {
         return contentMaterialId;
     }
@@ -259,5 +265,13 @@ public class ContentMaterialSaveQO {
     public void setContentGoodsIdList(List<String> contentGoodsIdList) {
         this.contentGoodsIdList = contentGoodsIdList;
     }
+
+    public List<ContentMaterialRelationThirdDTO> getThirdGoodsList() {
+        return thirdGoodsList;
+    }
+
+    public void setThirdGoodsList(List<ContentMaterialRelationThirdDTO> thirdGoodsList) {
+        this.thirdGoodsList = thirdGoodsList;
+    }
 }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/SimpleGoodsInfoVO.java

@@ -72,5 +72,15 @@ public class SimpleGoodsInfoVO implements Serializable {
      */
     private Integer sourceType;
 
+    /**
+     * 第三方商品id
+     */
+    private String thirdGoodsId;
+
+    /**
+     * 商品类型0:gic 1:微盟
+     */
+    private Integer thirdType = 0;
+
 }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/creative/ContentGoodsVO.java

@@ -55,6 +55,16 @@ public class ContentGoodsVO {
      */
     private BigDecimal minPrice;
 
+    /**
+     * 第三方商品id
+     */
+    private String thirdGoodsId;
+
+    /**
+     * 商品类型0:gic 1:微盟
+     */
+    private Integer thirdType = 0;
+
     public String getGoodsId() {
         return goodsId;
     }
@@ -126,4 +136,20 @@ public class ContentGoodsVO {
     public void setMinPrice(BigDecimal minPrice) {
         this.minPrice = minPrice;
     }
+
+    public String getThirdGoodsId() {
+        return thirdGoodsId;
+    }
+
+    public void setThirdGoodsId(String thirdGoodsId) {
+        this.thirdGoodsId = thirdGoodsId;
+    }
+
+    public Integer getThirdType() {
+        return thirdType;
+    }
+
+    public void setThirdType(Integer thirdType) {
+        this.thirdType = thirdType;
+    }
 }