Sfoglia il codice sorgente

注释下载app标签相关代码

wangxy 1 settimana fa
parent
commit
d666cd7947

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

@@ -160,10 +160,6 @@ public class FsUser extends BaseEntity
      * **/
     private Long qwUserId;
 
-    /**
-     * 邀请该用户app下载的销售人员ID
-     */
-    private  Long invitedBySalesId;
     public void setNickName(String nickname)
     {
         if(StringUtils.isNotEmpty(nickname)){

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

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

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

@@ -1661,22 +1661,22 @@ public class FsUserServiceImpl implements IFsUserService {
         return new HisFsUserVO();
     }
 
-    @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;
-    }
+//    @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;
+//    }
 
 }

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

@@ -52,7 +52,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,company_id,company_user_id,invited_by_sales_id 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,company_id,company_user_id from fs_user
     </sql>
 
     <select id="selectFsUserList" parameterType="FsUser" resultMap="FsUserResult">
@@ -684,7 +684,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyId != null">company_id = #{companyId},</if>
             <if test="orderCount != null">order_count = #{orderCount},</if>
             <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
-            <if test="invitedBySalesId != null">invited_by_sales_id = #{invitedBySalesId},</if>
         </trim>
         where user_id = #{userId}
     </update>

+ 9 - 9
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();
+//    }
 
 }