去掉事务注解

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/AddDynamicEvaluateRecordParam.java

@@ -42,6 +42,5 @@ public class AddDynamicEvaluateRecordParam implements Serializable {
     @NotNull(message = "内容标识不能为空")
     private Long contentId;
 
-    @NotNull(message = "动态/回复用户标识")
     private Long targetUserId;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/entity/DynamicEvaluateRecord.java

@@ -2,9 +2,7 @@ package com.chelvc.cloud.vehicle.server.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.chelvc.framework.database.entity.Entity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 
 import java.util.Date;
@@ -19,6 +17,7 @@ import java.util.Date;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
+@ToString(callSuper = true)
 @TableName(autoResultMap = true)
 public class DynamicEvaluateRecord implements Entity<Long> {
 
@@ -56,6 +55,5 @@ public class DynamicEvaluateRecord implements Entity<Long> {
     /**
      * 创建时间
      */
-    @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 }

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

@@ -34,7 +34,6 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -115,9 +114,6 @@ public class DynamicCommentServiceImpl implements DynamicCommentService,
         Paging paging = param.getPaging();
         Page<DynamicCommentDTO> page = new Page<>(paging.getNumber(), paging.getSize());
         IPage<DynamicCommentDTO> result = null;
-        if (param == null) {
-            return new Pagination<>();
-        }
         result = baseMapper
                 .queryAll(page, queryManagerWrapper(param));
         IPage<DynamicCommentDTO> resultDto = getResult(result);
@@ -225,7 +221,7 @@ public class DynamicCommentServiceImpl implements DynamicCommentService,
     }
 
     @Override
-    @Transactional(rollbackFor = RuntimeException.class)
+    //@Transactional
     public void examine(Long id, ExamineType examine) {
         DynamicComment DynamicComment = baseMapper.selectById(id);
         if (DynamicComment == null) {

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

@@ -34,7 +34,6 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -208,9 +207,6 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
     Paging paging = param.getPaging();
     Page<DynamicContentDTO> page = new Page<>(paging.getNumber(), paging.getSize());
     IPage<DynamicContentDTO> result = null;
-    if (param == null) {
-      return new Pagination<>();
-    }
     result = baseMapper
         .queryAll(page, queryManagerWrapper(param));
     IPage<DynamicContentDTO> resultDto = getResult(result, false, null);
@@ -262,7 +258,7 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
   }
 
   @Override
-  @Transactional(rollbackFor = Exception.class)
+  //@Transactional
   public void insertByBo(AddDynamicContentParam param, Long userId) {
     addValidEntityBeforeSave(param);
     String textContent = param.getTextContent();
@@ -308,7 +304,7 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
   }
 
   @Override
-  @Transactional(rollbackFor = Exception.class)
+  //@Transactional
   public void deleteByIds(Long id, Long userId) {
     LambdaQueryWrapper<DynamicContent> wrapper = Wrappers.lambdaQuery();
     wrapper.eq(DynamicContent::getId, id);
@@ -378,7 +374,7 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
   }
 
   @Override
-  @Transactional(rollbackFor = Exception.class)
+  //@Transactional
   public void shieldByUserId(Long userId, Integer type) {
     baseMapper.shieldByUserId(userId, type);
     dynamicCommentMapper.shieldByUserId(userId, type);

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

@@ -1,9 +1,5 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -30,7 +26,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * @PACKAGE_NAME: net.yeeu.collision.dynamic.service.impl
@@ -44,8 +43,6 @@ import org.springframework.transaction.annotation.Transactional;
 public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluateRecordMapper, DynamicEvaluateRecord>
         implements DynamicEvaluateRecordService, com.chelvc.cloud.vehicle.api.service.DynamicEvaluateRecordService {
 
-    private final DynamicEvaluateRecordMapper baseMapper;
-
     private final DynamicContentService iDynamicContentService;
 
     private final DynamicCommentService iDynamicCommentService;
@@ -61,7 +58,7 @@ public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluat
      * 新增内容评价(点赞/踩)列
      */
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    //@Transactional
     public Boolean updateRecord(AddDynamicEvaluateRecordParam param, Long userId) {
         Integer actionType = param.getActionType().getValue();
         Integer recordType = param.getRecordType().getValue();

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

@@ -1,5 +1,16 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.chelvc.cloud.vehicle.api.service.UserInviteService;
+import com.chelvc.cloud.vehicle.server.dao.OmsOrderMapper;
+import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
+import com.chelvc.cloud.vehicle.server.service.*;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -15,22 +26,6 @@ import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.Objects;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.chelvc.cloud.vehicle.api.service.UserInviteService;
-import com.chelvc.cloud.vehicle.server.dao.OmsOrderMapper;
-import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
-import com.chelvc.cloud.vehicle.server.service.AssetService;
-import com.chelvc.cloud.vehicle.server.service.BalanceDetailService;
-import com.chelvc.cloud.vehicle.server.service.OrderHandleService;
-import com.chelvc.cloud.vehicle.server.service.PlatformProfitRatioService;
-import com.chelvc.cloud.vehicle.server.service.UserProfitRatioService;
-import com.chelvc.framework.common.exception.ResourceUnavailableException;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OderHandleServiceImpl implements OrderHandleService {
@@ -71,7 +66,7 @@ public class OderHandleServiceImpl implements OrderHandleService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    //@Transactional
     public void handleOrder(OmsOrder omsOrder) {
         omsOrder.setStatus(4);
         omsOrder.setConfirmStatus(1);
@@ -141,7 +136,7 @@ public class OderHandleServiceImpl implements OrderHandleService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    //@Transactional
     public void paySuccess(OmsOrder order) {
         omsOrderMapper.updateById(order);
         BigDecimal surplusAmount = assetService.updateAsset(0, order.getPayAmount(), 1L, 0);

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

@@ -19,7 +19,6 @@ import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
@@ -29,8 +28,6 @@ import java.util.List;
 public class ProfitRatioConfigServiceImpl extends ServiceImpl<ProfitRatioConfigMapper, ProfitRatioConfig> implements
         ProfitRatioConfigService, com.chelvc.cloud.vehicle.api.service.ProfitRatioConfigService {
 
-//    private final ProfitRatioConfigMapper baseMapper;
-
     @Override
     public void add(AddProfitRatioConfigParams params) {
         ProfitRatioConfig config = new ProfitRatioConfig();
@@ -60,7 +57,7 @@ public class ProfitRatioConfigServiceImpl extends ServiceImpl<ProfitRatioConfigM
     }
 
     @Override
-    @Transactional
+    //@Transactional
     public void delete(Long id, Long userId) {
         ProfitRatioConfig profitRatioConfig = baseMapper.selectById(id);
         if(profitRatioConfig == null){

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

@@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDateTime;
@@ -46,7 +45,7 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
     private final MerchantService merchantService;
 
     @Override
-    @Transactional
+    //@Transactional
     public void bindInvite(UserInviteParams params) {
         Long userId = params.getUserId();
         Long targetId = params.getTargetId();

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

@@ -18,7 +18,7 @@
             t.*,m.name
         FROM
             platform_profit_ratio t
-            left join merchant m on t.user_id = t.user_id
+            left join merchant m on m.user_id = t.user_id
             ${ew.getCustomSqlSegment}
     </select>