igl пре 1 година
родитељ
комит
0b2249faf1
14 измењених фајлова са 26 додато и 21 уклоњено
  1. 5 5
      vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/NewInformDTO.java
  2. 5 0
      vehicle-server/pom.xml
  3. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/CommentService.java
  4. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicEvaluateRecordService.java
  5. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/IOmsOrderOperateHistoryService.java
  6. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsOrderPayHistoryService.java
  7. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/UserCouponService.java
  8. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CommentServiceImpl.java
  9. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java
  10. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicEvaluateRecordServiceImpl.java
  11. 5 5
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/InformServiceImpl.java
  12. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderOperateHistoryServiceImpl.java
  13. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderPayHistoryServiceImpl.java
  14. 1 1
      vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserCouponServiceImpl.java

+ 5 - 5
vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/NewInformDTO.java

@@ -8,25 +8,25 @@ public class NewInformDTO {
     /**
      * 订单通知数
      */
-    private Long order = 0L;
+    private Integer order = 0;
 
     /**
      * 点赞回复数
      */
-    private Long evaluate = 0L;
+    private Integer evaluate = 0;
 
     /**
      * 优惠券数量
      */
-    private Long coupon = 0L;
+    private Integer coupon = 0;
 
     /**
      * 付款数量
      */
-    private Long pay = 0L;
+    private Integer pay = 0;
 
     /**
      * 商品评价数量
      */
-    private Long comment = 0L;
+    private Integer comment = 0;
 }

+ 5 - 0
vehicle-server/pom.xml

@@ -52,5 +52,10 @@
             <artifactId>hutool-all</artifactId>
             <version>5.5.8</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>lock4j-redis-template-spring-boot-starter</artifactId>
+            <version>2.2.4</version>
+        </dependency>
     </dependencies>
 </project>

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/CommentService.java

@@ -28,7 +28,7 @@ public interface CommentService extends IService<Comment> {
      * @param userId
      * @return
      */
-    Long queryNewInformNum(Long userId);
+    Integer queryNewInformNum(Long userId);
 
     /**
      * 将评价通知标识更改

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/DynamicEvaluateRecordService.java

@@ -24,7 +24,7 @@ public interface DynamicEvaluateRecordService {
      * @param userId
      * @return
      */
-    Long queryNewInformNum(Long userId);
+    Integer queryNewInformNum(Long userId);
 
     /**
      * 将新点赞回复通知标识更改

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/IOmsOrderOperateHistoryService.java

@@ -84,5 +84,5 @@ public interface IOmsOrderOperateHistoryService
      * @param userId
      * @return
      */
-    Long queryNewInformNum(Long userId);
+    Integer queryNewInformNum(Long userId);
 }

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/OmsOrderPayHistoryService.java

@@ -6,7 +6,7 @@ public interface OmsOrderPayHistoryService {
      * 查看信息数
      * @param userId
      */
-    Long queryNewInformNum(Long userId);
+    Integer queryNewInformNum(Long userId);
 
     /**
      * 将新支付通知标识更改

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/UserCouponService.java

@@ -16,7 +16,7 @@ public interface UserCouponService extends IService<UserCoupon> {
      * @param userId
      * @return
      */
-    Long queryNewInformNum(Long userId);
+    Integer queryNewInformNum(Long userId);
 
     /**
      * 将新优惠券通知标识更改

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CommentServiceImpl.java

@@ -48,7 +48,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
     }
 
     @Override
-    public Long queryNewInformNum(Long userId) {
+    public Integer queryNewInformNum(Long userId) {
         LambdaQueryWrapper<Comment> lwq = Wrappers.lambdaQuery();
         lwq.eq(Comment::getUserId, userId);
         lwq.eq(Comment::getFlag, 0);

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

@@ -141,7 +141,7 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
     List<String> list = new ArrayList<>();
     list.add("t1.create_time");
     list.add("t1.id");
-    lqw.orderByDesc(list);
+    lqw.orderByDesc(list.toString());
     return lqw;
   }
 

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicEvaluateRecordServiceImpl.java

@@ -96,7 +96,7 @@ public class DynamicEvaluateRecordServiceImpl implements DynamicEvaluateRecordSe
   }
 
   @Override
-  public Long queryNewInformNum(Long userId) {
+  public Integer queryNewInformNum(Long userId) {
     LambdaQueryWrapper<DynamicEvaluateRecord> lwq = Wrappers.lambdaQuery();
     lwq.eq(DynamicEvaluateRecord::getTargetUserId, userId);
     lwq.eq(DynamicEvaluateRecord::getFlag, 0);

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

@@ -40,15 +40,15 @@ public class InformServiceImpl implements InformService {
     @Override
     public NewInformDTO getNewInform(Long userId) {
         NewInformDTO newInformDTO = new NewInformDTO();
-        Long evaluate = dynamicEvaluateRecordService.queryNewInformNum(userId);
+        Integer evaluate = dynamicEvaluateRecordService.queryNewInformNum(userId);
         newInformDTO.setEvaluate(evaluate);
-        Long order = omsOrderOperateHistoryService.queryNewInformNum(userId);
+        Integer order = omsOrderOperateHistoryService.queryNewInformNum(userId);
         newInformDTO.setOrder(order);
-        Long coupon = userCouponService.queryNewInformNum(userId);
+        Integer coupon = userCouponService.queryNewInformNum(userId);
         newInformDTO.setCoupon(coupon);
-        Long pay = omsOrderPayHistoryService.queryNewInformNum(userId);
+        Integer pay = omsOrderPayHistoryService.queryNewInformNum(userId);
         newInformDTO.setPay(pay);
-        Long comment = commentService.queryNewInformNum(userId);
+        Integer comment = commentService.queryNewInformNum(userId);
         newInformDTO.setComment(comment);
         return newInformDTO;
     }

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

@@ -127,7 +127,7 @@ public class OmsOrderOperateHistoryServiceImpl extends ServiceImpl<OmsOrderOpera
     }
 
     @Override
-    public Long queryNewInformNum(Long userId) {
+    public Integer queryNewInformNum(Long userId) {
         LambdaQueryWrapper<OmsOrderOperateHistory> lwq = Wrappers.lambdaQuery();
         lwq.eq(OmsOrderOperateHistory::getUserId, userId);
         lwq.eq(OmsOrderOperateHistory::getFlag, 0);

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/OmsOrderPayHistoryServiceImpl.java

@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
 public class OmsOrderPayHistoryServiceImpl extends ServiceImpl<OmsOrderPayHistoryMapper, OmsOrderPayHistory> implements OmsOrderPayHistoryService {
 
     @Override
-    public Long queryNewInformNum(Long userId) {
+    public Integer queryNewInformNum(Long userId) {
         LambdaQueryWrapper<OmsOrderPayHistory> lwq = Wrappers.lambdaQuery();
         lwq.eq(OmsOrderPayHistory::getUserId, userId);
         lwq.eq(OmsOrderPayHistory::getFlag, 0);

+ 1 - 1
vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserCouponServiceImpl.java

@@ -144,7 +144,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
     }
 
     @Override
-    public Long queryNewInformNum(Long userId) {
+    public Integer queryNewInformNum(Long userId) {
         LambdaQueryWrapper<UserCoupon> lwq = Wrappers.lambdaQuery();
         lwq.eq(UserCoupon::getUserId, userId);
         lwq.eq(UserCoupon::getFlag, 0);