@Modifying remove clearAutomatically=true

rankin-common-utils/src/main/java/cn/rankin/common/utils/jpa/SimpleJpaRepository.java

@@ -37,7 +37,7 @@ public class SimpleJpaRepository<E, ID extends Serializable> extends org.springf
     private static final Logger logger = LoggerFactory.getLogger(SimpleJpaRepository.class);
 
     // jpa管理器对象
-    @PersistenceContext
+//    @PersistenceContext
     private EntityManager entityManager;
 
     // 实体信息

rankin-product-service/src/main/java/cn/rankin/productservice/repository/CourseRepository.java

@@ -15,7 +15,7 @@ public interface CourseRepository extends BasicJpaRepository<Course, String> {
     @Query(value = "select c from Course c where c.id in (?1) and c.status = ?2")
     List<Course> findByIds(List<String> ids, BaseStatusEnum status);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Course c set c.status = 1 where c.id = ?1")
     Integer deleteById(String id);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/CourseSubRelationRepository.java

@@ -6,7 +6,6 @@ import cn.rankin.data.api.product.entity.CourseSubRelation;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -20,8 +19,7 @@ public interface CourseSubRelationRepository extends BasicJpaRepository<CourseSu
     @Query(value = "select r from CourseSubRelation r where r.subId = :subId and r.status = :status")
     List<CourseSubRelation> findBySubId(@Param("subId") String subId, @Param("status") BaseStatusEnum status);
 
-    @Transactional
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update CourseSubRelation r set r.status = 1 where r.courseId = :courseId")
     Integer deleteByCourseId(@Param("courseId") String courseId);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/CourseSupportRelationRepository.java

@@ -18,7 +18,7 @@ public interface CourseSupportRelationRepository extends BasicJpaRepository<Cour
     List<CourseSupportRelation> findAllByCourseId(String courseId);
 
     @Transactional
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update CourseSupportRelation r set r.status = :status where r.courseId = :courseId")
     Integer deleteByCourseId(@Param("courseId") String courseId, @Param("status")BaseStatusEnum status);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/GoodsRepository.java

@@ -19,7 +19,7 @@ public interface GoodsRepository extends BasicJpaRepository<Goods, String> {
     @Query(value = "select g from Goods g where g.id in (?1) and g.status = ?2")
     List<Goods> findByIds(List<String> goodIds, BaseStatusEnum status);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Goods g set g.status = 1 where g.id = ?1")
     Integer deleteById(String id);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/LessonRepository.java

@@ -20,7 +20,7 @@ public interface LessonRepository extends BasicJpaRepository<Lesson, String> {
     List<Lesson> findByIds(@Param("ids") List<String> ids, @Param("status") BaseStatusEnum status);
 
     @Transactional
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Lesson l set l.status = :status where l.id = :id")
     Integer deleteById(@Param("id") String id, @Param("status")BaseStatusEnum status);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/LessonWareRelationRepository.java

@@ -23,7 +23,7 @@ public interface LessonWareRelationRepository extends BasicJpaRepository<LessonW
     List<LessonWareRelation> findByLessonId(@Param("lessonId") String lessonId, @Param("status") BaseStatusEnum status);
 
     @Transactional
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update LessonWareRelation r set r.status = :status where r.lessonId = :lessonId")
     Integer deleteByLessonId(@Param("lessonId") String lessonId, @Param("status") BaseStatusEnum status);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/MerchantProductRepository.java

@@ -18,7 +18,7 @@ public interface MerchantProductRepository extends BasicJpaRepository<MerchantPr
 
     MerchantProduct findByPidAndMerchantId(String pid, String merchantId);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update MerchantProduct m set m.status = 1 where m.pid = ?1")
     Integer deleteByPid(String pid);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/PackageProductRelationRepository.java

@@ -12,7 +12,7 @@ public interface PackageProductRelationRepository extends BasicJpaRepository<Pac
     @Query(value = "select r from PackageProductRelation r where r.packageId = ?1 and r.status = 0 order by r.sort")
     List<PackageProductRelation> findByPackageId(String packageId);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update PackageProductRelation r set r.status = 1 where r.packageId = ?1")
     Integer deleteByPackageId(String pkgId);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/ProductRepository.java

@@ -14,7 +14,7 @@ public interface ProductRepository extends BasicJpaRepository<Product, String> {
     @Query(value = "select p from Product p where p.pid in (?1) and p.status = 0")
     List<Product> findByPids(List<String> pids);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Product p set p.status = 1 where p.pid = ?1")
     Integer deleteByPid(String pid);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/ProductTagRelationRepository.java

@@ -20,11 +20,11 @@ public interface ProductTagRelationRepository extends BasicJpaRepository<Merchan
     @Query(value = "select r from MerchantProductTagRelation r where r.pid = ?1 and r.merchantId = ?2 and r.status = 0")
     List<MerchantProductTagRelation> findByPidAndMerchantId(String pid, String merchantId);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update MerchantProductTagRelation r set r.status = 1 where r.tagId = :tagId")
     Integer deleteByTagId(@Param("tagId") String tagId);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update MerchantProductTagRelation r set r.status = 1 where r.pid = :productId and r.merchantId = :merchantId")
     Integer deleteByPidAndMerchantId(@Param("productId") String productId, @Param("merchantId") String merchantId);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/SupportReferenceRepository.java

@@ -18,7 +18,7 @@ public interface SupportReferenceRepository extends BasicJpaRepository<SupportRe
     List<SupportReference> findAllByFid(String fid);
 
     @Transactional
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update SupportReference r set r.status = 1 where r.fid = :fid")
     Integer deleteByFid(@Param("fid") String fid);
 

rankin-product-service/src/main/java/cn/rankin/productservice/repository/SupportRepository.java

@@ -18,7 +18,7 @@ public interface SupportRepository extends BasicJpaRepository<Support, String> {
     List<Support> findByIds(@Param("ids") List<String> ids, @Param("status") BaseStatusEnum status);
 
     @Transactional
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Support s set s.status = 1 where s.id = :id")
     Integer deleteById(@Param("id") String id);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/TagGroupRepository.java

@@ -14,7 +14,7 @@ public interface TagGroupRepository extends BasicJpaRepository<TagGroup, String>
     Long countByCode(String code);
 
     @Transactional
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update TagGroup g set g.status = 1 where g.id = :id")
     Integer deleteById(@Param("id") String id);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/TagRepository.java

@@ -15,7 +15,7 @@ public interface TagRepository extends BasicJpaRepository<Tag, String> {
     @Query(value = "select t from Tag t where t.id in (?1) and t.status = ?2")
     List<Tag> findByIds(List<String> tagIdList, BaseStatusEnum status);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Tag t set t.status = 1 where t.id = ?1")
     Integer deleteById(String tagId);
 }

rankin-product-service/src/main/java/cn/rankin/productservice/repository/WareRepository.java

@@ -17,7 +17,7 @@ public interface WareRepository extends BasicJpaRepository<CourseWare, String> {
 
     Long countByIdIn(List<String> Ids);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update CourseWare w set w.status = :status  where w.id = :id")
     Integer deleteAllById(@Param("id") String id, @Param("status") BaseStatusEnum status);
 

rankin-task/src/main/java/cn/rankin/task/repository/OrderGoodsRepository.java

@@ -15,7 +15,7 @@ public interface OrderGoodsRepository extends BasicJpaRepository<OrderGoods, Str
     @Query(value = "select g from OrderGoods g where g.orderId in (?1)")
     List<OrderGoods> findByOrderIds(List<String> orderIds);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update OrderGoods r set r.detailId = :detailId where r.orderId = :orderId and r.goodsId in (:ids)")
     Integer setDetailId(@Param("detailId") String detailId, @Param("orderId") String orderId, @Param("ids") List<String> ids);
 }

rankin-task/src/main/java/cn/rankin/task/repository/OrderRepository.java

@@ -13,12 +13,12 @@ public interface OrderRepository extends BasicJpaRepository<Order, String> {
     List<Order> findSplitOrders(Integer limit);
 
     // 已拆分
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Order o set o.splitStatus = 2 where o.splitStatus = 0 and o.orderStatus = 1 and o.status = 0 and o.id = ?1")
     Integer split(String orderId);
 
     // 不需要拆分，但也要处理
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Order o set o.splitStatus = 1 where o.splitStatus = 0 and o.orderStatus = 1 and o.status = 0 and o.id = ?1")
     Integer process(String orderId);
 }

rankin-task/src/main/java/cn/rankin/task/service/OrderService.java

@@ -79,7 +79,7 @@ public class OrderService {
             return Boolean.FALSE;
         }
 
-        orderDetailList.forEach(orderDetail -> {
+        for (OrderDetail orderDetail : orderDetailList) {
             orderDetail.setOrderStatus(OrderDetailStatusEnum.FORSEND);
             OrderDetail one = orderDetailRepository.save(orderDetail);
             String detailId = one.getId();
@@ -88,11 +88,11 @@ public class OrderService {
             for (OrderGoods orderGoods : orderGoodsList) {
                 goodsIdList.add(orderGoods.getGoodsId());
             }
-            Integer rowcount = orderGoodsRepository.setDetailId(detailId, orderId, goodsIdList);
-            if (rowcount > 0) {
+            Integer rowCount = orderGoodsRepository.setDetailId(detailId, orderId, goodsIdList);
+            if (rowCount > 0) {
                 log.info("orderId={}, 已成功分拆一单, detailId={}", orderId, detailId);
             }
-        });
+        }
         return Boolean.TRUE;
     }
 }

rankin-trade-service/src/main/java/cn/rankin/tradeservice/repository/OrderRepository.java

@@ -9,11 +9,11 @@ import java.util.List;
 
 public interface OrderRepository extends BasicJpaRepository<Order, String> {
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Order o set o.orderStatus = 1 where o.status = 0 and o.id = ?1 and o.orderStatus = 0")
     Integer pay(String orderId);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update Order o set o.orderStatus = 2 where o.status = 0 and o.id = ?1 and o.orderStatus = 0")
     Integer cancel(String orderId);
 

rankin-user-service/src/main/java/cn/rankin/userservice/repository/CmsUserRepository.java

@@ -19,7 +19,7 @@ public interface CmsUserRepository extends BasicJpaRepository<CmsUser, String> {
 
     CmsUser findByNameAndStatus(String name, BaseStatusEnum status);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update CmsUser u set u.status = :status where u.id = :id")
     Integer updateStatusById(@Param("id") String id, @Param("status") BaseStatusEnum status);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/repository/MerchantRepository.java

@@ -23,17 +23,15 @@ public interface MerchantRepository  extends BasicJpaRepository<Merchant, String
 
 	Merchant findByName(String name);
 
-    @Transactional
-    @Modifying(clearAutomatically = true)
+	@Modifying
     @Query("update Merchant m set m.status = :status where m.id in (:ids) ")
     int updateStatusByIds(@Param("ids") List<String> ids, @Param("status") BaseStatusEnum status);
 
-    @Transactional
-    @Modifying(clearAutomatically = true)
+	@Modifying
     @Query("update Merchant m set m.status = :status where m.id = :id ")
     int updateStatusById(@Param("id") String id, @Param("status") BaseStatusEnum status);
 
-    @Modifying(clearAutomatically = true)
+	@Modifying
     @Query(value = "update Merchant m set m.balance = m.balance - ?2 where m.balance - ?2 > 0 and m.id = ?1")
     Integer pay(String merchantId, BigDecimal quantity);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/repository/TerminalDeviceRepository.java

@@ -14,11 +14,11 @@ import java.util.List;
 @Repository
 public interface TerminalDeviceRepository extends BasicJpaRepository<TerminalDevice, String> {
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query("update TerminalDevice a set a.status = :status where a.id in (:ids)")
     int updateStatusByIds(@Param("ids") List<Long> ids, @Param("status") BaseStatusEnum status);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update TerminalDevice t set t.bind = 0 where t.userId = :userId")
     int unbind(@Param("userId") String userId);
 

rankin-user-service/src/main/java/cn/rankin/userservice/repository/TerminalUserRepository.java

@@ -16,7 +16,7 @@ public interface TerminalUserRepository extends BasicJpaRepository<TerminalUser,
 
     List<TerminalUser> findByCampusIdIn(List<String> campusIds);
 
-    @Modifying(clearAutomatically = true)
+    @Modifying
     @Query(value = "update TerminalUser t set t.status = :status where t.id = :id")
     Integer updateStatusById(@Param("status") BaseStatusEnum status, @Param("id") String id);
 }