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

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

@@ -375,13 +375,13 @@ public class SellerServiceImpl implements SellerService {
 
     @Override
     public ResponseJson<List<CmBehaviorRecordVo>> getBehaviorRecordClubFrom(Integer spId, Integer clubId, String accessTime) {
-        // 设置日期格式
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDate date = LocalDate.parse(accessTime, formatter);
-        // 获取前一天的日期
-        LocalDate dayBeforeYesterday = date.minusDays(1);
-        // 格式化日期
-        accessTime= dayBeforeYesterday.format(formatter);
+//        // 设置日期格式
+//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//        LocalDate date = LocalDate.parse(accessTime, formatter);
+//        // 获取前一天的日期
+//        LocalDate dayBeforeYesterday = date.minusDays(1);
+//        // 格式化日期
+//        accessTime= dayBeforeYesterday.format(formatter);
         List<CmBehaviorRecordVo> behaviorRecordYesterdayClubFrom = sellerMapper.getBehaviorRecordYesterdayClubFrom(spId, clubId, accessTime);
         for (CmBehaviorRecordVo cmBehaviorRecordVo : behaviorRecordYesterdayClubFrom) {
             String pageLabel = sellerMapper.getBehaviorRecordYesterdayPageLabel(spId, cmBehaviorRecordVo.getClubId(), accessTime);

src/main/resources/mapper/SellerMapper.xml

@@ -414,7 +414,7 @@
         WHERE b.userId !=0
         and c.spId=#{spId}
         and c.clubId=#{clubId}
-        and b.pageType in(6,8,11)
+        and b.pageType in(6,11)
         and  DATE(b.accessTime) = DATE(#{accessTime})
     </select>
     <select id="getBehaviorRecordYesterdayClub" resultType="com.caimei365.user.model.vo.CmBehaviorRecordVo">