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/java/com/fs/hisStore/domain/FsUserBillScrm.java

@@ -6,7 +6,7 @@ import com.fs.common.core.domain.BaseEntity;
 
 /**
  * 用户账单对象 fs_user_bill
- * 
+ *
  * @author fs
  * @date 2022-04-30
  */
@@ -16,7 +16,7 @@ public class FsUserBillScrm extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户账单id */
-    private Long id;
+    private Long billId;
 
     /** 用户uid */
     @Excel(name = "用户uid")
@@ -68,12 +68,13 @@ public class FsUserBillScrm extends BaseEntity
         return serialVersionUID;
     }
 
-    public Long getId() {
-        return id;
+    public Long getBillId() {
+        return billId;
     }
 
-    public void setId(Long id) {
-        this.id = id;
+    public FsUserBillScrm setBillId(Long billId) {
+        this.billId = billId;
+        return this;
     }
 
     public Long getUserId() {

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>

fs-service/src/main/resources/mapper/hisStore/FsUserBillScrmMapper.xml

@@ -3,9 +3,9 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fs.hisStore.mapper.FsUserBillScrmMapper">
-    
+
     <resultMap type="FsUserBillScrm" id="FsUserBillResult">
-        <result property="id"    column="id"    />
+        <result property="bill_id"    column="id"    />
         <result property="userId"    column="user_id"    />
         <result property="businessId"    column="business_id"    />
         <result property="category"    column="category"    />
@@ -22,12 +22,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsUserBillVo">
-        select id, user_id, business_id, category, bill_type, type, title, number, balance, remark, create_time, update_time, status,tui_user_id from fs_user_bill
+        select bill_id, user_id, business_id, category, bill_type, type, title, number, balance, remark, create_time, update_time, status,tui_user_id from fs_user_bill
     </sql>
 
     <select id="selectFsUserBillList" parameterType="FsUserBillScrm" resultMap="FsUserBillResult">
         <include refid="selectFsUserBillVo"/>
-        <where>  
+        <where>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="businessId != null  and businessId != ''"> and business_id = #{businessId}</if>
             <if test="category != null  and category != ''"> and category = #{category}</if>
@@ -40,12 +40,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tuiUserId != null "> and tui_user_id = #{tuiUserId}</if>
         </where>
     </select>
-    
+
     <select id="selectFsUserBillById" parameterType="Long" resultMap="FsUserBillResult">
         <include refid="selectFsUserBillVo"/>
-        where id = #{id}
+        where bill_id = #{id}
     </select>
-        
+
     <insert id="insertFsUserBill" parameterType="FsUserBillScrm" useGeneratedKeys="true" keyProperty="id">
         insert into fs_user_bill
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -97,18 +97,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null">status = #{status},</if>
             <if test="tuiUserId != null">tui_user_id = #{tuiUserId},</if>
         </trim>
-        where id = #{id}
+        where bill_id = #{id}
     </update>
 
     <delete id="deleteFsUserBillById" parameterType="Long">
-        delete from fs_user_bill where id = #{id}
+        delete from fs_user_bill where bill_id = #{id}
     </delete>
 
     <delete id="deleteFsUserBillByIds" parameterType="String">
-        delete from fs_user_bill where id in 
+        delete from fs_user_bill where bill_id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    
-</mapper>
+
+</mapper>