邀请得空投/活动收集

src/main/java/com/izouma/nineth/domain/ActivityMaterial.java

@@ -0,0 +1,42 @@
+package com.izouma.nineth.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.izouma.nineth.converter.FileObjectListConverter;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonIgnoreProperties(value = {"hibernateLazyInitializer"}, ignoreUnknown = true)
+public class ActivityMaterial extends BaseEntity {
+    private Long orderId;
+
+    private Long assetId;
+
+    private Long collectionId;
+
+    private String name;
+
+    @ApiModelProperty("图片")
+    @Convert(converter = FileObjectListConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<FileObject> pic;
+
+    @ApiModelProperty("编号")
+    private Integer number;
+
+    @ApiModelProperty("分类")
+    private String category;
+
+}

src/main/java/com/izouma/nineth/domain/ActivityOrder.java

@@ -0,0 +1,33 @@
+package com.izouma.nineth.domain;
+
+
+import com.izouma.nineth.annotations.Searchable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+public class ActivityOrder extends BaseEntity {
+
+    private Long userId;
+
+    @Searchable
+    private String phone;
+
+    private Long activityCollectionId;
+
+    private String activityCollection;
+
+    @Transient
+    private List<ActivityMaterial> material;
+
+}

src/main/java/com/izouma/nineth/listener/UpdateActivityStockListener.java

@@ -0,0 +1,28 @@
+package com.izouma.nineth.listener;
+
+import com.izouma.nineth.service.ActivityCollectionService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.annotation.ConsumeMode;
+import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+import org.apache.rocketmq.spring.core.RocketMQListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+@RocketMQMessageListener(
+        consumerGroup = "${general.update-activity-stock-group}",
+        topic = "${general.update-activity-stock-topic}",
+        consumeMode = ConsumeMode.ORDERLY)
+@ConditionalOnProperty(value = "general.notify-server", havingValue = "false", matchIfMissing = true)
+public class UpdateActivityStockListener implements RocketMQListener<Long> {
+
+    private ActivityCollectionService activityCollectionService;
+
+    @Override
+    public void onMessage(Long id) {
+        activityCollectionService.syncStock(id);
+    }
+}

src/main/java/com/izouma/nineth/repo/ActivityCollectionRepo.java

@@ -13,4 +13,12 @@ public interface ActivityCollectionRepo extends JpaRepository<ActivityCollection
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    @Query("select c.stock from ActivityCollection c where c.id = ?1")
+    Integer getStock(Long id);
+
+    @Query("update ActivityCollection c set c.stock = ?2 where c.id = ?1")
+    @Transactional
+    @Modifying
+    int updateStock(Long id, int stock);
 }

src/main/java/com/izouma/nineth/repo/ActivityMaterialRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityMaterial;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityMaterialRepo extends JpaRepository<ActivityMaterial, Long>, JpaSpecificationExecutor<ActivityMaterial> {
+    @Query("update ActivityMaterial t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/nineth/repo/ActivityOrderRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.ActivityOrder;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ActivityOrderRepo extends JpaRepository<ActivityOrder, Long>, JpaSpecificationExecutor<ActivityOrder> {
+    @Query("update ActivityOrder t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

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

@@ -1,20 +1,57 @@
 package com.izouma.nineth.service;
 
+import com.izouma.nineth.annotations.Debounce;
+import com.izouma.nineth.config.GeneralProperties;
+import com.izouma.nineth.config.RedisKeys;
 import com.izouma.nineth.domain.ActivityCollection;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.repo.ActivityCollectionRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.data.domain.Page;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
 @Service
 @AllArgsConstructor
 public class ActivityCollectionService {
 
-    private ActivityCollectionRepo activityCollectionRepo;
+    private ActivityCollectionRepo        activityCollectionRepo;
+    private RedisTemplate<String, Object> redisTemplate;
+    private CacheService                  cacheService;
+    private RocketMQTemplate              rocketMQTemplate;
+    private GeneralProperties             generalProperties;
 
     public Page<ActivityCollection> all(PageQuery pageQuery) {
         return activityCollectionRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityCollection.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    public synchronized Long increaseStock(Long id, int number) {
+        BoundValueOperations<String, Object> ops = redisTemplate.boundValueOps(RedisKeys.MINT_ACTIVITY_STOCK + id);
+        if (ops.get() == null) {
+            Boolean success = ops.setIfAbsent(Optional.ofNullable(activityCollectionRepo.getStock(id))
+                    .orElse(0), 7, TimeUnit.DAYS);
+            log.info("创建redis铸造活动库存：{}", success);
+        }
+        Long stock = ops.increment(number);
+        rocketMQTemplate.convertAndSend(generalProperties.getUpdateActivityStockTopic(), id);
+        return stock;
+    }
+
+    @Debounce(key = "#id", delay = 500)
+    public void syncStock(Long id) {
+        Integer stock = (Integer) redisTemplate.opsForValue().get(RedisKeys.MINT_ACTIVITY_STOCK + id);
+        if (stock != null) {
+            log.info("同步铸造活动库存信息{}", id);
+            activityCollectionRepo.updateStock(id, stock);
+            cacheService.clearActivityCollection(id);
+        }
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.ActivityMaterial;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.ActivityMaterialRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ActivityMaterialService {
+
+    private ActivityMaterialRepo activityMaterialRepo;
+
+    public Page<ActivityMaterial> all(PageQuery pageQuery) {
+        return activityMaterialRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityMaterial.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.izouma.nineth.service;
+
+import com.izouma.nineth.domain.ActivityCollection;
+import com.izouma.nineth.domain.ActivityOrder;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityCollectionRepo;
+import com.izouma.nineth.repo.ActivityOrderRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+@AllArgsConstructor
+public class ActivityOrderService {
+
+    private ActivityOrderRepo         activityOrderRepo;
+    private ActivityCollectionRepo    activityCollectionRepo;
+    private ActivityCollectionService activityCollectionService;
+
+    public Page<ActivityOrder> all(PageQuery pageQuery) {
+        return activityOrderRepo.findAll(JpaUtils.toSpecification(pageQuery, ActivityOrder.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+
+    public void created(List<Long> assetId, Long mintActivityId) {
+        ActivityCollection collection = activityCollectionRepo.findById(mintActivityId)
+                .orElseThrow(new BusinessException("活动不存在"));
+
+        int stock = Optional.ofNullable(activityCollectionService.increaseStock(mintActivityId, -1))
+                .map(Math::toIntExact)
+                .orElseThrow(new BusinessException("很遗憾，活动已无库存"));
+
+        if (stock < 0) {
+            throw new BusinessException("活动已无库存");
+        }
+
+    }
+}

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

@@ -20,4 +20,8 @@ public class CacheService {
     @CacheEvict(value = "user", key = "#username")
     public void clearUser(String username) {
     }
+
+    @CacheEvict(value = "activityCollection", key = "#id")
+    public void clearActivityCollection(Long id) {
+    }
 }

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

@@ -73,7 +73,7 @@ public class IdentityAuthService {
                         if (collection.getStock() > 0) {
                             List<Long> userIds = List.of(user.getInvitor());
                             String name = "邀请新人得空投奖励";
-                            List<AirDrop> airDrops = airDropRepo.findAllByUserIdsAndName(String.valueOf(userIds), name);
+                            List<AirDrop> airDrops = airDropRepo.findAllByUserIdsAndName(String.valueOf(user.getInvitor()), name);
                             if (CollUtil.isEmpty(airDrops)) {
                                 airDropService.create(AirDrop.builder()
                                         .name(name)

src/main/java/com/izouma/nineth/service/sms/AliSmsService.java

@@ -101,9 +101,9 @@ public class AliSmsService implements SmsService {
     @Override
     public String verify(String phone, String code) {
         SmsRecord smsRecord = smsRecordRepo.findLastByPhoneAndExpiresAtAfterAndExpiredFalse(phone, LocalDateTime.now())
-                .orElseThrow(new BusinessException("验证码错误"));
+                .orElseThrow(new BusinessException("短信验证码错误"));
         if (!smsRecord.getCode().equalsIgnoreCase(code)) {
-            throw new BusinessException("验证码错误");
+            throw new BusinessException("短信验证码错误");
         }
         smsRecord.setExpired(true);
         smsRecordRepo.save(smsRecord);

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

@@ -1,4 +1,5 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.ActivityCollection;
 import com.izouma.nineth.service.ActivityCollectionService;
 import com.izouma.nineth.dto.PageQuery;
@@ -20,16 +21,21 @@ import java.util.List;
 @AllArgsConstructor
 public class ActivityCollectionController extends BaseController {
     private ActivityCollectionService activityCollectionService;
-    private ActivityCollectionRepo activityCollectionRepo;
+    private ActivityCollectionRepo    activityCollectionRepo;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
     public ActivityCollection save(@RequestBody ActivityCollection record) {
+        if (record.getCollectionId().equals(record.getAwardCollectionId())) {
+            throw new BusinessException("兑换的藏品不能和领取的藏品相同");
+        }
         if (record.getId() != null) {
-            ActivityCollection orig = activityCollectionRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ActivityCollection orig = activityCollectionRepo.findById(record.getId())
+                    .orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
             return activityCollectionRepo.save(orig);
         }
+        record.setStock(record.getStock());
         return activityCollectionRepo.save(record);
     }
 

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.ActivityMaterial;
+import com.izouma.nineth.service.ActivityMaterialService;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.ActivityMaterialRepo;
+import com.izouma.nineth.utils.ObjUtils;
+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;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityMaterial")
+@AllArgsConstructor
+public class ActivityMaterialController extends BaseController {
+    private ActivityMaterialService activityMaterialService;
+    private ActivityMaterialRepo activityMaterialRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityMaterial save(@RequestBody ActivityMaterial record) {
+        if (record.getId() != null) {
+            ActivityMaterial orig = activityMaterialRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityMaterialRepo.save(orig);
+        }
+        return activityMaterialRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityMaterial> all(@RequestBody PageQuery pageQuery) {
+        return activityMaterialService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityMaterial get(@PathVariable Long id) {
+        return activityMaterialRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityMaterialRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityMaterial> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -0,0 +1,60 @@
+package com.izouma.nineth.web;
+import com.izouma.nineth.domain.ActivityOrder;
+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.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;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/activityOrder")
+@AllArgsConstructor
+public class ActivityOrderController extends BaseController {
+    private ActivityOrderService activityOrderService;
+    private ActivityOrderRepo activityOrderRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public ActivityOrder save(@RequestBody ActivityOrder record) {
+        if (record.getId() != null) {
+            ActivityOrder orig = activityOrderRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return activityOrderRepo.save(orig);
+        }
+        return activityOrderRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<ActivityOrder> all(@RequestBody PageQuery pageQuery) {
+        return activityOrderService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public ActivityOrder get(@PathVariable Long id) {
+        return activityOrderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        activityOrderRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<ActivityOrder> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

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

@@ -35,7 +35,7 @@ public class SmsController {
         }
         boolean verify = captchaService.verify(captchaKey, captcha);
         if (!verify) {
-            throw new BusinessException("验证码错误");
+            throw new BusinessException("图形验证码错误");
         }
 
         return smsService.sendVerify(phone);

src/main/resources/genjson/ActivityMaterial.json

@@ -0,0 +1 @@
+{"tableName":"ActivityMaterial","className":"ActivityMaterial","remark":"兑换材料","genTable":true,"genClass":true,"genList":false,"genForm":false,"genRouter":false,"javaPath":"/Users/qiufangchao/Desktop/project/9th/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/9th/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"orderId","modelName":"orderId","remark":"orderId","showInList":true,"showInForm":true,"formType":"number"},{"name":"assetId","modelName":"assetId","remark":"assetId","showInList":true,"showInForm":true,"formType":"number"},{"name":"collectionId","modelName":"collectionId","remark":"collectionId","showInList":true,"showInForm":true,"formType":"number"},{"name":"name","modelName":"name","remark":"name","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"pic","modelName":"pic","remark":"图片","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"number","modelName":"number","remark":"编号","showInList":true,"showInForm":true,"formType":"number"},{"name":"category","modelName":"category","remark":"分类","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.ActivityMaterial"}

src/main/resources/genjson/ActivityOrder.json

@@ -0,0 +1 @@
+{"tableName":"ActivityOrder","className":"ActivityOrder","remark":"收集记录","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/9th/src/main/java/com/izouma/nineth","viewPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/9th/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/9th/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"userId","modelName":"userId","remark":"用户ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"phone","modelName":"phone","remark":"手机号","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"activityCollectionId","modelName":"activityCollectionId","remark":"活动ID","showInList":true,"showInForm":true,"formType":"number"},{"name":"activityCollection","modelName":"activityCollection","remark":"活动名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"material","modelName":"material","remark":"material","showInList":true,"showInForm":true,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.ActivityOrder"}

src/main/vue/src/router.js

@@ -470,6 +470,22 @@ const router = new Router({
                     meta: {
                        title: '活动收集',
                     },
+               },
+                {
+                    path: '/activityOrderEdit',
+                    name: 'ActivityOrderEdit',
+                    component: () => import(/* webpackChunkName: "activityOrderEdit" */ '@/views/ActivityOrderEdit.vue'),
+                    meta: {
+                       title: '收集记录编辑',
+                    },
+                },
+                {
+                    path: '/activityOrderList',
+                    name: 'ActivityOrderList',
+                    component: () => import(/* webpackChunkName: "activityOrderList" */ '@/views/ActivityOrderList.vue'),
+                    meta: {
+                       title: '收集记录',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/ActivityCollectionEdit.vue

@@ -29,6 +29,8 @@
                             filterable
                             :filter-method="filterCollection"
                             style="width: 100%"
+                            @change="changCollection"
+                            :disabled="!canEdit"
                         >
                             <el-option v-for="item in filterOptions" :label="item.name" :value="item.id" :key="item.id">
                                 <span style="float: left">{{ item.name }}</span>
@@ -37,13 +39,10 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item prop="num" label="兑换数量">
-                        <el-input-number type="number" v-model="formData.num"></el-input-number>
+                        <el-input-number type="number" v-model="formData.num" :disabled="!canEdit"></el-input-number>
                     </el-form-item>
-                    <!-- <el-form-item prop="stock" label="剩余数量">
-                        <el-input v-model="formData.stock"></el-input>
-                    </el-form-item> -->
                     <el-form-item prop="total" label="发行数量">
-                        <el-input-number type="number" v-model="formData.total"></el-input-number>
+                        <el-input-number type="number" v-model="formData.total" :disabled="!canEdit"></el-input-number>
                     </el-form-item>
                     <el-form-item prop="awardCollectionId" label="获得藏品">
                         <!-- <collection-search
@@ -55,6 +54,8 @@
                             filterable
                             :filter-method="filterCollection"
                             style="width: 100%"
+                            @change="changAwardCollection"
+                            :disabled="!canEdit"
                         >
                             <el-option v-for="item in filterOptions" :label="item.name" :value="item.id" :key="item.id">
                                 <span style="float: left">{{ item.name }}</span>
@@ -155,6 +156,11 @@ export default {
             filterOptions: []
         };
     },
+    computed: {
+        canEdit() {
+            return !!!this.$route.query.id;
+        }
+    },
     methods: {
         filterCollection(val) {
             this.filterOptions = this.options.filter(i => i.name.includes(val) || i.id == val);
@@ -200,8 +206,28 @@ export default {
                         this.$message.error((e || {}).error || '删除失败');
                     }
                 });
+        },
+        changAwardCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.awardCollectionName = data.name;
+            console.log(this.formData.awardCollectionName);
+        },
+        changCollection(row) {
+            let data = this.options.find(item => {
+                return item.id === row;
+            });
+            this.formData.collectionName = data.name;
         }
     }
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+/deep/.el-input.is-disabled .el-input__inner {
+    color: #7c7e7e;
+}
+/deep/.el-radio__input.is-disabled + span.el-radio__label {
+    color: #7c7e7e;
+}
+</style>

src/main/vue/src/views/ActivityOrderEdit.vue

@@ -0,0 +1,112 @@
+<template>
+    <div class="edit-view">
+        <page-title>
+            <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+            <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                删除
+            </el-button>
+            <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+        </page-title>
+        <div class="edit-view__content-wrapper">
+            <div class="edit-view__content-section">
+                <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="userId" label="用户ID">
+                                    <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="phone" label="手机号">
+                                    <el-input v-model="formData.phone"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="activityCollectionId" label="活动ID">
+                                    <el-input-number type="number" v-model="formData.activityCollectionId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="activityCollection" label="活动名称">
+                                    <el-input v-model="formData.activityCollection"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="material" label="material">
+                                    <el-input v-model="formData.material"></el-input>
+                        </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'ActivityOrderEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('activityOrder/get/' + this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/activityOrder/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$confirm('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/activityOrder/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/ActivityOrderList.vue

@@ -0,0 +1,175 @@
+<template>
+    <div  class="list-view">
+        <page-title>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+                新增
+            </el-button>
+            <el-button @click="download" icon="el-icon-upload2" :loading="downloading" :disabled="fetchingData" class="filter-item">
+                导出
+            </el-button>
+        </page-title>
+        <div class="filters-container">
+            <el-input
+                    placeholder="搜索..."
+                    v-model="search"
+                    clearable
+                    class="filter-item search"
+                    @keyup.enter.native="getData"
+            >
+                <el-button @click="getData" slot="append" icon="el-icon-search"> </el-button>
+            </el-input>
+        </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight" v-loading="fetchingData">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                                <el-table-column prop="userId" label="用户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="phone" label="手机号"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollectionId" label="活动ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="activityCollection" label="活动名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="material" label="material"
+>
+                    </el-table-column>
+            <el-table-column
+                    label="操作"
+                    align="center"
+                    fixed="right"
+                    width="150">
+                <template slot-scope="{row}">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'ActivityOrderList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/activityOrder/all",
+                downloading: false,
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+            beforeGetData() {
+                return { search: this.search, query: { del: false } };
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/activityOrderEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/activityOrder/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/activityOrder/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/test/java/com/izouma/nineth/repo/AirDropRepoTest.java

@@ -0,0 +1,17 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.ApplicationTests;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+public class AirDropRepoTest extends ApplicationTests {
+
+    @Autowired
+    private AirDropRepo airDropRepo;
+
+    @Test
+    public void test() {
+        System.out.println(airDropRepo.findAllByUserIdsAndName("7834", "邀请新人得空投奖励"));
+    }
+}