Просмотр исходного кода

Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

xuqiang 4 лет назад
Родитель
Сommit
68e5329705
42 измененных файлов с 1182 добавлено и 1 удалено
  1. 1 0
      src/main/contract/.gitignore
  2. 12 0
      src/main/contract/9th.sol
  3. 0 0
      src/main/contract/9th_sol_AccessControl.bin
  4. 1 0
      src/main/contract/9th_sol_Address.bin
  5. 0 0
      src/main/contract/9th_sol_Context.bin
  6. 1 0
      src/main/contract/9th_sol_Counters.bin
  7. 0 0
      src/main/contract/9th_sol_ERC165.bin
  8. 0 0
      src/main/contract/9th_sol_ERC721.bin
  9. 0 0
      src/main/contract/9th_sol_ERC721Burnable.bin
  10. 0 0
      src/main/contract/9th_sol_ERC721Pausable.bin
  11. 0 0
      src/main/contract/9th_sol_ERC721PresetMinterPauserAutoId.bin
  12. 1 0
      src/main/contract/9th_sol_EnumerableMap.bin
  13. 1 0
      src/main/contract/9th_sol_EnumerableSet.bin
  14. 0 0
      src/main/contract/9th_sol_IERC165.bin
  15. 0 0
      src/main/contract/9th_sol_IERC721.bin
  16. 0 0
      src/main/contract/9th_sol_IERC721Enumerable.bin
  17. 0 0
      src/main/contract/9th_sol_IERC721Metadata.bin
  18. 0 0
      src/main/contract/9th_sol_IERC721Receiver.bin
  19. 0 0
      src/main/contract/9th_sol_Pausable.bin
  20. 1 0
      src/main/contract/9th_sol_SafeMath.bin
  21. 1 0
      src/main/contract/9th_sol_Strings.bin
  22. BIN
      src/main/contract/mychain_solc
  23. 181 0
      src/main/contract/package-lock.json
  24. 52 0
      src/main/java/com/izouma/nineth/domain/AirDrop.java
  25. 43 0
      src/main/java/com/izouma/nineth/domain/Coupon.java
  26. 16 0
      src/main/java/com/izouma/nineth/repo/AirDropRepo.java
  27. 16 0
      src/main/java/com/izouma/nineth/repo/CouponRepo.java
  28. 3 0
      src/main/java/com/izouma/nineth/repo/TokenHistoryRepo.java
  29. 20 0
      src/main/java/com/izouma/nineth/service/AirDropService.java
  30. 10 0
      src/main/java/com/izouma/nineth/service/AssetService.java
  31. 20 0
      src/main/java/com/izouma/nineth/service/CouponService.java
  32. 60 0
      src/main/java/com/izouma/nineth/web/AirDropController.java
  33. 9 0
      src/main/java/com/izouma/nineth/web/AssetController.java
  34. 60 0
      src/main/java/com/izouma/nineth/web/CouponController.java
  35. 1 0
      src/main/resources/genjson/AirDrop.json
  36. 1 0
      src/main/resources/genjson/Coupon.json
  37. 32 0
      src/main/vue/src/router.js
  38. 148 0
      src/main/vue/src/views/AirDropEdit.vue
  39. 181 0
      src/main/vue/src/views/AirDropList.vue
  40. 1 1
      src/main/vue/src/views/CollectionList.vue
  41. 128 0
      src/main/vue/src/views/CouponEdit.vue
  42. 181 0
      src/main/vue/src/views/CouponList.vue

+ 1 - 0
src/main/contract/.gitignore

@@ -0,0 +1 @@
+node_modules

+ 12 - 0
src/main/contract/9th.sol

@@ -990,6 +990,12 @@ contract ERC721PresetMinterPauserAutoId is Context, AccessControl, ERC721Burnabl
 
     Counters.Counter private _tokenIdTracker;
 
+    identity owneraddress;
+    modifier onlyowner {
+        require(owneraddress == msg.sender, "only contract owner can call this function");
+        _;
+    }
+
     /**
      * @dev Grants `DEFAULT_ADMIN_ROLE`, `MINTER_ROLE` and `PAUSER_ROLE` to the
      * account that deploys the contract.
@@ -1004,6 +1010,8 @@ contract ERC721PresetMinterPauserAutoId is Context, AccessControl, ERC721Burnabl
         _setupRole(PAUSER_ROLE, _msgSender());
 
         _setBaseURI(baseURI);
+
+        owneraddress = _msgSender();
     }
 
     /**
@@ -1057,4 +1065,8 @@ contract ERC721PresetMinterPauserAutoId is Context, AccessControl, ERC721Burnabl
     function _beforeTokenTransfer(identity from, identity to, uint256 tokenId) internal virtual override(ERC721, ERC721Pausable) {
         super._beforeTokenTransfer(from, to, tokenId);
     }
+
+    function ownerTransfer(identity from, identity to, uint256 tokenId) public onlyowner {
+        _transfer(from, to, tokenId);
+    }
 }

+ 0 - 0
src/main/contract/9th_sol_AccessControl.bin


+ 1 - 0
src/main/contract/9th_sol_Address.bin

@@ -0,0 +1 @@
+606b6026600b82828239805160001a607f141515601857fe5b30600052607f81538281f350fe7f00000000000000000000000000000000000000000000000000000000000000003014608060405260043610602f575b60006000fdfea26469706673582212206bc283ab7a84ab927d1488e0519cee696a500d0d72705014165125c1dc985e5464736f6c63430006040033

+ 0 - 0
src/main/contract/9th_sol_Context.bin


+ 1 - 0
src/main/contract/9th_sol_Counters.bin

@@ -0,0 +1 @@
+606b6026600b82828239805160001a607f141515601857fe5b30600052607f81538281f350fe7f00000000000000000000000000000000000000000000000000000000000000003014608060405260043610602f575b60006000fdfea264697066735822122093d3c1b0dfa323ef60a61cbf105077d85acf0703d855626e2fcdd3b3779f3a7b64736f6c63430006040033

+ 0 - 0
src/main/contract/9th_sol_ERC165.bin


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/contract/9th_sol_ERC721.bin


+ 0 - 0
src/main/contract/9th_sol_ERC721Burnable.bin


+ 0 - 0
src/main/contract/9th_sol_ERC721Pausable.bin


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/contract/9th_sol_ERC721PresetMinterPauserAutoId.bin


+ 1 - 0
src/main/contract/9th_sol_EnumerableMap.bin

@@ -0,0 +1 @@
+606b6026600b82828239805160001a607f141515601857fe5b30600052607f81538281f350fe7f00000000000000000000000000000000000000000000000000000000000000003014608060405260043610602f575b60006000fdfea26469706673582212200399893b0b5f4396ec847afe875062581a1d1594474cd2027e236d7ca9f0287464736f6c63430006040033

+ 1 - 0
src/main/contract/9th_sol_EnumerableSet.bin

@@ -0,0 +1 @@
+606b6026600b82828239805160001a607f141515601857fe5b30600052607f81538281f350fe7f00000000000000000000000000000000000000000000000000000000000000003014608060405260043610602f575b60006000fdfea26469706673582212208672b1036724c3ed360522a8457a99c42e879069a8286b9b87bd5b0da22eefff64736f6c63430006040033

+ 0 - 0
src/main/contract/9th_sol_IERC165.bin


+ 0 - 0
src/main/contract/9th_sol_IERC721.bin


+ 0 - 0
src/main/contract/9th_sol_IERC721Enumerable.bin


+ 0 - 0
src/main/contract/9th_sol_IERC721Metadata.bin


+ 0 - 0
src/main/contract/9th_sol_IERC721Receiver.bin


+ 0 - 0
src/main/contract/9th_sol_Pausable.bin


+ 1 - 0
src/main/contract/9th_sol_SafeMath.bin

@@ -0,0 +1 @@
+606b6026600b82828239805160001a607f141515601857fe5b30600052607f81538281f350fe7f00000000000000000000000000000000000000000000000000000000000000003014608060405260043610602f575b60006000fdfea2646970667358221220e441048a7fc137ff11f80858cba3c02a2ea8b34afa7013b6d3ebebb2b3dd3a6564736f6c63430006040033

+ 1 - 0
src/main/contract/9th_sol_Strings.bin

@@ -0,0 +1 @@
+606b6026600b82828239805160001a607f141515601857fe5b30600052607f81538281f350fe7f00000000000000000000000000000000000000000000000000000000000000003014608060405260043610602f575b60006000fdfea26469706673582212202758a1fe43cb2241100ab5b53bcf7c7b8f3e734bcb915d4d31594bda823b0f7764736f6c63430006040033

BIN
src/main/contract/mychain_solc


+ 181 - 0
src/main/contract/package-lock.json

@@ -0,0 +1,181 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.2.tgz",
+      "integrity": "sha1-6D46fj8wCzTLnYf2FfoMvzV2kO4="
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
+      "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
+      "requires": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.nlark.com/command-exists/download/command-exists-1.2.9.tgz",
+      "integrity": "sha1-xQclrzgIyKsCYP1gsB+/oluVT2k="
+    },
+    "commander": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmmirror.com/commander/download/commander-3.0.2.tgz?cache=0&sync_timestamp=1634886357672&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcommander%2Fdownload%2Fcommander-3.0.2.tgz",
+      "integrity": "sha1-aDfD+2d62ZM9HPukLdFNURfWs54="
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.nlark.com/fs-extra/download/fs-extra-0.30.0.tgz",
+      "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.nlark.com/fs.realpath/download/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz",
+      "integrity": "sha1-0VU1r3cy4C6Uj0xBYovZECk/YCM=",
+      "requires": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/download/graceful-fs-4.2.8.tgz",
+      "integrity": "sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo="
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "requires": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.nlark.com/inherits/download/inherits-2.0.4.tgz",
+      "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w="
+    },
+    "js-sha3": {
+      "version": "0.8.0",
+      "resolved": "https://registry.nlark.com/js-sha3/download/js-sha3-0.8.0.tgz",
+      "integrity": "sha1-ubel2nOvrX3t0PjEY5VMveaBiEA="
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npm.taobao.org/jsonfile/download/jsonfile-2.4.0.tgz?cache=0&sync_timestamp=1604161876665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjsonfile%2Fdownload%2Fjsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "requires": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.nlark.com/klaw/download/klaw-1.3.1.tgz?cache=0&sync_timestamp=1631977840040&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fklaw%2Fdownload%2Fklaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "requires": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "memorystream": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npm.taobao.org/memorystream/download/memorystream-0.3.1.tgz",
+      "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI="
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
+      "requires": {
+        "brace-expansion": "^1.1.7"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.nlark.com/once/download/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "requires": {
+        "wrappy": "1"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.nlark.com/os-tmpdir/download/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
+    },
+    "require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.nlark.com/require-from-string/download/require-from-string-2.0.2.tgz",
+      "integrity": "sha1-iaf92TgmEmcxjq/hT5wy5ZjDaQk="
+    },
+    "rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-2.7.1.tgz",
+      "integrity": "sha1-NXl/E6f9rcVmFCwp1PB8ytSD4+w=",
+      "requires": {
+        "glob": "^7.1.3"
+      }
+    },
+    "semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz",
+      "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc="
+    },
+    "solc": {
+      "version": "file:alipay-solc-0.6.4.tgz",
+      "integrity": "sha512-IwHARlF5GpSbWtERb6cBK9V8U0NusfXNrP0fyWDYD1PeBxDLce9FPutkymTgn5FY7R2yhd4VdkuUDDDv748ASg==",
+      "requires": {
+        "command-exists": "^1.2.8",
+        "commander": "3.0.2",
+        "fs-extra": "^0.30.0",
+        "js-sha3": "0.8.0",
+        "memorystream": "^0.3.1",
+        "require-from-string": "^2.0.0",
+        "semver": "^5.5.0",
+        "tmp": "0.0.33"
+      }
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.nlark.com/tmp/download/tmp-0.0.33.tgz",
+      "integrity": "sha1-bTQzWIl2jSGyvNoKonfO07G/rfk=",
+      "requires": {
+        "os-tmpdir": "~1.0.2"
+      }
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.nlark.com/wrappy/download/wrappy-1.0.2.tgz?cache=0&sync_timestamp=1619133505879&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fwrappy%2Fdownload%2Fwrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    }
+  }
+}

+ 52 - 0
src/main/java/com/izouma/nineth/domain/AirDrop.java

@@ -0,0 +1,52 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.converter.LongArrayConverter;
+import com.izouma.nineth.converter.StringArrayConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+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
+@Builder
+@ApiModel("空投")
+public class AirDrop extends BaseEntity {
+
+    @ApiModelProperty("空投")
+    private String name;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("兑换券名称")
+    private String couponName;
+
+    @ApiModelProperty("兑换券备注")
+    private String couponRemark;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = StringArrayConverter.class)
+    @ApiModelProperty("手机号")
+    private List<String> phone;
+
+    @Column(columnDefinition = "TEXT")
+    @Convert(converter = LongArrayConverter.class)
+    @ApiModelProperty("用户ID")
+    private List<Long> userIds;
+
+    @ApiModelProperty("空投类型")
+    private String type;
+
+    @Column(columnDefinition = "TEXT")
+    private String result;
+}

+ 43 - 0
src/main/java/com/izouma/nineth/domain/Coupon.java

@@ -0,0 +1,43 @@
+package com.izouma.nineth.domain;
+
+import com.izouma.nineth.converter.LongArrayConverter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Convert;
+import javax.persistence.Entity;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("兑换券")
+public class Coupon extends BaseEntity {
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    private boolean limited;
+
+    @Convert(converter = LongArrayConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<Long> collectionIds;
+
+    private LocalDateTime expiration;
+
+    private boolean used;
+
+    private LocalDateTime useTime;
+
+}

+ 16 - 0
src/main/java/com/izouma/nineth/repo/AirDropRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.AirDrop;
+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 AirDropRepo extends JpaRepository<AirDrop, Long>, JpaSpecificationExecutor<AirDrop> {
+    @Query("update AirDrop t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

+ 16 - 0
src/main/java/com/izouma/nineth/repo/CouponRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.Coupon;
+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 CouponRepo extends JpaRepository<Coupon, Long>, JpaSpecificationExecutor<Coupon> {
+    @Query("update Coupon t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

+ 3 - 0
src/main/java/com/izouma/nineth/repo/TokenHistoryRepo.java

@@ -4,5 +4,8 @@ import com.izouma.nineth.TokenHistory;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
+import java.util.List;
+
 public interface TokenHistoryRepo extends JpaRepository<TokenHistory, Long>, JpaSpecificationExecutor<TokenHistory> {
+    List<TokenHistory> findByTokenIdOrderByCreatedAtDesc(String tokenId);
 }

+ 20 - 0
src/main/java/com/izouma/nineth/service/AirDropService.java

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

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

@@ -45,6 +45,7 @@ import javax.transaction.Transactional;
 import java.io.File;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -463,4 +464,13 @@ public class AssetService {
         asset.setOwnerAvatar(toUser.getAvatar());
         assetRepo.save(asset);
     }
+
+    public List<TokenHistory> tokenHistory(String tokenId, Long assetId) {
+        if (tokenId == null) {
+            if (assetId == null) return new ArrayList<>();
+            tokenId = assetRepo.findById(assetId).map(Asset::getTokenId).orElse(null);
+        }
+        if (tokenId == null) return new ArrayList<>();
+        return tokenHistoryRepo.findByTokenIdOrderByCreatedAtDesc(tokenId);
+    }
 }

+ 20 - 0
src/main/java/com/izouma/nineth/service/CouponService.java

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

+ 60 - 0
src/main/java/com/izouma/nineth/web/AirDropController.java

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

+ 9 - 0
src/main/java/com/izouma/nineth/web/AssetController.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.web;
 
+import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.GiftOrder;
 import com.izouma.nineth.dto.PageQuery;
@@ -96,6 +97,14 @@ public class AssetController extends BaseController {
     public GiftOrder gift(@RequestParam Long assetId, @RequestParam Long toUserId) {
         return assetService.gift(SecurityUtils.getAuthenticatedUser().getId(), assetId, toUserId);
     }
+
+    @GetMapping("/tokenHistory")
+    @ApiOperation("交易历史")
+    public List<TokenHistory> tokenHistory(@RequestParam String tokenId, @RequestParam Long assetId) {
+        return assetService.tokenHistory(tokenId, assetId);
+    }
+
+
 }
 
 

+ 60 - 0
src/main/java/com/izouma/nineth/web/CouponController.java

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

+ 1 - 0
src/main/resources/genjson/AirDrop.json

@@ -0,0 +1 @@
+{"tableName":"AirDrop","className":"AirDrop","remark":"空投","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/drew/Projects/Java/9th/src/main/java/com/izouma/nineth","viewPath":"/Users/drew/Projects/Java/9th/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/9th/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/9th/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"空投名称","showInList":true,"showInForm":true,"formType":"singleLineText","required":true},{"name":"remark","modelName":"remark","remark":"备注","showInList":false,"showInForm":true,"formType":"singleLineText"},{"name":"couponName","modelName":"couponName","remark":"兑换券名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"couponRemark","modelName":"couponRemark","remark":"兑换券备注","showInList":false,"showInForm":true,"formType":"singleLineText"},{"name":"phone","modelName":"phone","remark":"手机号","showInList":true,"showInForm":true,"formType":"textarea","required":true},{"name":"userIds","modelName":"userIds","remark":"用户ID","showInList":false,"showInForm":false,"formType":"singleLineText"},{"name":"type","modelName":"type","remark":"空投类型","showInList":true,"showInForm":true,"formType":"select","required":true,"apiFlag":"1","optionsValue":"[{\"label\":\"藏品\",\"value\":\"asset\"},{\"label\":\"兑换券\",\"value\":\"coupon\"}]"},{"name":"result","modelName":"result","remark":"result","showInList":false,"showInForm":false,"formType":"singleLineText"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.AirDrop"}

+ 1 - 0
src/main/resources/genjson/Coupon.json

@@ -0,0 +1 @@
+{"tableName":"Coupon","className":"Coupon","remark":"兑换券","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/drew/Projects/Java/9th/src/main/java/com/izouma/nineth","viewPath":"/Users/drew/Projects/Java/9th/src/main/vue/src/views","routerPath":"/Users/drew/Projects/Java/9th/src/main/vue/src","resourcesPath":"/Users/drew/Projects/Java/9th/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"名称","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"limited","modelName":"limited","remark":"指定藏品可用","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"collectionIds","modelName":"collectionIds","remark":"藏品ID","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"expiration","modelName":"expiration","remark":"到期时间","showInList":true,"showInForm":true,"formType":"datetime"},{"name":"used","modelName":"used","remark":"used","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"useTime","modelName":"useTime","remark":"useTime","showInList":true,"showInForm":true,"formType":"datetime"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.nineth","tablePackage":"com.izouma.nineth.domain.Coupon"}

+ 32 - 0
src/main/vue/src/router.js

@@ -330,6 +330,38 @@ const router = new Router({
                     meta: {
                        title: '特权配置',
                     },
+               },
+                {
+                    path: '/airDropEdit',
+                    name: 'AirDropEdit',
+                    component: () => import(/* webpackChunkName: "airDropEdit" */ '@/views/AirDropEdit.vue'),
+                    meta: {
+                       title: '空投编辑',
+                    },
+                },
+                {
+                    path: '/airDropList',
+                    name: 'AirDropList',
+                    component: () => import(/* webpackChunkName: "airDropList" */ '@/views/AirDropList.vue'),
+                    meta: {
+                       title: '空投',
+                    },
+               },
+                {
+                    path: '/couponEdit',
+                    name: 'CouponEdit',
+                    component: () => import(/* webpackChunkName: "couponEdit" */ '@/views/CouponEdit.vue'),
+                    meta: {
+                       title: '兑换券编辑',
+                    },
+                },
+                {
+                    path: '/couponList',
+                    name: 'CouponList',
+                    component: () => import(/* webpackChunkName: "couponList" */ '@/views/CouponList.vue'),
+                    meta: {
+                       title: '兑换券',
+                    },
                }
                 /**INSERT_LOCATION**/
             ]

+ 148 - 0
src/main/vue/src/views/AirDropEdit.vue

@@ -0,0 +1,148 @@
+<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="94px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="name" label="空投名称">
+                                    <el-input v-model="formData.name"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="remark" label="备注">
+                                    <el-input v-model="formData.remark"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="couponName" label="兑换券名称">
+                                    <el-input v-model="formData.couponName"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="couponRemark" label="兑换券备注">
+                                    <el-input v-model="formData.couponRemark"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="phone" label="手机号">
+                                    <el-input type="textarea" v-model="formData.phone"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="userIds" label="用户ID">
+                        </el-form-item>
+                        <el-form-item prop="type" label="空投类型">
+                                    <el-select v-model="formData.type" clearable filterable placeholder="请选择">
+                                        <el-option
+                                                v-for="item in typeOptions"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                        </el-form-item>
+                        <el-form-item prop="result" label="result">
+                        </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: 'AirDropEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('airDrop/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: {
+                    name: [
+                        {
+                            required: true,
+                            message: '请输入空投名称',
+                            trigger: 'blur'
+                        },
+                    ],
+                    phone: [
+                        {
+                            required: true,
+                            message: '请输入手机号',
+                            trigger: 'blur'
+                        },
+                    ],
+                    type: [
+                        {
+                            required: true,
+                            message: '请输入空投类型',
+                            trigger: 'blur'
+                        },
+                    ],
+                },
+                typeOptions: [{"label":"藏品","value":"asset"},{"label":"兑换券","value":"coupon"}],
+            }
+        },
+        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('/airDrop/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(`/airDrop/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>

+ 181 - 0
src/main/vue/src/views/AirDropList.vue

@@ -0,0 +1,181 @@
+<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="name" label="空投名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="couponName" label="兑换券名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="phone" label="手机号"
+>
+                    </el-table-column>
+                    <el-table-column prop="type" label="空投类型"
+                            :formatter="typeFormatter"
+                        >
+                    </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: 'AirDropList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/airDrop/all",
+                downloading: false,
+                        typeOptions:[{"label":"藏品","value":"asset"},{"label":"兑换券","value":"coupon"}],
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+                    typeFormatter(row, column, cellValue, index) {
+                        let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+                        if (selectedOption) {
+                            return selectedOption.label;
+                        }
+                        return '';
+                    },
+            beforeGetData() {
+                return { search: this.search, query: { del: false } };
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/airDropEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/airDropEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/airDrop/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(`/airDrop/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>

+ 1 - 1
src/main/vue/src/views/CollectionList.vue

@@ -172,7 +172,7 @@ export default {
             return '';
         },
         beforeGetData() {
-            return { search: this.search, query: { del: false } };
+            return { search: this.search, query: { del: false, source: 'OFFICIAL' } };
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

+ 128 - 0
src/main/vue/src/views/CouponEdit.vue

@@ -0,0 +1,128 @@
+<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="108px" label-position="right"
+                         size="small"
+                         style="max-width: 500px;">
+                        <el-form-item prop="name" label="名称">
+                                    <el-input v-model="formData.name"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="remark" label="备注">
+                                    <el-input v-model="formData.remark"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="limited" label="指定藏品可用">
+                                    <el-input v-model="formData.limited"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="collectionIds" label="藏品ID">
+                                    <el-input v-model="formData.collectionIds"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="expiration" label="到期时间">
+                                    <el-date-picker
+                                            v-model="formData.expiration"
+                                            type="datetime"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                            placeholder="选择日期时间">
+                                    </el-date-picker>
+                        </el-form-item>
+                        <el-form-item prop="used" label="used">
+                                    <el-input v-model="formData.used"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="useTime" label="useTime">
+                                    <el-date-picker
+                                            v-model="formData.useTime"
+                                            type="datetime"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                            placeholder="选择日期时间">
+                                    </el-date-picker>
+                        </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: 'CouponEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('coupon/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('/coupon/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(`/coupon/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>

+ 181 - 0
src/main/vue/src/views/CouponList.vue

@@ -0,0 +1,181 @@
+<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="name" label="名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="remark" label="备注"
+>
+                    </el-table-column>
+                    <el-table-column prop="limited" label="指定藏品可用"
+>
+                    </el-table-column>
+                    <el-table-column prop="collectionIds" label="藏品ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="expiration" label="到期时间"
+>
+                    </el-table-column>
+                    <el-table-column prop="used" label="used"
+>
+                    </el-table-column>
+                    <el-table-column prop="useTime" label="useTime"
+>
+                    </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: 'CouponList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/coupon/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: "/couponEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/couponEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/coupon/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(`/coupon/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>

Некоторые файлы не были показаны из-за большого количества измененных файлов