Pārlūkot izejas kodu

抖音对接改造

yumeng 2 gadi atpakaļ
vecāks
revīzija
99be813b80

+ 4 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -82,7 +82,7 @@ public class KuaishouItemCollectSamplesController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(Long itemId, Long promoterId, Long userId, Integer collectSampleStatus, String itemTitle, String promoterNickName, String promoterPhone,
-                              String consignee, Long itemCreateId, Long collectSampleId, String courierNumber, String collectSampleDesc, String fieId, String sort) {
+                              String consignee, Long itemCreateId, Long collectSampleId, String courierNumber, String collectSampleDesc, String fieId, String sort, Integer mediaId) {
         TableDataInfo tableDataInfo = new TableDataInfo();
         try {
             Map<String, Object> requestMap = new HashMap<>();
@@ -157,6 +157,9 @@ public class KuaishouItemCollectSamplesController extends BaseController {
             if (!Check.isNull(sort)) {
                 requestMap.put("sort", sort);
             }
+            if (!Check.isNull(mediaId)) {
+                requestMap.put("mediaId", mediaId);
+            }
             startPage();
             List<KuaishouItemCollectSamples> list = kuaishouItemCollectSamplesService.selectKuaishouItemCollectSamplesList(requestMap);
             return getDataTable(list);

+ 10 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouItemCollectSamples.java

@@ -28,6 +28,7 @@ public class KuaishouItemCollectSamples extends BaseEntity {
      */
     @Excel(name = "商品ID")
     private Long itemId;
+    private Integer mediaId;
 
     /**
      * 商品标题
@@ -195,6 +196,14 @@ public class KuaishouItemCollectSamples extends BaseEntity {
         this.itemId = itemId;
     }
 
+    public Integer getMediaId() {
+        return mediaId;
+    }
+
+    public void setMediaId(Integer mediaId) {
+        this.mediaId = mediaId;
+    }
+
     public String getItemTitle() {
         return itemTitle;
     }
@@ -456,6 +465,7 @@ public class KuaishouItemCollectSamples extends BaseEntity {
         return "KuaishouItemCollectSamples{" +
                 "id=" + id +
                 ", itemId=" + itemId +
+                ", mediaId=" + mediaId +
                 ", itemTitle='" + itemTitle + '\'' +
                 ", itemPrice=" + itemPrice +
                 ", itemImgUrl='" + itemImgUrl + '\'' +

+ 7 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java

@@ -183,13 +183,18 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
 
                 Long relateId = itemJson.getLong("relateId");
                 Long promoterId = promoterJson.getLong("promoterId");
-                //  Integer count = kuaishouItemCollectSamplesMapper.check(itemId, promoterId);
                 Integer count = kuaishouItemCollectSamplesMapper.checkByRelateIdAndPromoterId(relateId, promoterId);
                 if (count > 0) {
                     sampleReceivedCount++;
                     continue;
                 }
+                Integer itemMediaId = itemJson.getInteger("mediaId");
+                Integer promoterMediaId = promoterJson.getInteger("mediaId");
+                if (itemMediaId != promoterMediaId) {
+                    continue;
+                }
                 JSONObject sampleJson = new JSONObject();
+                sampleJson.put("mediaId", itemMediaId);
                 sampleJson.put("itemId", itemJson.getLong("itemId"));
                 sampleJson.put("itemTitle", itemJson.getString("itemTitle"));
                 sampleJson.put("itemPrice", itemJson.getLong("itemPrice"));
@@ -253,6 +258,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
             sample.setCollectSampleDesc(sampleJson.getString("collectSampleDesc"));
             sample.setPromoterNickName(sampleJson.getString("promoterNickName"));
             sample.setPromoterUrl(sampleJson.getString("promoterUrl"));
+            sample.setMediaId(sampleJson.getInteger("mediaId"));
             String sampleVoucher = sampleJson.getString("sampleVoucher");
             if (!Check.isNull(sampleVoucher)) {
                 sample.setSampleVoucher(sampleVoucher);

+ 13 - 1
ruixuan-live/src/main/resources/mapper/isc/KuaishouItemCollectSamplesMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="com.ruixuan.isc.entity.KuaishouItemCollectSamples" id="KuaishouItemCollectSamplesResult">
         <result property="id" column="id"/>
+        <result property="mediaId" column="media_id"/>
         <result property="itemId" column="item_id"/>
         <result property="itemTitle" column="item_title"/>
         <result property="itemPrice" column="item_price"/>
@@ -40,6 +41,7 @@
 
     <sql id="selectKuaishouItemCollectSamplesVo">
         select id,
+               media_id,
                item_id,
                item_title,
                item_price,
@@ -76,6 +78,7 @@
     <select id="selectKuaishouItemCollectSamplesList" parameterType="com.ruixuan.isc.entity.KuaishouItemCollectSamples"
             resultMap="KuaishouItemCollectSamplesResult">
         select t1.id,
+        t1.media_id,
         t1.item_id,
         t1.item_title,
         t1.item_price,
@@ -157,6 +160,9 @@
             <if test="collectSampleDesc != null and collectSampleDesc != ''">
                 and t1.collect_sample_desc = #{collectSampleDesc}
             </if>
+            <if test="mediaId != null and mediaId != ''">
+                and t1.media_id = #{mediaId}
+            </if>
         </where>
         order by ${fieId} ${sort}
     </select>
@@ -170,6 +176,7 @@
             parameterType="com.alibaba.fastjson.JSONArray">
         select
         item_id as 'itemId',
+        media_id as 'mediaId',
         item_title as 'itemTitle',
         item_price as 'itemPrice',
         item_img_url as 'itemImgUrl',
@@ -193,6 +200,7 @@
             parameterType="com.alibaba.fastjson.JSONArray">
         select
         id as 'id',
+        media_id as 'mediaId',
         promoter_id as 'promoterId',
         promoter_nick_name as 'promoterNickName',
         promoter_url as 'promoterUrl',
@@ -275,7 +283,7 @@
                 #{id}
             </foreach>
         </if>
-    order by create_time desc
+        order by create_time desc
     </select>
     <select id="getCollectSampleInfo" resultType="com.alibaba.fastjson.JSONObject"
             parameterType="java.lang.Long">
@@ -301,6 +309,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="itemId != null">item_id,</if>
+            <if test="mediaId != null">media_id,</if>
             <if test="itemTitle != null">item_title,</if>
             <if test="itemPrice != null">item_price,</if>
             <if test="itemImgUrl != null">item_img_url,</if>
@@ -333,6 +342,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="itemId != null">#{itemId},</if>
+            <if test="mediaId != null">#{mediaId},</if>
             <if test="itemTitle != null">#{itemTitle},</if>
             <if test="itemPrice != null">#{itemPrice},</if>
             <if test="itemImgUrl != null">#{itemImgUrl},</if>
@@ -366,6 +376,7 @@
     <insert id="batchAdd">
         insert into kuaishou_item_collect_samples(
         item_id,
+        media_id,
         item_title,
         item_price,
         item_img_url,
@@ -397,6 +408,7 @@
         <foreach collection="adds" item="add" separator=",">
             (
             #{add.itemId},
+            #{add.mediaId},
             #{add.itemTitle},
             #{add.itemPrice},
             #{add.itemImgUrl},