Merge remote-tracking branch 'origin/dev' into dev

xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/dto/MsgQueryDto.java

+package com.xxfc.platform.im.dto;
+
+import lombok.Data;
+
+@Data
+public class MsgQueryDto {
+	private Integer page;
+	private Integer limit;
+	private Integer source;
+	private Long startTime;
+	private Long endTime;
+	private Integer praise;
+	private Integer comment;
+	private String username;
+	private Integer type;
+}

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -5,6 +5,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.ImiVo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -13,6 +15,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
 import com.xxfc.platform.im.dto.CommentVo;
+import com.xxfc.platform.im.dto.MsgQueryDto;
 import com.xxfc.platform.im.dto.PraiseVo;
 import com.xxfc.platform.im.dto.QuestionParamDto;
 import com.xxfc.platform.im.model.*;
@@ -53,6 +56,8 @@ public class MsgBiz {
     @Autowired
     ThirdFeign thirdFeign;
 
+    @Autowired
+    UserFeign userFeign;
     /**
      * 获取消息列表
      *
@@ -339,6 +344,67 @@ public class MsgBiz {
      * 后台管理接口
      */
 
+    public ObjectRestResponse getMsgList(MsgQueryDto msgQueryDto){
+        //获取所有朋友圈
+        Integer page = msgQueryDto.getPage() == null ? 1 : msgQueryDto.getPage();
+        Integer limit = msgQueryDto.getLimit() == null ? 10 : msgQueryDto.getLimit();
+        Pageable pageable = PageRequest.of(--page, limit);
+        Query query = null;
+        List<Msg> msgList = null;
+        if (msgQueryDto.getType() != null) {
+            query = new Query(Criteria.where("body.type").is(msgQueryDto.getType()));
+            //评论数
+            if (msgQueryDto.getComment() != null) {
+                query.addCriteria(Criteria.where("count.comment").gte(msgQueryDto.getComment()));
+            }
+            //点赞数
+            if (msgQueryDto.getPraise() != null) {
+                query.addCriteria(Criteria.where("count.praise").gte(msgQueryDto.getPraise()));
+            }
+            //来源
+            if (msgQueryDto.getSource() != null) {
+                if (msgQueryDto.getSource() == 1) {
+                    query.addCriteria(Criteria.where("source").is(msgQueryDto.getSource()));
+                } else {
+                    query.addCriteria(Criteria.where("source").is(msgQueryDto.getSource()).orOperator(Criteria.where("source").is(null)));
+                }
+            }
+            //下单时间
+            if (msgQueryDto.getStartTime() != null) {
+                query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime()).orOperator(Criteria.where("body.time").lte(msgQueryDto.getEndTime())));
+            }
+            //用户名
+            if (StringUtils.isNotBlank(msgQueryDto.getUsername())) {
+                AppUserLogin appUserLogin = userFeign.one(msgQueryDto.getUsername());
+                if (appUserLogin != null) {
+                    query.addCriteria(Criteria.where("userId").is(appUserLogin.getImUserid()));
+                }
+            }
+            int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
+            query.with(pageable);
+            query.with(new Sort(Sort.Direction.DESC, "time"));
+            msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), null);
+            PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
+            goodPageInfo.setPageSize(totalSize % limit == 0 ? totalSize / limit : totalSize / limit + 1);
+            return ObjectRestResponse.succ(goodPageInfo);
+        } else {
+            List<Integer> ids = new ArrayList<>();
+            ids.add(2);
+            ids.add(4);
+            query = new Query(Criteria.where("body.type").in(ids));
+            int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
+            query.with(pageable);
+            query.with(new Sort(Sort.Direction.DESC, "time"));
+            msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), null);
+
+            PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
+            goodPageInfo.setPageSize(totalSize % limit == 0 ? totalSize / limit : totalSize / limit + 1);
+            return ObjectRestResponse.succ(goodPageInfo);
+        }
+
+    }
+
+
     /**
      * 新增消息接口
      * @param param

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/MsgController.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.im.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.im.biz.MsgBiz;
+import com.xxfc.platform.im.dto.MsgQueryDto;
 import com.xxfc.platform.im.model.AddMsgParam;
 import com.xxfc.platform.im.model.Msg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,4 +51,9 @@ public class MsgController {
     public ObjectRestResponse updateMsg(@RequestBody Msg msg) {
         return msgBiz.update(msg);
     }
+
+    @PostMapping(value = "/bg/app/unauth/list")
+    public ObjectRestResponse getMsgList(@RequestBody MsgQueryDto msgQueryDto) {
+        return msgBiz.getMsgList(msgQueryDto);
+    }
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelCalendarPriceBiz.java

@@ -290,6 +290,8 @@ public class VehicleModelCalendarPriceBiz extends BaseBiz<VehicleModelCalendarPr
      * @return
      */
     private List<VehicleModelCalendarPriceDTO> findVehicleModelCalendarPrice(Date startDate, Date endDate, Integer vehicleModelId, Integer userId) {
+        startDate = DateUtils.localDateToDate(DateUtils.dateToLocalDate(startDate).atStartOfDay(ZoneId.systemDefault()).toLocalDate());
+        endDate = DateUtils.localDateToDate(DateUtils.dateToLocalDate(endDate).atStartOfDay(ZoneId.systemDefault()).toLocalDate());
         List<VehicleModelCalendarPriceDTO> vehicleModelCalendarPriceVos = new ArrayList<>();
         //默认折扣
         Integer discount = DEFAULT_DISCOUNT;

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -537,7 +537,6 @@
             <if test="flag == true and status == 2">
                 and ( (v4.id IS NOT NULL and DATE_ADD(v1.book_end_date,INTERVAL '2' DAY) >= now())  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
             </if>
-            and v1.book_user != -2
         </where>
         group by v1.id
         order by create_time DESC