Merge remote-tracking branch 'origin/master'

fs-admin/src/main/java/com/fs/his/controller/FsUserController.java

@@ -403,5 +403,15 @@ public class FsUserController extends BaseController
         return userIntegralLogsService.addIntegralTemplate(integralTemplateParam);
     }
 
+    @PreAuthorize("@ss.hasPermi('his:user:unbind')")
+    @Log(title = "批量解绑会员（删除销售和会员的关系）", businessType = BusinessType.DELETE)
+    @DeleteMapping("/batchUnbind")
+    public AjaxResult batchUnbind(@RequestBody List<Long> userIds){
+        if(!userIds.isEmpty()){
+            return toAjax(userCompanyUserService.batchUnbind(userIds));
+        } else {
+            return error("请先选择会员");
+        }
+    }
 
 }

fs-service/src/main/java/com/fs/course/mapper/FsUserCompanyUserMapper.java

@@ -95,4 +95,13 @@ public interface FsUserCompanyUserMapper extends BaseMapper<FsUserCompanyUser>{
     List<Long> selectFsUserCompanyUserListByMap(@Param("param") Map<String, Object> param);
 
     List<FsUserCompanyUser> selectFsUserCompanyUserByIds(@Param("param") Map<String, Object> param);
+
+    /**
+     * 批量删除微信用户和销售关系
+     *
+     * @param userIds 需要删除的userId集合
+     * @return 删除的记录数
+     */
+    int batchDeleteByIds(@Param("userIds") List<Long> userIds);
+
 }

fs-service/src/main/java/com/fs/course/service/IFsUserCompanyUserService.java

@@ -128,4 +128,12 @@ public interface IFsUserCompanyUserService extends IService<FsUserCompanyUser>{
      * @return Boolean
      */
     Boolean batchUpdateStatus(List<Long> ids, int status);
+
+    /**
+     * 解绑会员
+     * @auth caoliqin
+     * @param userIds 会员用户id
+     * @return
+     */
+    Integer batchUnbind(List<Long> userIds);
 }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCompanyUserServiceImpl.java

@@ -223,4 +223,9 @@ public class FsUserCompanyUserServiceImpl extends ServiceImpl<FsUserCompanyUserM
         }
         return baseMapper.batchUpdateStatus(ids, status) > 0;
     }
+
+    @Override
+    public Integer batchUnbind(List<Long> userIds) {
+        return baseMapper.batchDeleteByIds(userIds);
+    }
 }

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

@@ -194,4 +194,21 @@
         </where>
     </select>
 
+    <!-- 批量删除微信用户和销售关系 -->
+    <delete id="batchDeleteByIds">
+        DELETE FROM fs_user_company_user
+        WHERE
+        <choose>
+            <when test="userIds != null and userIds.size() > 0">
+                    user_id IN
+                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
+                    #{userId}
+                </foreach>
+            </when>
+            <otherwise>
+                user_id = 0
+            </otherwise>
+        </choose>
+    </delete>
+
 </mapper>