活动收集

src/main/java/com/izouma/nineth/security/WebSecurityConfig.java

@@ -101,6 +101,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/activity/get/*").permitAll()
                 .antMatchers("/druid/**").permitAll()
                 .antMatchers("/testmq/**").permitAll()
+                .antMatchers("/activityCollection/all").permitAll()
+                .antMatchers("/activityCollection/get/**").permitAll()
                 // all other requests need to be authenticated
                 .anyRequest().authenticated().and()
                 // make sure we use stateless session; session won't be used to

src/main/java/com/izouma/nineth/service/ActivityOrderService.java

@@ -38,7 +38,7 @@ public class ActivityOrderService {
     }
 
 
-    public void created(User user, Long mintActivityId) {
+    public Asset create(User user, Long mintActivityId) {
         try {
             ActivityCollection activity = activityCollectionRepo.findById(mintActivityId)
                     .orElseThrow(new BusinessException("活动不存在"));
@@ -129,7 +129,7 @@ public class ActivityOrderService {
             });
 
             //发放新的
-            assetService.createAsset(award, user, order.getId(), null, "兑换",
+            return assetService.createAsset(award, user, order.getId(), null, "兑换",
                     award.getTotal() > 1 ? collectionService.getNextNumber(award.getId()) : null);
 
         } catch (Exception e) {

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -371,14 +371,15 @@ public class AssetService {
                     userHistory.setDescription(tokenHistory.getToUserId().equals(userId) ? "作品交易——买入" : "作品交易——售出");
                     break;
                 case "兑换":
-                    userHistory.setDescription("兑换");
+                    userHistory.setDescription("活动收集——兑换");
+                    break;
                 case "空投":
                     userHistory.setDescription("空投");
                     break;
                 case "转赠":
                     userHistory.setDescription(tokenHistory.getToUserId().equals(userId) ? "他人赠送" : "作品赠送");
                     if (userHistory.getToUserId().equals(1590945L)) {
-                        userHistory.setDescription("活动收集销毁");
+                        userHistory.setDescription("活动收集——销毁");
                     }
                     break;
             }

src/main/java/com/izouma/nineth/web/ActivityCollectionController.java

@@ -23,7 +23,7 @@ public class ActivityCollectionController extends BaseController {
     private ActivityCollectionService activityCollectionService;
     private ActivityCollectionRepo    activityCollectionRepo;
 
-    //@PreAuthorize("hasRole('ADMIN')")
+    @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public ActivityCollection save(@RequestBody ActivityCollection record) {
         if (record.getCollectionId().equals(record.getAwardCollectionId())) {

src/main/java/com/izouma/nineth/web/ActivityOrderController.java

@@ -1,14 +1,16 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.ActivityOrder;
+import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.service.ActivityOrderService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.ActivityOrderRepo;
 import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -20,7 +22,7 @@ import java.util.List;
 @AllArgsConstructor
 public class ActivityOrderController extends BaseController {
     private ActivityOrderService activityOrderService;
-    private ActivityOrderRepo activityOrderRepo;
+    private ActivityOrderRepo    activityOrderRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -56,5 +58,10 @@ public class ActivityOrderController extends BaseController {
         List<ActivityOrder> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @PostMapping("/create")
+    public Asset create(@RequestParam Long mintActivityId) {
+        return activityOrderService.create(SecurityUtils.getAuthenticatedUser(), mintActivityId);
+    }
 }
 

src/test/java/com/izouma/nineth/service/ActivityOrderServiceTest.java

@@ -16,6 +16,6 @@ public class ActivityOrderServiceTest extends ApplicationTests {
     @Test
     public void created() {
         User user = userRepo.findById(7834L).orElse(null);
-        activityOrderService.created(user, 8847L);
+        activityOrderService.create(user, 8847L);
     }
 }