sunkean 3 tahun lalu
induk
melakukan
2d1b4dfb5a

+ 1 - 1
src/main/java/com/izouma/nineth/domain/Collection.java

@@ -252,7 +252,7 @@ public class Collection extends CollectionBaseEntity {
     @ApiModelProperty("是否支付中")
     private boolean inPaying;
 
-    @ManyToMany(fetch = FetchType.EAGER, cascade = {CascadeType.MERGE})
+    @ManyToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE})
     @JoinTable(
             name = "collection_tag",
             joinColumns = {@JoinColumn(name = "collection_id", referencedColumnName = "id",

+ 1 - 0
src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -53,6 +53,7 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     Optional<Collection> findById(@Nonnull Long id);
 
     @Query("select c from Collection c where c.del = false and c.id = ?1")
+    @Transactional
     Optional<Collection> findDetailById(@Nonnull Long id);
 
     @Cacheable("collectionInfo")

+ 0 - 5
src/main/java/com/izouma/nineth/service/AssetService.java

@@ -1,7 +1,6 @@
 package com.izouma.nineth.service;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.google.common.collect.Lists;
 import com.google.common.hash.Hashing;
@@ -160,10 +159,6 @@ public class AssetService {
         if (collection.isMessNumber() && number != null) {
             number = getMessedNumber(collection.getId(), number, collection.getTotal());
         }
-        log.info("----------------------------------");
-        log.info(JSON.toJSONString(collection));
-        log.info(JSON.toJSONString(collection.getTags()));
-        log.info("----------------------------------");
         Asset asset = Asset.create(collection, user);
         asset.setTokenId(TokenUtils.genTokenId());
         asset.setNumber(number);

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

@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alipay.api.AlipayClient;
-import com.alipay.api.request.AlipayTradeWapPayRequest;
 import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
 import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
@@ -56,9 +55,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
 
 import javax.persistence.criteria.Join;
+import javax.transaction.Transactional;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;