通知修改

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/UserInviteClient.java

@@ -6,6 +6,7 @@ import com.chelvc.cloud.vehicle.client.param.TeamInvitePageParam;
 import com.chelvc.cloud.vehicle.client.param.UserInviteParams;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -17,7 +18,7 @@ public interface UserInviteClient {
     @PostMapping("/userInvite/bindInvite")
     void bindInvite(@RequestBody UserInviteParams params);
 
-    @GetMapping("/userInvite/teamList")
+    @GetMapping(value = "/userInvite/teamList", consumes = MediaType.APPLICATION_JSON_VALUE)
     TeamDTO teamList(@SpringQueryMap TeamInvitePageParam param, @RequestParam("userId") Long userId);
 
     /**

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/OmsOrderDTO.java

@@ -64,16 +64,16 @@ public class OmsOrderDTO implements Serializable
     private BigDecimal discountAmount;
 
     /** 支付方式：0->未支付；1->支付宝；2->微信 */
-    private Long payType;
+    private Integer payType;
 
     /** 订单来源：0->PC订单；1->app订单 */
-    private Long sourceType;
+    private Integer sourceType;
 
     /** 订单状态：0->待付款；1->待发货；2->已发货；3->已完成；4->已关闭；5->无效订单 */
-    private Long status;
+    private Integer status;
 
     /** 订单类型：0->正常订单；1->秒杀订单 */
-    private Long orderType;
+    private Integer orderType;
 
     /** 物流公司(配送方式) */
     private String deliveryCompany;
@@ -82,19 +82,19 @@ public class OmsOrderDTO implements Serializable
     private String deliverySn;
 
     /** 自动确认时间（天） */
-    private Long autoConfirmDay;
+    private Integer autoConfirmDay;
 
     /** 可以获得的积分 */
-    private Long integration;
+    private Integer integration;
 
     /** 可以活动的成长值 */
-    private Long growth;
+    private Integer growth;
 
     /** 活动信息 */
     private String promotionInfo;
 
     /** 发票类型：0->不开发票；1->电子发票；2->纸质发票 */
-    private Long billType;
+    private Integer billType;
 
     /** 发票抬头 */
     private String billHeader;
@@ -133,13 +133,13 @@ public class OmsOrderDTO implements Serializable
     private String note;
 
     /** 确认收货状态：0->未确认；1->已确认 */
-    private Long confirmStatus;
+    private Integer confirmStatus;
 
     /** 删除状态：0->未删除；1->已删除 */
-    private Long deleteStatus;
+    private Integer deleteStatus;
 
     /** 下单时使用的积分 */
-    private Long useIntegration;
+    private Integer useIntegration;
 
     /** 支付时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -305,7 +305,8 @@ public class DynamicCommentServiceImpl implements DynamicCommentService {
 
     @Override
     public void changeEvaluateInformFlag(Long userId) {
-        dynamicEvaluateRecordService.changeEvaluateInformFlag(userId);
+        DynamicEvaluateRecordService service = getContentEvaluateRecordService();
+        service.changeEvaluateInformFlag(userId);
         LambdaUpdateWrapper<DynamicComment> lwq = Wrappers.lambdaUpdate();
         lwq.eq(DynamicComment::getTargetUserId, userId);
         lwq.eq(DynamicComment::getFlag, 0);

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/InformServiceImpl.java

@@ -29,14 +29,19 @@ public class InformServiceImpl implements InformService {
         switch (type){
             case PAY:
                 omsOrderPayHistoryService.changeUserPayInformFlag(userId);
+                break;
             case ORDER:
                 omsOrderOperateHistoryService.changeUserOrderInformFlag(userId);
+                break;
             case COUPON:
                 userCouponService.changeUserCouponInformFlag(userId);
+                break;
             case COMMENT:
                 commentService.changeCommentInformFlag(userId);
+                break;
             case EVALUATE:
                 dynamicCommentService.changeEvaluateInformFlag(userId);
+                break;
         }
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderOperateHistoryServiceImpl.java

@@ -130,7 +130,7 @@ public class OmsOrderOperateHistoryServiceImpl extends ServiceImpl<OmsOrderOpera
     public Pagination<OmsOrderOperateHistoryDTO> selectOmsOrderOperateHistoryListByUserId(Long userId, Paging paging) {
         Page<OmsOrderOperateHistory> page = this.lambdaQuery()
                 .eq(OmsOrderOperateHistory::getUserId, userId)
-                .orderByAsc(OmsOrderOperateHistory::getCreateTime).page(DatabaseContextHolder.page(paging));
+                .orderByDesc(OmsOrderOperateHistory::getCreateTime).page(DatabaseContextHolder.page(paging));
         List<OmsOrderOperateHistory> omsOrderOperateHistories = page.getRecords();
         if(CollectionUtils.isEmpty(omsOrderOperateHistories)){
             return null;

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserInviteServiceImpl.java

@@ -24,6 +24,7 @@ import com.chelvc.framework.common.function.Executor;
 import com.chelvc.framework.common.model.Paging;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -124,7 +125,7 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
             List<Long> userIds = records.stream().filter(e -> e.getSourceType() == 1).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<UserDTO> users = this.userService.listUsers(userIds);
             map = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
-            avatar = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getAvatar));
+            avatar = users.stream().filter(e -> StringUtils.isNotBlank(e.getAvatar())).collect(Collectors.toMap(UserDTO::getId, UserDTO::getAvatar));
             List<Long> merchantIds = records.stream().filter(e -> e.getSourceType() == 2).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<MerchantDTO> merchants = this.merchantService.getMerchantByIds(merchantIds);
             map.putAll(merchants.stream().collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getName)));
@@ -133,12 +134,12 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
             List<Long> ids = records.stream().map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<UserDTO> users = this.userService.listUsers(ids);
             map = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
-            avatar = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getAvatar));
+            avatar = users.stream().filter(e -> StringUtils.isNotBlank(e.getAvatar())).collect(Collectors.toMap(UserDTO::getId, UserDTO::getAvatar));
         } else if(param.getType() == 2){
             List<Long> ids = records.stream().map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<MerchantDTO> merchants = this.merchantService.getMerchantByIds(ids);
             map = merchants.stream().collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getName));
-            avatar = merchants.stream().collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getLogo));
+            avatar = merchants.stream().filter(e -> StringUtils.isNotBlank(e.getLogo())).collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getLogo));
         }
         for(TeamDetailsDTO detailsDTO : records){
             detailsDTO.setName(map.get(detailsDTO.getInviteUserId()));

vehicle-server/src/main/resources/mapper/DynamicCommentMapper.xml

@@ -53,15 +53,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectEvaluateListByUserId" resultType="com.chelvc.cloud.vehicle.client.dto.EvaluateDTO">
-        SELECT
+        select * from(SELECT
             c.id AS id,
-            c.user_id AS userId,
-            c.target_user_id AS targetUserId,
-            3 AS operaterType,
-            1 AS contentType,
-            c.dynamic_id AS contentId,
+            c.user_id AS user_id,
+            c.target_user_id AS target_user_id,
+            3 AS operater_type,
+            1 AS content_type,
+            c.dynamic_id AS content_id,
             1 AS type,
-            c.create_time AS createTime
+            c.create_time AS create_time
         FROM
             dynamic_comment c
         WHERE
@@ -69,19 +69,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION ALL
         SELECT
             e.id AS id,
-            e.user_id AS userId,
-            e.target_user_id AS targetUserId,
-            e.operater_type AS operaterType,
-            e.content_type AS contentType,
-            e.content_id AS contentId,
+            e.user_id AS user_id,
+            e.target_user_id AS target_user_id,
+            e.operater_type AS operater_type,
+            e.content_type AS content_type,
+            e.content_id AS content_id,
             2 AS type,
-            e.create_time AS createTime
+            e.create_time AS create_time
         FROM
             dynamic_evaluate_record e
         WHERE
             e.target_user_id = #{userId}
+        ) temp
         ORDER BY
-            createTime DESC
+            temp.create_time DESC
         limit #{number}, #{size}
     </select>
 </mapper>

vehicle-server/src/main/resources/mapper/OmsOrderOperateHistoryMapper.xml

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <update id="changeUserOrderInformFlag" parameterType="Long">
-        update oms_order_operate_history
+        update oms_order_operate_history set
         flag = 1
         where user_id = #{userId}
         and flag = 0