格式调整

src/main/java/com/caimei/modules/bulkpurchase/service/CmClubService.java

@@ -13,41 +13,40 @@ import com.caimei.modules.bulkpurchase.dao.CmClubDao;
 
 /**
  * 会所信息Service
+ *
  * @author jiangjunwen
  * @version 2017-03-27
  */
 @Service
 @Transactional(readOnly = true)
 public class CmClubService extends CrudService<CmClubDao, CmClub> {
-	@Autowired
-	private  CmClubDao cmClubDao;
+    @Autowired
+    private CmClubDao cmClubDao;
 
-	public CmClub get(String id) {
-		return super.get(id);
-	}
-
-	public List<CmClub> findList(CmClub cmClub) {
-		return super.findList(cmClub);
-	}
-
-	public Page<CmClub> findPage(Page<CmClub> page, CmClub cmClub) {
-		return super.findPage(page, cmClub);
-	}
+    public CmClub get(String id) {
+        return super.get(id);
+    }
 
-	@Transactional(readOnly = false)
-	public void save(CmClub cmClub) {
-		super.save(cmClub);
-	}
+    public List<CmClub> findList(CmClub cmClub) {
+        return super.findList(cmClub);
+    }
 
+    public Page<CmClub> findPage(Page<CmClub> page, CmClub cmClub) {
+        return super.findPage(page, cmClub);
+    }
 
+    @Transactional(readOnly = false)
+    public void save(CmClub cmClub) {
+        super.save(cmClub);
+    }
 
-	@Transactional(readOnly = false)
-	public void delete(CmClub cmClub) {
-		super.delete(cmClub);
-	}
+    @Transactional(readOnly = false)
+    public void delete(CmClub cmClub) {
+        super.delete(cmClub);
+    }
 
     public CmClub findClubById(Long clubId) {
-		List<CmClub> cmClub=cmClubDao.findClubById(clubId);
-		return cmClub.get(0);
+        List<CmClub> cmClub = cmClubDao.findClubById(clubId);
+        return cmClub.get(0);
     }
 }

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

@@ -99,13 +99,13 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         remarksList.forEach(remarks -> {
             if (StringUtils.isNotBlank(remarks.getConsult())) {
                 StringBuilder cons = new StringBuilder();
-                if(remarks.getConsult().contains(",")){
+                if (remarks.getConsult().contains(",")) {
                     String[] split = remarks.getConsult().split(",");
                     for (String string : split) {
                         cons.append(newCmClubDao.findClassName(string)).append(",");
                     }
                     cons = new StringBuilder(cons.substring(0, cons.length() - 1));
-                }else{
+                } else {
                     cons = new StringBuilder(newCmClubDao.findClassName(remarks.getConsult()));
                 }
                 remarks.setConsultType(cons.toString());
@@ -131,13 +131,13 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         remarksList.forEach(remarks -> {
             if (StringUtils.isNotBlank(remarks.getConsult())) {
                 StringBuilder cons = new StringBuilder();
-                if(remarks.getConsult().contains(",")){
+                if (remarks.getConsult().contains(",")) {
                     String[] split = remarks.getConsult().split(",");
                     for (String string : split) {
                         cons.append(newCmClubDao.findClassName(string)).append(",");
                     }
                     cons = new StringBuilder(cons.substring(0, cons.length() - 1));
-                }else{
+                } else {
                     cons = new StringBuilder(newCmClubDao.findClassName(remarks.getConsult()));
                 }
                 remarks.setConsultType(cons.toString());
@@ -168,52 +168,57 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
     }
 
     @Transactional(readOnly = false)
-    public String upremakasList(CmRemaks cmRemaks){return newCmClubDao.upremakasList(cmRemaks);}
+    public String upremakasList(CmRemaks cmRemaks) {
+        return newCmClubDao.upremakasList(cmRemaks);
+    }
 
     @Transactional(readOnly = false)
-    public void upremarks(CmRemaks cmRemaks){newCmClubDao.upremarks(cmRemaks);}
+    public void upremarks(CmRemaks cmRemaks) {
+        newCmClubDao.upremarks(cmRemaks);
+    }
 
     @Transactional(readOnly = false)
-    public void addRemarks(CmRemaks cmRemaks){
-         newCmClubDao.addRemarks(cmRemaks);
-     }
+    public void addRemarks(CmRemaks cmRemaks) {
+        newCmClubDao.addRemarks(cmRemaks);
+    }
 
     @Transactional(readOnly = false)
-     public void deleteRamarks(CmRemaks cmRemaks){newCmClubDao.deleteRamarks(cmRemaks);}
+    public void deleteRamarks(CmRemaks cmRemaks) {
+        newCmClubDao.deleteRamarks(cmRemaks);
+    }
 
     @Transactional(readOnly = false)
-    public List<Integer> ClubsIds(ClubChangeSp clubChangeSp){
+    public List<Integer> ClubsIds(ClubChangeSp clubChangeSp) {
 
-          return newCmClubDao.ClubsIds(clubChangeSp);
+        return newCmClubDao.ClubsIds(clubChangeSp);
     }
 
     @Transactional(readOnly = false)
-    public void oldname(Integer oldserviceProviderId,Integer clubID , Integer oldSpID,Integer newSpID){
+    public void oldname(Integer oldserviceProviderId, Integer clubID, Integer oldSpID, Integer newSpID) {
 
-         newCmClubDao.oldname(oldserviceProviderId, clubID,oldSpID,newSpID);
+        newCmClubDao.oldname(oldserviceProviderId, clubID, oldSpID, newSpID);
     }
 
     @Transactional(readOnly = false)
-    public void oldnames(Integer clubID , Integer oldSpID,Integer newSpID){
+    public void oldnames(Integer clubID, Integer oldSpID, Integer newSpID) {
 
-        newCmClubDao.oldnames(clubID,oldSpID,newSpID);
+        newCmClubDao.oldnames(clubID, oldSpID, newSpID);
     }
 
     @Transactional(readOnly = false)
-    public void updateServiceProvider(Integer clubId , Integer oldSpID,Integer newSpID){
-
-        cmClubDao.updateServiceProvider(clubId,oldSpID,newSpID);
+    public void updateServiceProvider(Integer clubId, Integer oldSpID, Integer newSpID) {
+        cmClubDao.updateServiceProvider(clubId, oldSpID, newSpID);
     }
 
 
-    public Page<CmReport> ReportList(Page<CmReport> cmReports ,CmReport cmReport){
-       cmReport.setPage(cmReports);
-       List<CmReport>list= newCmClubDao.ReportList(cmReport);
-       cmReports.setList(list);
-       return cmReports;
+    public Page<CmReport> ReportList(Page<CmReport> cmReports, CmReport cmReport) {
+        cmReport.setPage(cmReports);
+        List<CmReport> list = newCmClubDao.ReportList(cmReport);
+        cmReports.setList(list);
+        return cmReports;
     }
 
-    public Page<ClubStatistics> statisticsList(Page<ClubStatistics> page, ClubStatistics statistics){
+    public Page<ClubStatistics> statisticsList(Page<ClubStatistics> page, ClubStatistics statistics) {
         statistics.setPage(page);
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         Date date = new Date();
@@ -230,11 +235,11 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
         statistics.setYearEndTime(endTime);
         // 近一个月开始时间
         calendar.setTime(time);
-        calendar.add(Calendar.MONTH,-1);
+        calendar.add(Calendar.MONTH, -1);
         statistics.setMonthStartTime(dateFormat.format(calendar.getTime()));
         // 近一年开始时间
         calendar.setTime(time);
-        calendar.add(Calendar.YEAR,-1);
+        calendar.add(Calendar.YEAR, -1);
         statistics.setYearStartTime(dateFormat.format(calendar.getTime()));
         List<ClubStatistics> selStatisticsList = new ArrayList<>();
         if (StringUtils.isNotBlank(statistics.getClubDataIntegrity())) {
@@ -293,8 +298,8 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
                 number = (pageNo - 1) * pageSize;
             }
             List<ClubStatistics> list = new ArrayList<>();
-            for (int i = 0; i <= statisticsList.size()-1 ; i++) {
-                if (i >= number && i < number+pageSize) {
+            for (int i = 0; i <= statisticsList.size() - 1; i++) {
+                if (i >= number && i < number + pageSize) {
                     list.add(statisticsList.get(i));
                 }
             }
@@ -314,8 +319,8 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
 
     public List<easyExcel> setExData(List<easyExcel> selStatisticsList, ClubStatistics statistics) {
         int number = 0;
-        String type = "" ;
-        Integer item = 0 ;
+        String type = "";
+        Integer item = 0;
 //        List<ClubStatistics> clubStatisticsList = selStatisticsList;
         List<CmBehaviorRecord> pageLableList = newCmClubDao.selPageLable();
 
@@ -372,16 +377,16 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
                 number += 5;
             }
             clubStatistics.setNumber(number);
-            clubStatistics.setClubDataIntegrity(number+"%");
+            clubStatistics.setClubDataIntegrity(number + "%");
 
-            number=0;
+            number = 0;
             type = "";
             // 处理最常搜索词
             List<CmBehaviorRecord> collect = pageLableList.stream().filter(data -> data.getUserID().equals(clubStatistics.getUserID())).collect(Collectors.toList());
             if (collect.size() > 0) {
                 clubStatistics.setPageLabel(collect.get(0).getPageLabel());
                 item = collect.get(0).getNumber();
-                for (int i = 0; i < collect.size()-1; i++) {
+                for (int i = 0; i < collect.size() - 1; i++) {
                     if (item < collect.get(i).getNumber()) {
                         item = collect.get(i).getNumber();
                         clubStatistics.setPageLabel(collect.get(i).getPageLabel());
@@ -403,8 +408,8 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
 
     public List<ClubStatistics> setListData(List<ClubStatistics> selStatisticsList, ClubStatistics statistics) {
         int number = 0;
-        String type = "" ;
-        Integer item = 0 ;
+        String type = "";
+        Integer item = 0;
 //        List<ClubStatistics> clubStatisticsList = selStatisticsList;
         List<CmBehaviorRecord> pageLableList = newCmClubDao.selPageLable();
 
@@ -461,16 +466,16 @@ public class NewCmClubService extends CrudService<NewCmClubDao, NewCmClub> {
                 number += 5;
             }
             clubStatistics.setNumber(number);
-            clubStatistics.setClubDataIntegrity(number+"%");
+            clubStatistics.setClubDataIntegrity(number + "%");
 
-            number=0;
+            number = 0;
             type = "";
             // 处理最常搜索词
             List<CmBehaviorRecord> collect = pageLableList.stream().filter(data -> data.getUserID().equals(clubStatistics.getUserID())).collect(Collectors.toList());
             if (collect.size() > 0) {
                 clubStatistics.setPageLabel(collect.get(0).getPageLabel());
                 item = collect.get(0).getNumber();
-                for (int i = 0; i < collect.size()-1; i++) {
+                for (int i = 0; i < collect.size() - 1; i++) {
                     if (item < collect.get(i).getNumber()) {
                         item = collect.get(i).getNumber();
                         clubStatistics.setPageLabel(collect.get(i).getPageLabel());

src/main/java/com/caimei/modules/user/web/newUser/SpController.java

@@ -136,7 +136,6 @@ public class SpController extends BaseController {
                     if (CollectionUtils.isNotEmpty(serviceprovider)) {
                         ServiceProviderModel serviceProvider = serviceprovider.get(0);
                         Integer userID = serviceProvider.getUserID();
-                        System.out.println("ID>>>>>>>>" + userID);
                         List<CmBind> bind = cmBindService.findCmbindByUserId(userID);
                         //fixme gclub -- club 更换协销
                         CmClub club = cmClubService.get(cssp.getClubID().toString());

src/main/resources/mappings/modules/bulkpurchase/CmClubMapper.xml

@@ -224,7 +224,7 @@
 	</select>
 
 	<update id="updateServiceProvider">
-		UPDATE `cm_club_report`
+		UPDATE cm_club_report
 		SET serviceProviderId=#{newSpId}
 		WHERE clubId = #{clubId}
 		  AND serviceProviderId = #{oldSpId}

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

@@ -89,7 +89,10 @@
     </select>
 
     <select id="textUserValue" resultType="NewCmClub">
-        SELECT userID as valueID, activeState, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1
+        SELECT userID as valueID, activeState, customerValue
+        FROM cm_organ_value_system
+        WHERE stage = 0
+          AND delType = 1
     </select>
 
 
@@ -99,7 +102,8 @@
         <include refid="otherColumns"/>,u.userPermission,u.source, covs.activeState,covs.customerValue
         FROM club a
         <include refid="newCmClubJoins"/>
-        LEFT JOIN (SELECT userID, activeState, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1) covs ON a.userID = covs.userID
+        LEFT JOIN (SELECT userID, activeState, customerValue FROM cm_organ_value_system WHERE stage = 0 AND delType = 1)
+        covs ON a.userID = covs.userID
         <where>
             (u.userOrganizeID IN(0,1) or u.clubStatus != 92)
             <if test="clubID != null and clubID != ''">
@@ -177,7 +181,11 @@
         </choose>
     </select>
     <select id="spNameList" resultType="com.caimei.modules.project.model.ServiceProviderModel">
-        SELECT serviceProviderID,name FROM serviceprovider WHERE NAME NOT LIKE concat('%','测试','%') AND validFlag = 1 AND STATUS = 90
+        SELECT serviceProviderID, name
+        FROM serviceprovider
+        WHERE NAME NOT LIKE concat('%', '测试', '%')
+          AND validFlag = 1
+          AND STATUS = 90
     </select>
     <select id="findAllList" resultType="NewCmClub">
         SELECT
@@ -493,7 +501,7 @@
         # LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
-        LEFT JOIN cm_club_report ccre ON  ccre.Id= ccr.reportID
+        LEFT JOIN cm_club_report ccre ON ccre.Id= ccr.reportID
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         <where>
@@ -605,15 +613,17 @@
     </update>
 
     <select id="ReportList" resultType="com.caimei.modules.user.entity.CmReport">
-        SELECT ccr.Id as reportId, p.mainImage AS mainImage,p.`name` AS productName,c.`name` AS clubName,ccr.reportName AS reportName,
-        ccr.reportText AS reportText,ccr.addTime AS ADDTIME,ccr.status AS STATUS,ccr.auditName AS auditName,ccr.auditTime AS auditTime,c.newDeal,ccr.auditText
+        SELECT ccr.Id as reportId, p.mainImage AS mainImage,p.`name` AS productName,c.`name` AS clubName,ccr.reportName
+        AS reportName,
+        ccr.reportText AS reportText,ccr.addTime AS ADDTIME,ccr.status AS STATUS,ccr.auditName AS
+        auditName,ccr.auditTime AS auditTime,c.newDeal,ccr.auditText
         FROM cm_club_report ccr
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN club c ON c.clubID = ccr.clubID
         <where>
-        <if test="reportId!=null and reportId!=''">
-            AND  ccr.id=#{reportId}
-        </if>
+            <if test="reportId!=null and reportId!=''">
+                AND ccr.id=#{reportId}
+            </if>
             <if test="productName!=null and productName!=''">
                 AND p.name LIKE concat('%',#{productName},'%')
             </if>
@@ -645,12 +655,13 @@
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName,
         (SELECT mainImage FROM product p WHERE p.productID= ccre.productID) AS productMainImage,
         (SELECT NAME FROM product p WHERE p.productID= ccre.productID) AS proName,
-        ccre.reportText AS reportText,ccre.status AS reportStatus,ccre.auditName,ccre.auditTime AS auditTime,p.mainImage AS mainImage,p.name AS productName,sh.name AS shopName
+        ccre.reportText AS reportText,ccre.status AS reportStatus,ccre.auditName,ccre.auditTime AS auditTime,p.mainImage
+        AS mainImage,p.name AS productName,sh.name AS shopName
         FROM cm_visitor_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
         LEFT JOIN cm_serviceTeam_role csr ON csr.id = csg.teamId
-        LEFT JOIN cm_club_report ccre ON  ccre.Id= ccr.reportID
+        LEFT JOIN cm_club_report ccre ON ccre.Id= ccr.reportID
         LEFT JOIN product p ON p.productID = ccr.productID
         LEFT JOIN shop sh ON sh.shopID = p.shopID
         LEFT JOIN club c ON c.clubID = ccr.clubID
@@ -682,46 +693,68 @@
     </select>
 
     <select id="visitorRemarksConut" resultType="integer">
-        SELECT COUNT(*) FROM cm_visitor_remarks WHERE reportID=#{reportID}
+        SELECT COUNT(*)
+        FROM cm_visitor_remarks
+        WHERE reportID = #{reportID}
     </select>
 
     <select id="clubRemarksConut" resultType="integer">
-        SELECT COUNT(*) FROM cm_club_remarks WHERE reportID=#{reportID}
+        SELECT COUNT(*)
+        FROM cm_club_remarks
+        WHERE reportID = #{reportID}
     </select>
 
-<update id="updateAuditRemarks">
-    UPDATE cm_club_report SET status=#{status},auditName=#{auditName},auditText=#{auditText},auditTime=now() WHERE id=#{reportID}
-</update>
+    <update id="updateAuditRemarks">
+        UPDATE cm_club_report
+        SET status=#{status},
+            auditName=#{auditName},
+            auditText=#{auditText},
+            auditTime=now()
+        WHERE id = #{reportID}
+    </update>
 
     <update id="updateClubRemarks">
-        UPDATE cm_club_remarks SET reportID=null WHERE id=#{remarksId}
+        UPDATE cm_club_remarks
+        SET reportID=null
+        WHERE id = #{remarksId}
     </update>
 
     <update id="updateVisitorRemarks">
-        UPDATE cm_visitor_remarks SET reportID=null WHERE id=#{remarksId}
+        UPDATE cm_visitor_remarks
+        SET reportID=null
+        WHERE id = #{remarksId}
     </update>
 
     <delete id="deleteClubRemarks">
-        DELETE FROM cm_club_report WHERE id=#{reportID}
+        DELETE
+        FROM cm_club_report
+        WHERE id = #{reportID}
     </delete>
 
     <insert id="addRecordLinkage">
-        INSERT INTO `record_link`(`describe`,`link`,clubId)
-        VALUES (#{describe},#{link},#{clubId})
+        INSERT INTO `record_link`(`describe`, `link`, clubId)
+        VALUES (#{describe}, #{link}, #{clubId})
     </insert>
 
-<select id="recordLinkage" resultType="string">
-    SELECT link from record_link where clubId=#{clubId}
-    ORDER BY id DESC
-    LIMIT 1
-</select>
+    <select id="recordLinkage" resultType="string">
+        SELECT link
+        from record_link
+        where clubId = #{clubId}
+        ORDER BY id DESC
+        LIMIT 1
+    </select>
     <select id="recordDescribe" resultType="string">
-        SELECT `describe` from record_link where clubId=#{clubId}
+        SELECT `describe`
+        from record_link
+        where clubId = #{clubId}
         ORDER BY id DESC
         LIMIT 1
     </select>
     <select id="selRegisterIP" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">
-        SELECT u.registerIP,u.ipAddress AS region, u.registerTime FROM USER u LEFT JOIN club c ON u.userID = c.userID WHERE c.clubID = #{clubId}
+        SELECT u.registerIP, u.ipAddress AS region, u.registerTime
+        FROM USER u
+                 LEFT JOIN club c ON u.userID = c.userID
+        WHERE c.clubID = #{clubId}
     </select>
 
     <select id="selStatisticsList" resultType="com.caimei.modules.user.entity.ClubStatistics">
@@ -777,7 +810,7 @@
         IFNULL(orderTotal.payTotal,0) AS payTotal,
         ordr.lastOrderTime AS lastOrderTime
         FROM club c
-#         LEFT JOIN cm_order cor ON c.userID = cor.userID
+        # LEFT JOIN cm_order cor ON c.userID = cor.userID
         LEFT JOIN USER u ON u.userId=c.userId
         LEFT JOIN cm_svip_user csu ON csu.userId = u.userID
         LEFT JOIN serviceprovider sp ON sp.serviceProviderID = c.spID
@@ -798,7 +831,7 @@
         COUNT(co.orderid) AS orderCountYesr
         FROM cm_order co
         <where>
-             co.status NOT IN (0,6,7)
+            co.status NOT IN (0,6,7)
             <if test="yearStartTime != null and yearStartTime != '' and yearEndTime != null and yearEndTime != ''">
                 AND co.orderTime BETWEEN #{yearStartTime} AND #{yearEndTime}
             </if>
@@ -826,15 +859,15 @@
             <if test="registerStartTime != null and registerStartTime != ''">
                 AND (c.addTime > #{registerStartTime} or c.addTime = #{registerStartTime} )
             </if>
-           <if test="registerEndTime != null and registerEndTime != ''">
-               AND c.addTime <![CDATA[ <= ]]> #{registerEndTime}
-           </if>
+            <if test="registerEndTime != null and registerEndTime != ''">
+                AND c.addTime <![CDATA[ <= ]]> #{registerEndTime}
+            </if>
             <if test="searchStartTime != null and searchStartTime != ''">
                 AND (ordr.lastOrderTime > #{searchStartTime} or ordr.lastOrderTime = #{searchStartTime} )
             </if>
-               <if test=" searchEndTime != null and searchEndTime != ''">
-                   AND ordr.lastOrderTime <![CDATA[ <= ]]> #{searchEndTime}
-               </if>
+            <if test=" searchEndTime != null and searchEndTime != ''">
+                AND ordr.lastOrderTime <![CDATA[ <= ]]> #{searchEndTime}
+            </if>
             <if test="customerValue != null and customerValue != ''">
                 AND c.firstClubType = #{customerValue}
             </if>
@@ -940,11 +973,12 @@
         </if>
     </select>
     <select id="selPageLable" resultType="com.caimei.modules.user.entity.CmBehaviorRecord">
-        SELECT  c.userID, COUNT(pageType) AS number, cbr.pageLabel
+        SELECT c.userID, COUNT(pageType) AS number, cbr.pageLabel
         FROM club c
-        LEFT JOIN cm_behavior_record cbr ON cbr.userID = c.userID
-        WHERE cbr.userID = c.userID AND cbr.pageType in (8,9)
-        GROUP BY  c.userID, cbr.pageLabel
+                 LEFT JOIN cm_behavior_record cbr ON cbr.userID = c.userID
+        WHERE cbr.userID = c.userID
+          AND cbr.pageType in (8, 9)
+        GROUP BY c.userID, cbr.pageLabel
     </select>
     <select id="findExcelList" resultType="com.caimei.modules.user.entity.easyExcel">
         SELECT
@@ -1000,7 +1034,7 @@
         pb.pageLabel,
         ordr.lastOrderTime AS lastOrderTime
         FROM club c
-#         LEFT JOIN cm_order cor ON c.userID = cor.userID
+        # LEFT JOIN cm_order cor ON c.userID = cor.userID
         LEFT JOIN USER u ON u.userId=c.userId
         LEFT JOIN cm_svip_user csu ON csu.userId = u.userID
         LEFT JOIN serviceprovider sp ON sp.serviceProviderID = c.spID
@@ -1048,11 +1082,11 @@
         SELECT c.userID, COUNT(cbr.pageLabel), cbr.pageLabel
         FROM cm_behavior_record cbr
         LEFT JOIN club c ON cbr.userID = c.userID
-        <where> cbr.userID = c.userID</where>
+        <where>cbr.userID = c.userID</where>
         GROUP BY cbr.pageLabel) AS pb ON c.userID = pb.userID
 
         LEFT JOIN (
-            SELECT userID, MAX(orderTime) AS lastOrderTime FROM cm_order GROUP BY userID
+        SELECT userID, MAX(orderTime) AS lastOrderTime FROM cm_order GROUP BY userID
         ) AS ordr ON c.userID = ordr.userID
         <where>
             <if test="registerStartTime != null and registerStartTime != ''">