小程序分配协销/小组权限

src/main/java/com/caimei365/user/controller/ClubApi.java

@@ -528,8 +528,9 @@ public ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager,Intege
 
     @ApiOperation("可分配协销列表")
     @GetMapping("/chose/list")
-    public ResponseJson<List<ServiceProviderVo>> choseSales() {
-        return clubService.choseSales();
+    @ApiImplicitParam(required = true, name = "spId", value = "协销id")
+    public ResponseJson<List<ServiceProviderVo>> choseSales(Integer spId) {
+        return clubService.choseSales(spId);
     }
 
     @ApiOperation("分配协销")

src/main/java/com/caimei365/user/controller/SellerApi.java

@@ -112,7 +112,7 @@ public class SellerApi {
         if (null == spId) {
             return ResponseJson.error("spId 不能为空！", null);
         }
-        return sellerService.getServiceTeam(spId);
+        return sellerService.getServiceTeam(spId, 1);
     }
 
     /**

src/main/java/com/caimei365/user/mapper/SellerMapper.java

@@ -87,7 +87,7 @@ public interface SellerMapper {
 
     List<Integer> findAllServiceIds(Integer serviceProviderId);
 
-    List<ServiceProviderVo> findServices(Integer spId);
+    List<ServiceProviderVo> findServices(@Param("spId")Integer spId,@Param("status")Integer status);
 
-    List<ServiceProviderVo> findAllServices(Integer spId);
+    List<ServiceProviderVo> findAllServices(@Param("spId")Integer spId,@Param("status")Integer status);
 }

src/main/java/com/caimei365/user/service/ClubService.java

@@ -274,7 +274,7 @@ public interface ClubService {
 
     ResponseJson deleteReport(Integer reportId);
 
-    ResponseJson<List<ServiceProviderVo>> choseSales();
+    ResponseJson<List<ServiceProviderVo>> choseSales(Integer spId);
 
     ResponseJson changeSales(Integer clubId, Integer spId);
 }

src/main/java/com/caimei365/user/service/SellerService.java

@@ -80,5 +80,5 @@ public interface SellerService {
      */
     ResponseJson<ServiceProviderPo> getSellerHome(Integer userId);
 
-    ResponseJson<List<ServiceProviderVo>> getServiceTeam(Integer spId);
+    ResponseJson<List<ServiceProviderVo>> getServiceTeam(Integer spId,Integer status);
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -14,6 +14,7 @@ import com.caimei365.user.model.po.UserBeansHistoryPo;
 import com.caimei365.user.model.po.UserPo;
 import com.caimei365.user.model.vo.*;
 import com.caimei365.user.service.ClubService;
+import com.caimei365.user.service.SellerService;
 import com.caimei365.user.utils.ImageUtils;
 import com.caimei365.user.utils.MathUtil;
 import com.caimei365.user.utils.OssUtil;
@@ -56,6 +57,8 @@ public class ClubServiceImpl implements ClubService {
     private SuperVipMapper vipMapper;
     @Resource
     private RedisService redisService;
+    @Resource
+    private SellerService sellerService;
 
     /**
      * 根据用户Id查询机构资料
@@ -588,8 +591,8 @@ public class ClubServiceImpl implements ClubService {
     }
 
     @Override
-    public ResponseJson<List<ServiceProviderVo>> choseSales() {
-        return ResponseJson.success(clubMapper.findSales());
+    public ResponseJson<List<ServiceProviderVo>> choseSales(Integer spId) {
+        return sellerService.getServiceTeam(spId, 2);
     }
 
     @Override
@@ -608,11 +611,11 @@ public class ClubServiceImpl implements ClubService {
         clubMapper.updateClubSpId(clubId, spId);
         //后台更换协销逻辑移植
         List<Integer> oldSpIds = clubMapper.findOldSpIds(clubId);
-        if(null!=oldSpIds&&oldSpIds.size()>0){
-            clubMapper.updateRemarksSp(clubId, oldSpId, spId,0);
+        if (null != oldSpIds && oldSpIds.size() > 0) {
+            clubMapper.updateRemarksSp(clubId, oldSpId, spId, 0);
             clubMapper.updateReportSp(clubId, oldSpId, spId);
-        }else{
-            clubMapper.updateRemarksSp(clubId, oldSpId, spId,1);
+        } else {
+            clubMapper.updateRemarksSp(clubId, oldSpId, spId, 1);
         }
         return ResponseJson.success();
     }

src/main/java/com/caimei365/user/service/impl/SellerServiceImpl.java

@@ -194,15 +194,15 @@ public class SellerServiceImpl implements SellerService {
     }
 
     @Override
-    public ResponseJson<List<ServiceProviderVo>> getServiceTeam(Integer spId) {
+    public ResponseJson<List<ServiceProviderVo>> getServiceTeam(Integer spId,Integer status) {
         Integer leaderId = sellerMapper.findLeaderIdByServiceId(spId);
         Integer managerId = sellerMapper.findmanagerIdByServiceId(spId);
         List<ServiceProviderVo> serviceProviderVos = new ArrayList<>();
         if (null != leaderId) {
-            serviceProviderVos = sellerMapper.findServices(spId);
+            serviceProviderVos = sellerMapper.findServices(spId,status);
         }
         if (null != managerId) {
-            serviceProviderVos = sellerMapper.findAllServices(spId);
+            serviceProviderVos = sellerMapper.findAllServices(spId,status);
         }
         //个人返回空，组长返回小组所有人
         return ResponseJson.success(serviceProviderVos);

src/main/resources/mapper/ClubMapper.xml

@@ -766,7 +766,7 @@
             <if test="con != null and con.size > 0">
                 and
                 <foreach collection="con" item="item" index="index" open="(" close=")" separator="OR">
-                    ccr.consultType LIKE CONCAT('%',#{consultType},'%')
+                    ccr.consultType LIKE CONCAT('%',#{item},'%')
                 </foreach>
             </if>
         </where>

src/main/resources/mapper/SellerMapper.xml

@@ -2,90 +2,92 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.user.mapper.SellerMapper">
     <select id="getLoginSellerByMobile" resultType="com.caimei365.user.model.vo.UserLoginVo">
-        select u.userID as userId,
-            u.clubID as clubId,
-            u.shopID as shopId,
-            u.userName as userName,u.name as name,
-            u.mobile as mobile,
-            u.bindMobile as bindMobile,
-            u.email as email,
-            u.guideFlag as guideFlag,
-            u.userPermission as userPermission,
-            u.userIdentity as userIdentity,
-            u.password as password
+        select u.userID         as userId,
+               u.clubID         as clubId,
+               u.shopID         as shopId,
+               u.userName       as userName,
+               u.name           as name,
+               u.mobile         as mobile,
+               u.bindMobile     as bindMobile,
+               u.email          as email,
+               u.guideFlag      as guideFlag,
+               u.userPermission as userPermission,
+               u.userIdentity   as userIdentity,
+               u.password       as password
         from user u
-        where
-          u.mobile = #{mobile}
+        where u.mobile = #{mobile}
           and u.userIdentity = 1
           and u.userPermission = 4
           and u.validFlag = 1
     </select>
     <update id="updateServiceProviderByUserId">
         update serviceprovider
-        set openid = #{openId}, unionId = #{unionId}
+        set openid  = #{openId},
+            unionId = #{unionId}
         where userID = #{userId}
     </update>
 
     <select id="findClubTemporary" resultType="com.caimei365.user.model.vo.ClubTemporaryVo">
         SELECT
-          `id`,
-          `userId`,
-          `name`,
-          `shortName`,
-          `bindMobile`,
-          `contractEmail`,
-          `linkMan`,
-          `provinceId`,
-          `cityId`,
-          `townId`,
-          `address`,
-          `shopPhoto`,
-          `businessLicense`,
-          `socialCreditCode`,
-          `firstClubType`,
-          `secondClubType`,
-          `department`,
-          `medicalPracticeLicense`,
-          `mainProduct`,
-          `isAgreed`
+        `id`,
+        `userId`,
+        `name`,
+        `shortName`,
+        `bindMobile`,
+        `contractEmail`,
+        `linkMan`,
+        `provinceId`,
+        `cityId`,
+        `townId`,
+        `address`,
+        `shopPhoto`,
+        `businessLicense`,
+        `socialCreditCode`,
+        `firstClubType`,
+        `secondClubType`,
+        `department`,
+        `medicalPracticeLicense`,
+        `mainProduct`,
+        `isAgreed`
         FROM
-          club_temporary
+        club_temporary
         WHERE
-          userId = #{userId}
-          <if test="searchName != null and searchName != ''">
-              AND (name LIKE CONCAT('%',#{searchName},'%') OR linkMan LIKE CONCAT('%',#{searchName},'%'))
-          </if>
+        userId = #{userId}
+        <if test="searchName != null and searchName != ''">
+            AND (name LIKE CONCAT('%',#{searchName},'%') OR linkMan LIKE CONCAT('%',#{searchName},'%'))
+        </if>
         ORDER BY
-          id DESC
+        id DESC
     </select>
 
     <update id="updateClubTemporary">
         UPDATE
-          `club_temporary`
-        SET
-          `name` = #{name},
-          `shortName` = #{shortName},
-          `bindMobile` = #{bindMobile},
-          `contractEmail` = #{contractEmail},
-          `linkMan` = #{linkMan},
-          `provinceId` = #{provinceId},
-          `cityId` = #{cityId},
-          `townId` = #{townId},
-          `address` = #{address},
-          `shopPhoto` = #{shopPhoto},
-          `businessLicense` = #{businessLicense},
-          `socialCreditCode` = #{socialCreditCode},
-          `firstClubType` = #{firstClubType},
-          `secondClubType` = #{secondClubType},
-          `department` = #{department},
-          `medicalPracticeLicense` = #{medicalPracticeLicense},
-          `mainProduct` = #{mainProduct},
-          `isAgreed` = #{isAgreed}
+            `club_temporary`
+        SET `name`                   = #{name},
+            `shortName`              = #{shortName},
+            `bindMobile`             = #{bindMobile},
+            `contractEmail`          = #{contractEmail},
+            `linkMan`                = #{linkMan},
+            `provinceId`             = #{provinceId},
+            `cityId`                 = #{cityId},
+            `townId`                 = #{townId},
+            `address`                = #{address},
+            `shopPhoto`              = #{shopPhoto},
+            `businessLicense`        = #{businessLicense},
+            `socialCreditCode`       = #{socialCreditCode},
+            `firstClubType`          = #{firstClubType},
+            `secondClubType`         = #{secondClubType},
+            `department`             = #{department},
+            `medicalPracticeLicense` = #{medicalPracticeLicense},
+            `mainProduct`            = #{mainProduct},
+            `isAgreed`               = #{isAgreed}
         WHERE `id` = #{id}
     </update>
 
     <delete id="deleteTemporaryClub">
-        DELETE FROM `club_temporary` WHERE `id` = #{id}
+        DELETE
+        FROM `club_temporary`
+        WHERE `id` = #{id}
     </delete>
 
     <select id="findOrderNum" resultType="integer">
@@ -102,20 +104,22 @@
     </select>
 
     <select id="findClubs" resultType="com.caimei365.user.model.vo.ClubVo">
-        select DISTINCT c.clubID as clubId, c.userID as userId, c.name, c.sname as shortName, c.contractMobile, c.contractEmail as contractEmail,
+        select DISTINCT c.clubID as clubId, c.userID as userId, c.name, c.sname as shortName, c.contractMobile,
+        c.contractEmail as contractEmail,
         c.contractPhone, c.linkMan, c.provinceID as proviceId, c.cityID as cityId, c.townID as townId,
         c.address, c.headpic as shopPhoto, c.businessLicenseImage as businessLicense, c.socialCreditCode,
         c.firstClubType, c.secondClubType, c.department, c.medicalPracticeLicenseImg as medicalPracticeLicense,
-        c.mainpro as mainProduct, c.fax, c.info as profile, c.spID as serviceProviderId, c.addTime, c.status, c.lastCheckOrderDate,
+        c.mainpro as mainProduct, c.fax, c.info as profile, c.spID as serviceProviderId, c.addTime, c.status,
+        c.lastCheckOrderDate,
         u.userIdentity,c.newDeal as newDeal,IF(r.id IS NOT NULL,1,0) AS recordCount
         <if test="2 == type">
-        ,s.linkMan as serviceName
+            ,s.linkMan as serviceName
         </if>
         from club c
         left join user u on c.userID = u.userID
         LEFT JOIN record_link r ON r.`clubId`=c.`clubID`
         <if test="2 == type">
-        left join serviceprovider s on s.serviceProviderID=c.spID
+            left join serviceprovider s on s.serviceProviderID=c.spID
         </if>
         where
         <if test="1 == type">
@@ -146,11 +150,13 @@
         order by c.clubID desc
     </select>
     <select id="getAllClubList" resultType="com.caimei365.user.model.vo.ClubVo">
-        SELECT DISTINCT c.clubID as clubId, c.userID as userId, c.name, c.sname as shortName, c.contractMobile, c.contractEmail as contractEmail,
+        SELECT DISTINCT c.clubID as clubId, c.userID as userId, c.name, c.sname as shortName, c.contractMobile,
+        c.contractEmail as contractEmail,
         c.contractPhone, c.linkMan, c.provinceID as proviceId, c.cityID as cityId, c.townID as townId,
         c.address, c.headpic as shopPhoto, c.businessLicenseImage as businessLicense, c.socialCreditCode,
         c.firstClubType, c.secondClubType, c.department, c.medicalPracticeLicenseImg as medicalPracticeLicense,
-        c.mainpro as mainProduct, c.fax, c.info as profile, c.spID as serviceProviderId, c.addTime, c.status, c.lastCheckOrderDate,
+        c.mainpro as mainProduct, c.fax, c.info as profile, c.spID as serviceProviderId, c.addTime, c.status,
+        c.lastCheckOrderDate,
         u.userIdentity
         FROM club c
         LEFT JOIN user u ON c.userID=u.userID
@@ -164,26 +170,43 @@
         </if>
     </select>
     <select id="getSellerByUserId" resultType="com.caimei365.user.model.po.ServiceProviderPo">
-        select serviceProviderID AS serviceProviderId, status, userID AS userId, openid, unionId, name, contractMobile,
-               linkMan, duty, contractEmail, auditStatus, auditTime, auditNote, validFlag, addTime,
+        select serviceProviderID     AS serviceProviderId,
+               status,
+               userID                AS userId,
+               openid,
+               unionId,
+               name,
+               contractMobile,
+               linkMan,
+               duty,
+               contractEmail,
+               auditStatus,
+               auditTime,
+               auditNote,
+               validFlag,
+               addTime,
                mainServiceProviderID AS mainServiceProviderId
-        from serviceprovider where userID = #{userId}
+        from serviceprovider
+        where userID = #{userId}
     </select>
     <select id="findManager" resultType="java.lang.Integer">
-        SELECT IF(csm.serviceProviderId IS NULL,2,1) AS manager FROM  cm_serviceteam_manager csm
-        LEFT JOIN serviceprovider s ON csm.serviceProviderId = s.serviceProviderId
-        LEFT JOIN USER u ON s.userId = u.userId
-        WHERE u.bindmobile = #{mobile} OR u.mobile = #{mobile}
+        SELECT IF(csm.serviceProviderId IS NULL, 2, 1) AS manager
+        FROM cm_serviceteam_manager csm
+                 LEFT JOIN serviceprovider s ON csm.serviceProviderId = s.serviceProviderId
+                 LEFT JOIN USER u ON s.userId = u.userId
+        WHERE u.bindmobile = #{mobile}
+           OR u.mobile = #{mobile}
     </select>
     <select id="findManagerByUser" resultType="java.lang.Integer">
-        SELECT IF(csm.serviceProviderId IS NULL,2,1) AS manager
-        FROM  cm_serviceteam_manager csm
-        LEFT JOIN serviceprovider s ON csm.serviceProviderId = s.serviceProviderId
-        WHERE s.userID  = #{userId}
+        SELECT IF(csm.serviceProviderId IS NULL, 2, 1) AS manager
+        FROM cm_serviceteam_manager csm
+                 LEFT JOIN serviceprovider s ON csm.serviceProviderId = s.serviceProviderId
+        WHERE s.userID = #{userId}
     </select>
     <select id="findLeaderId" resultType="java.lang.Integer">
-        SELECT leaderId FROM cm_serviceteam_role csr
-        LEFT JOIN serviceprovider s ON s.serviceProviderId=csr.leaderId
+        SELECT leaderId
+        FROM cm_serviceteam_role csr
+                 LEFT JOIN serviceprovider s ON s.serviceProviderId = csr.leaderId
         WHERE s.userId = #{userId}
     </select>
     <select id="findLeaderIdByServiceId" resultType="java.lang.Integer">
@@ -199,27 +222,32 @@
     <select id="findServiceIds" resultType="java.lang.Integer">
         SELECT csg.serviceId
         FROM cm_serviceteam_group csg
-        LEFT JOIN  cm_serviceteam_role csr ON csr.id=csg.teamId
+                 LEFT JOIN cm_serviceteam_role csr ON csr.id = csg.teamId
         WHERE csr.leaderId = #{serviceProviderId}
           AND csg.serviceId != #{serviceProviderId}
     </select>
     <select id="findAllServiceIds" resultType="java.lang.Integer">
-        SELECT csg.serviceId FROM cm_serviceteam_group csg
+        SELECT csg.serviceId
+        FROM cm_serviceteam_group csg
         WHERE csg.serviceId != #{serviceProviderId}
     </select>
     <select id="findServices" resultType="com.caimei365.user.model.vo.ServiceProviderVo">
         SELECT csg.serviceId as serviceProviderId,s.linkMan as name
         FROM cm_serviceteam_group csg
-        LEFT JOIN  cm_serviceteam_role csr ON csr.id=csg.teamId
+        LEFT JOIN cm_serviceteam_role csr ON csr.id=csg.teamId
         left join serviceprovider s on csg.serviceId=s.serviceProviderID
         WHERE csr.leaderId = #{spId}
-          AND csg.serviceId != #{spId}
+        <if test="status == 1">
+            AND csg.serviceId != #{spId}
+        </if>
     </select>
     <select id="findAllServices" resultType="com.caimei365.user.model.vo.ServiceProviderVo">
         SELECT csg.serviceId AS serviceProviderId,s.linkMan AS NAME
         FROM cm_serviceteam_group csg
         LEFT JOIN serviceprovider s ON csg.serviceId=s.serviceProviderID
-        WHERE csg.serviceId != #{spId}
+        <if test="status == 1">
+            WHERE csg.serviceId != #{spId}
+        </if>
     </select>
 
 </mapper>