Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -83,6 +83,11 @@ public class MsgBiz {
     }
 
     public ObjectRestResponse getHotMsgList(Integer page, Integer limit) {
+        AppUserDTO appUserDTO = userBiz.getUserInfo();
+        Integer userId = null;
+        if(appUserDTO != null) {
+            userId = appUserDTO.getImUserid();
+        }
         log.info("获取消息列表： page = {}, limit = {}, type = {}", page, limit);
         page = page == null ? 1 : page;
         limit = limit == null ? 10 : limit;
@@ -94,7 +99,7 @@ public class MsgBiz {
         int totalSize = mongoTemplate.find(query, Msg.class, "s_msg").size();
         query.with(pageable);
         query.with(new Sort(Sort.Direction.DESC, "count.praise"));
-        List<Msg> msgList = mongoTemplate.find(query, Msg.class, "s_msg");
+        List<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
         PageInfo<MsgVo> goodPageInfo = new PageInfo<>(replaceMsgResult(msgList));
         goodPageInfo.setPageSize(totalSize%limit == 0 ?totalSize/limit : totalSize/limit + 1);
         return ObjectRestResponse.succ(goodPageInfo);
@@ -158,7 +163,7 @@ public class MsgBiz {
     public boolean exists(int userId, ObjectId msgId) {
         Query query = new Query(Criteria.where("msgId").is(msgId).and("userId").is(userId));
         List<Praise> praise = mongoTemplate.find(query, Praise.class, "s_praise");
-        return 0 != praise.size();
+        return praise.size() > 0 ? true :false;
     }
 
     /**
@@ -171,7 +176,7 @@ public class MsgBiz {
     public boolean existsCollect(int userId, ObjectId msgId) {
         Query query = new Query(Criteria.where("msgId").is(msgId).and("userId").is(userId));
         List<Comment> comments = mongoTemplate.find(query, Comment.class, "s_comment");
-        return 0 != comments.size();
+        return comments.size() > 0 ? true :false;
     }
 
     public List<MsgVo> replaceMsgResult(List<Msg> list) {

xx-im/xx-im-server/src/main/resources/mapper/ImCommentMapper.xml

@@ -19,7 +19,7 @@
   <select id="selectByQuestionId" resultType="com.xxfc.platform.im.entity.ImComment" parameterType="java.lang.Long">
         select * from im_comment
         where question_id = #{questionId} and is_del = 0
-        order by upd_time
+        order by time DESC
   </select>
 
 </mapper>
\ No newline at end of file

xx-im/xx-im-server/src/main/resources/mapper/ImPraiseMapper.xml

@@ -17,7 +17,7 @@
   <select id="selectByQuestionId" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="java.lang.Long">
         select * from im_praise
         where question_id = #{questionId} and is_del = 0 and visible = 1
-        order by upd_time
+        order by time DESC
   </select>
 
   <select id="selectByQuestionIdAndTime" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="com.xxfc.platform.im.dto.ImPraiseDto">

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/AbstractOrderHandle.java

@@ -118,8 +118,16 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
                 return v;
             }).collect(Collectors.toList()));
         }
-    }
 
+        //判断是否价格为0
+//        BigDecimal realAmount = detail.getOrder().getRealAmount();
+//        if(BigDecimal.ZERO.compareTo(realAmount) > 0) {
+//            throw new BaseException(ResultCode.FAILED_CODE);
+//        }else if(BigDecimal.ZERO.compareTo(realAmount) = 0) {
+//            //直接支付
+//            baseOrderBiz.payNotifyHandle();
+//        }
+    }
     /**
      * 计算价格
      * @param detail

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java

@@ -38,6 +38,8 @@ public class UsableVeicleDTO extends PageParam {
         String catasStr;
         @ApiModelProperty(value = "分类列表", hidden = true)
         Map<Integer, List<VehiclePlatCata>> catas;
+        @ApiModelProperty("停靠公司")
+        String parkBranchCompanyId;
 
         @ApiModelProperty(hidden = true)
         Boolean yearNo4Where;

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

@@ -991,10 +991,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         if(StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
             initBookSearchParam(dto, params);
         }
-//        PageHelper.startPage(dto.getPage(), dto.getLimit());
-//        List<UsableVehicleModelVO> lists = mapper.searchUsableModel(params);
-//        PageInfo<UsableVehicleModelVO> usableVehicleModel = new PageInfo<>(lists);
-//        return PageDataVO.pageInfo(usableVehicleModel);
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 

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

@@ -559,6 +559,9 @@
             <if test=" hotSign != null ">
                 and vm.hot_sign = #{hotSign}
             </if>
+            <if test=" parkBranchCompanyId != null ">
+                and v.park_branch_company_id = #{parkBranchCompanyId}
+            </if>
         </where>
     </sql>