Merge remote-tracking branch 'origin/developerA' into developer

src/main/java/com/caimei/modules/user/dao/CmSpDao.java

@@ -21,8 +21,6 @@ public interface CmSpDao extends CrudDao<NewCmSp> {
     List<CmProvider> findProviders();
     List<NewCmSp> findSpManager();
 
-    int updateSpManager(@Param("spManagerID") Integer spManagerID);
-
     List<NewCmSp> findSelectList(NewCmSp newCmSp);
 
     NewCmSp findByUserId(Integer userId);

src/main/java/com/caimei/modules/user/service/CmSpService.java

@@ -64,11 +64,6 @@ public class CmSpService extends CrudService<CmSpDao, NewCmSp> {
         return cmSpDao.findSpManager();
     }
 
-    @Transactional(readOnly = false)
-    public int updateSpManager(Integer spManagerID) {
-        return cmSpDao.updateSpManager(spManagerID);
-    }
-
     public List<CmSaleMan> findTeam() {
         return cmSpDao.findTeam();
     }

src/main/resources/mappings/modules/user/ClubChangeSpReviewMapper.xml

@@ -22,7 +22,7 @@
 		a.checkTime AS "checkTime",
 		b.address AS "address",
 		b.name AS "clubName",
-		c.linkMan AS "linkMan",
+		c.name AS "linkMan",
 		b.addTime AS "addTime",
 		b.auditTime AS "auditTime"
 	</sql>

src/main/resources/mappings/modules/user/CmSpMapper.xml

@@ -8,18 +8,11 @@
 		a.name AS "name",
 		a.linkMan AS "linkMan",
 		a.contractMobile AS "contractMobile",
-		a.contractPhone AS "contractPhone",
 		a.contractEmail AS "contractEmail",
 		a.duty AS "duty",
-		a.auditStatus AS "auditStatus",
-		a.auditTime AS "auditTime",
-		a.auditNote AS "auditNote",
-		a.validFlag AS "validFlag",
 		a.status AS "status",
 		a.addTime AS "addTime",
-		a.insiderFlag as "insiderFlag",
-		a.mainServiceProviderID AS "mainServiceProviderID",
-		a.providerId as "providerId"
+		a.insiderFlag as "insiderFlag"
 	</sql>
 
 	<select id="get" resultType="NewCmSp">
@@ -60,9 +53,6 @@
 			<if test="linkMan != null and linkMan != ''">
 				AND a.linkMan LIKE concat('%',#{linkMan},'%')
 			</if>
-			<if test="validFlag != null and validFlag != ''">
-				AND a.validFlag = #{validFlag}
-			</if>
 			<if test="status != null and status != ''">
 				AND a.status = #{status}
 			</if>
@@ -98,36 +88,24 @@
 		userID,
 		providerId,
 		name,
-		contractPhone,
 		contractMobile,
 		duty,
 		contractEmail,
 		linkMan,
-		auditStatus,
-		auditTime,
-		auditNote,
-		validFlag,
 		status,
 		addTime,
-		insiderFlag,
-		mainServiceProviderID
+		insiderFlag
 		) VALUES (
 		#{userID},
 	    #{providerId},
 		#{name},
-		#{contractPhone},
 		#{contractMobile},
 		#{duty},
 		#{contractEmail},
 		#{linkMan},
-		#{auditStatus},
-		#{auditTime},
-		#{auditNote},
-		#{validFlag},
 		#{status},
 		#{addTime},
-		#{insiderFlag},
-		#{mainServiceProviderID}
+		#{insiderFlag}
 		)
 	</insert>
 
@@ -142,14 +120,9 @@
 		contractEmail = #{contractEmail},
 		linkMan = #{linkMan},
 		duty = #{duty},
-		auditStatus = #{auditStatus},
-		auditTime = #{auditTime},
-		auditNote = #{auditNote},
-		validFlag = #{validFlag},
 		status = #{status},
 		addTime = #{addTime},
-		insiderFlag = #{insiderFlag},
-		mainServiceProviderID = #{mainServiceProviderID}
+		insiderFlag = #{insiderFlag}
 		WHERE serviceProviderID = #{serviceProviderID}
 	</update>
 
@@ -245,11 +218,6 @@
 		</choose>
 	</select>
 
-	<update id="updateSpManager">
-		UPDATE serviceprovider SET
-		mainServiceProviderID = #{spManagerID}
-	</update>
-
 	<insert id="choseManager">
 		insert into cm_serviceteam_manager (serviceProviderId,delflag)
 		values (#{serviceProviderID},0)
@@ -263,7 +231,7 @@
 	</select>
 
     <select id="findTeam" resultType="com.caimei.modules.user.entity.CmSaleMan">
-		select leaderId,s.name as leaderName
+		select csr.leaderId,s.name as leaderName
 		from cm_serviceteam_role csr
 		left join serviceprovider s on csr.leaderId = s.serviceProviderID
 		where csr.delflag = 0

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -255,7 +255,6 @@
         SELECT serviceProviderID, name
         FROM serviceprovider
         WHERE NAME NOT LIKE concat('%', '测试', '%')
-          AND validFlag = 1
           AND STATUS = 90
     </select>