Pārlūkot izejas kodu

达人添加 头条维度

zhaoxian 2 gadi atpakaļ
vecāks
revīzija
5221d13215

+ 2 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouPromoterController.java

@@ -48,11 +48,12 @@ public class KuaishouPromoterController extends BaseController {
     public TableDataInfo list(@ApiParam("创建人ID") @RequestParam(value = "userId", required = true) Long userId,
                               @ApiParam("达人ID") @RequestParam(value = "promoterId", required = false) Long promoterId,
                               @ApiParam("达人名称") @RequestParam(value = "promoterNickName", required = false) String promoterNickName,
+                              @ApiParam("媒体") @RequestParam(value = "mediaId", required = false) String mediaId,
                               @ApiParam("排序参数") @RequestParam(value = "parameter", required = false) String parameter,
                               @ApiParam("正序倒叙") @RequestParam(value = "orderBy", required = false) String orderBy
 
     ) {
-        List<KuaishouPromoter> list = kuaishouPromoterService.selectKuaishouPromoterList(userId, promoterId, promoterNickName, parameter, orderBy);
+        List<KuaishouPromoter> list = kuaishouPromoterService.selectKuaishouPromoterList(userId, promoterId, promoterNickName, mediaId, parameter, orderBy);
         return getDataTable(list);
     }
 

+ 5 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouPromoter.java

@@ -23,6 +23,11 @@ public class KuaishouPromoter {
     private Long id;
 
     /**
+     * 媒体:1头条,2快手
+     */
+    private String mediaId;
+
+    /**
      * 创建人ID
      */
     @ApiModelProperty(name = "创建人ID")

+ 3 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/KuaishouPromoterMapper.java

@@ -22,7 +22,9 @@ public interface KuaishouPromoterMapper {
      * @return 快手达人 信息集合
      */
     public List<KuaishouPromoter> selectKuaishouPromoterList(@Param("userList") List<Long> userList, @Param("promoterId") Long promoterId,
-                                                             @Param("promoterNickName") String promoterNickName, @Param("parameter") String parameter, @Param("orderBy") String orderBy);
+                                                             @Param("promoterNickName") String promoterNickName,
+                                                             @Param("mediaId") String mediaId,
+                                                             @Param("parameter") String parameter, @Param("orderBy") String orderBy);
 
     /**
      * 新增快手达人 信息

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKuaishouPromoterService.java

@@ -28,7 +28,7 @@ public interface IKuaishouPromoterService {
      * @param kuaishouPromoter 快手达人 信息
      * @return 快手达人 信息集合
      */
-    public List<KuaishouPromoter> selectKuaishouPromoterList(Long userId, Long promoterId, String promoterNickName, String parameter, String orderBy);
+    public List<KuaishouPromoter> selectKuaishouPromoterList(Long userId, Long promoterId, String promoterNickName, String mediaId, String parameter, String orderBy);
 
     /**
      * 新增快手达人 信息

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

@@ -71,7 +71,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
      * @return 快手达人 信息
      */
     @Override
-    public List<KuaishouPromoter> selectKuaishouPromoterList(Long userId, Long promoterId, String promoterNickName, String parameter, String orderBy) {
+    public List<KuaishouPromoter> selectKuaishouPromoterList(Long userId, Long promoterId, String promoterNickName, String mediaId, String parameter, String orderBy) {
         String roleKey = sysUserService.getRoleKeyByUserId(userId);
         List<Long> userList = null;
         //角色:供应链管理员、招商、招商经理可以看到所有的达人信息
@@ -109,7 +109,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
             orderBy = "desc";
         }
         PageUtils.startPage();
-        List<KuaishouPromoter> list = kuaishouPromoterMapper.selectKuaishouPromoterList(userList, promoterId, promoterNickName, parameter, orderBy);
+        List<KuaishouPromoter> list = kuaishouPromoterMapper.selectKuaishouPromoterList(userList, promoterId, promoterNickName, mediaId, parameter, orderBy);
         list.forEach(ent -> {
             JSONObject follow = kuaishouPromoterMapper.getFollowUpRecordsByUserId(ent.getPromoterId(), ent.getUserId());
             ent.setFollowUpRecord(Check.isNull(follow) ? "-" : follow.getString("txt"));
@@ -153,7 +153,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
                     @Override
                     public void run() {
                         try {
-                            editPromoter(promoter.getId(), promoter.getPromoterId(), true);
+                            editPromoter(promoter.getId(), promoter.getMediaId(), promoter.getPromoterId(), true);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -232,7 +232,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
             promoter.setUserName(sysUser.getNickName());
         }
         kuaishouPromoterMapper.insertKuaishouPromoter(promoter);
-        editPromoter(promoter.getId(), promoter.getPromoterId(), true);
+        editPromoter(promoter.getId(), promoter.getMediaId(), promoter.getPromoterId(), true);
         result.put("code", 200);
         result.put("msg", "success");
         return result;
@@ -241,7 +241,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
     /**
      * 同步更新数据
      */
-    private void editPromoter(Long id, Long promoterId, boolean flag) {
+    private void editPromoter(Long id, String mediaId, Long promoterId, boolean flag) {
         try {
             if (flag) {
                 /*缓存标记,每日第一次访问调用该接口,更新达人部分(昵称,省市,粉丝,总销售,头像等)数据*/
@@ -289,7 +289,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
             @Override
             public void run() {
                 try {
-                    list.forEach(kuaishouPromoter -> editPromoter(kuaishouPromoter.getId(), kuaishouPromoter.getPromoterId(), false));
+                    list.forEach(kuaishouPromoter -> editPromoter(kuaishouPromoter.getId(), kuaishouPromoter.getMediaId(), kuaishouPromoter.getPromoterId(), false));
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -409,7 +409,7 @@ public class KuaishouPromoterServiceImpl implements IKuaishouPromoterService {
                     @Override
                     public void run() {
                         try {
-                            editPromoter(promoter.getId(), promoter.getPromoterId(), true);
+                            editPromoter(promoter.getId(), promoter.getMediaId(), promoter.getPromoterId(), true);
                         } catch (Exception e) {
                             e.printStackTrace();
                         }

+ 10 - 0
ruixuan-live/src/main/resources/mapper/isc/KuaishouPromoterMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="com.ruixuan.isc.entity.KuaishouPromoter" id="KuaishouPromoterResult">
         <result property="id" column="id"/>
         <result property="userId" column="user_id"/>
+        <result property="mediaId" column="media_id"/>
         <result property="userName" column="user_name"/>
         <result property="promoterId" column="promoter_id"/>
         <result property="promoterNickName" column="promoter_nick_name"/>
@@ -32,6 +33,7 @@
 
     <sql id="selectKuaishouPromoterVo">
         select id,
+               media_id,
                user_id,
                user_name,
                promoter_id,
@@ -57,6 +59,7 @@
         SELECT
         t1.id,
         t1.user_id,
+        t1.media_id,
         t1.user_name,
         t1.promoter_id,
         t1.promoter_nick_name,
@@ -91,6 +94,9 @@
             <if test="promoterNickName != null  and promoterNickName != ''">
                 and t1.promoter_nick_name like concat('%', #{promoterNickName}, '%')
             </if>
+            <if test="mediaId != null  and mediaId != ''">
+                and t1.media_id = #{mediaId}
+            </if>
         </where>
         order by ${parameter} ${orderBy}
     </select>
@@ -238,6 +244,7 @@
         insert into kuaishou_promoter
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="userId != null">user_id,</if>
+            <if test="mediaId != null">media_id,</if>
             <if test="userName != null">user_name,</if>
             <if test="promoterId != null">promoter_id,</if>
             <if test="promoterNickName != null">promoter_nick_name,</if>
@@ -256,6 +263,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
+            <if test="mediaId != null">#{mediaId},</if>
             <if test="userName != null">#{userName},</if>
             <if test="promoterId != null">#{promoterId},</if>
             <if test="promoterNickName != null">#{promoterNickName},</if>
@@ -294,6 +302,7 @@
         update kuaishou_promoter
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
+            <if test="mediaId != null">media_id = #{mediaId},</if>
             <if test="userName != null">user_name = #{userName},</if>
             <if test="promoterId != null">promoter_id = #{promoterId},</if>
             <if test="promoterNickName != null">promoter_nick_name = #{promoterNickName},</if>
@@ -319,6 +328,7 @@
         update kuaishou_promoter
         <trim prefix="SET" suffixOverrides=",">
             <if test="userId != null">user_id = #{userId},</if>
+            <if test="mediaId != null">media_id = #{mediaId},</if>
             <if test="userName != null">user_name = #{userName},</if>
             <if test="promoterId != null">promoter_id = #{promoterId},</if>
             <if test="promoterNickName != null">promoter_nick_name = #{promoterNickName},</if>