xiongzhu 4 лет назад
Родитель
Сommit
226f4d4960

+ 2 - 8
src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -27,17 +27,11 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     @Modifying
     @Query(value = "update collection_info c set c.on_shelf = ?2, c.salable = ?3, c.start_time = ?4, " +
             "c.schedule_sale = ?5, c.sort = ?6, c.detail = ?7, c.privileges = ?8, " +
-            "c.properties = ?9, c.model3d = ?10 where c.id = ?1",nativeQuery = true)
+            "c.properties = ?9, c.model3d = ?10, c.max_count = ?11, c.count_id = ?12 where c.id = ?1",nativeQuery = true)
     @CacheEvict(value = {"collection", "recommend"}, allEntries = true)
     void update(@Nonnull Long id, boolean onShelf, boolean salable, LocalDateTime startTime,
                 boolean schedule, int sort, String detail, String privileges,
-                String properties, String model3d);
-
-    @Transactional
-    @Modifying
-    @Query(value = "update collection_info c set c.privileges = ?2 where c.id = ?1",nativeQuery = true)
-    @CacheEvict(value = {"collection", "recommend"}, allEntries = true)
-    void update(@Nonnull Long id, String privileges);
+                String properties, String model3d, int maxCount, String countId);
 
     @Cacheable("collection")
     Optional<Collection> findById(@Nonnull Long id);

+ 2 - 2
src/main/java/com/izouma/nineth/service/CollectionService.java

@@ -120,8 +120,8 @@ public class CollectionService {
         collectionRepo.update(record.getId(), record.isOnShelf(), record.isSalable(),
                 record.getStartTime(), record.isScheduleSale(), record.getSort(),
                 record.getDetail(), JSON.toJSONString(record.getPrivileges()),
-                JSON.toJSONString(record.getProperties()), JSON.toJSONString(record.getModel3d()));
-        collectionRepo.update(record.getId(), JSON.toJSONString(record.getPrivileges()));
+                JSON.toJSONString(record.getProperties()), JSON.toJSONString(record.getModel3d()),
+                record.getMaxCount(), record.getCountId());
         record = collectionRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
         onShelfTask(record);
         return record;