app销售标签,小节备注

fs-service/src/main/java/com/fs/course/domain/FsUserCourseVideo.java

@@ -115,4 +115,9 @@ public class FsUserCourseVideo extends BaseEntity
     private String jobId;
 
     private String vid;
+
+    /**
+     * 备注
+     */
+    private  String  remark;
 }

fs-service/src/main/java/com/fs/course/vo/FsUserCourseVideoQVO.java

@@ -95,4 +95,6 @@ public class FsUserCourseVideoQVO extends BaseEntity {
      * 课程关联的拍商品
      */
     private List<FsCourseProduct>  courseProducts;
+
+    private String remark;
 }

fs-service/src/main/java/com/fs/his/domain/FsUser.java

@@ -183,6 +183,8 @@ public class FsUser extends BaseEntity
     /** 推广上级用户ID */
     private Long spreadUserId;
 
+    private  Long invitedBySalesId;//邀请人销售id
+
     public void setNickName(String nickname)
     {
         if(StringUtils.isNotEmpty(nickname)){

fs-service/src/main/java/com/fs/his/service/IFsUserService.java

@@ -263,5 +263,5 @@ public interface IFsUserService
     /**
      * 销售分享app下载链接给用户
      */
-//    Boolean  bindUserToSales(Long userId, Long salesId);
+    Boolean  bindUserToSales(Long userId, Long salesId);
 }

fs-service/src/main/java/com/fs/his/service/impl/FsUserServiceImpl.java

@@ -1805,4 +1805,22 @@ public class FsUserServiceImpl implements IFsUserService {
         fsExportTaskMapper.updateFsExportTask(task);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean bindUserToSales(Long userId, Long salesId) {
+        FsUser fsUser = fsUserMapper.selectFsUserById(userId);
+        if (fsUser == null) {
+            throw new CustomException("用户不存在");
+        }
+        if(fsUser.getInvitedBySalesId() != null){
+            if(!fsUser.getInvitedBySalesId().equals(salesId)){
+                throw new CustomException("该用户已从其他销售的链接下载");
+            }else {
+                throw new CustomException("已发送给app下载链接给该用户");
+            }
+        }
+        fsUser.setInvitedBySalesId(salesId);
+        return fsUserMapper.updateFsUser(fsUser)>0;
+    }
+
 }

fs-service/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -37,6 +37,7 @@
         <result property="lastJoinTime"    column="last_join_time"    />
         <result property="projectId"    column="project_id"    />
         <result property="isFirst"    column="is_first"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectFsUserCourseVideoVo">
@@ -110,6 +111,7 @@
             <if test="isFirst != null">is_first,</if>
             <if test="jobId != null">job_id,</if>
             <if test="vid != null">vid,</if>
+            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fileId != null">#{fileId},</if>
@@ -150,6 +152,7 @@
             <if test="isFirst != null">#{isFirst},</if>
             <if test="jobId != null">#{jobId},</if>
             <if test="vid != null">#{vid},</if>
+            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
     <insert id="insertBatchFsUserCourseVideo" parameterType="FsUserCourseVideo" useGeneratedKeys="true" keyProperty="videoId">
@@ -239,6 +242,7 @@
             <if test="isFirst != null">is_first = #{isFirst},</if>
             <if test="jobId != null">job_id = #{jobId},</if>
             <if test="vid != null">vid = #{vid},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where video_id = #{videoId}
     </update>

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsUserVo">
-        select user_id,qw_ext_id,sex,is_buy,`level`,course_ma_open_id,is_push,is_add_qw,source,login_device,is_individuation_push,store_open_id,password,jpush_id, is_vip,vip_start_date,vip_end_date,vip_level,vip_status,nick_name,integral_status, avatar, phone, integral,sign_num, status, tui_user_id, tui_time, tui_user_count, ma_open_id, mp_open_id, union_id, is_del, user_code, remark, create_time, update_time, last_ip, balance,is_weixin_auth,parent_id,qw_user_id,app_id,company_id,company_user_id,is_promoter,now_money,brokerage_price,spread_user_id, spread_time,pay_count, spread_count,user_type from fs_user
+        select user_id,qw_ext_id,sex,is_buy,`level`,course_ma_open_id,is_push,is_add_qw,source,login_device,is_individuation_push,store_open_id,password,jpush_id, is_vip,vip_start_date,vip_end_date,vip_level,vip_status,nick_name,integral_status, avatar, phone, integral,sign_num, status, tui_user_id, tui_time, tui_user_count, ma_open_id, mp_open_id, union_id, is_del, user_code, remark, create_time, update_time, last_ip, balance,is_weixin_auth,parent_id,qw_user_id,app_id,company_id,company_user_id,is_promoter,now_money,brokerage_price,spread_user_id, spread_time,pay_count, spread_count,user_type,invited_by_sales_id from fs_user
     </sql>
 
     <select id="selectFsUserList" parameterType="FsUser" resultMap="FsUserResult">
@@ -718,6 +718,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="orderCount != null">order_count = #{orderCount},</if>
             <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
             <if test="appId != null">app_id = #{appId},</if>
+            <if test="invitedBySalesId != null">invited_by_sales_id = #{invitedBySalesId},</if>
         </trim>
         where user_id = #{userId}
     </update>

fs-user-app/src/main/java/com/fs/app/controller/course/CourseFsUserController.java

@@ -186,14 +186,14 @@ public class CourseFsUserController extends AppBaseController {
         logger.error("zyp \n【h5看课中途报错】：{}",msg);
     }
 
-//    @PostMapping("/bindSales")
-//    @ApiOperation("销售分享app下载链接给用户")
-//    public R bindSalesToUser(@RequestBody FsUserBindSalesParamDTO param){
-//        Boolean r = fsUserService.bindUserToSales(param.getUserId(), param.getSalesId());
-//        if (r) {
-//            return R.ok();
-//        }
-//        return R.error();
-//    }
+    @PostMapping("/bindSales")
+    @ApiOperation("销售分享app下载链接给用户")
+    public R bindSalesToUser(@RequestBody FsUserBindSalesParamDTO param){
+        Boolean r = fsUserService.bindUserToSales(param.getUserId(), param.getSalesId());
+        if (r) {
+            return R.ok();
+        }
+        return R.error();
+    }
 
 }