Merge remote-tracking branch 'origin/master'

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

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.List;
 
 
@@ -41,7 +42,7 @@ public class Asset extends BaseEntity {
     private Long minterId;
 
     @ApiModelProperty("铸造者头像")
-    private Long minterAvatar;
+    private String minterAvatar;
 
     @ApiModelProperty("图片")
     @Convert(converter = StringArrayConverter.class)
@@ -54,8 +55,11 @@ public class Asset extends BaseEntity {
     @ApiModelProperty("购买hash")
     private String txHash;
 
+    @ApiModelProperty("消耗gas")
+    private BigInteger gasUsed;
+
     @ApiModelProperty("区块高度")
-    private String blockHeight;
+    private BigInteger blockNumber;
 
     @ApiModelProperty("购买hash")
     private String ipfsUrl;

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

@@ -13,6 +13,7 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -83,11 +84,14 @@ public class Order extends BaseEntity {
     @ApiModelProperty("支付时间")
     private LocalDateTime payTime;
 
-    @ApiModelProperty("链上hash")
+    @ApiModelProperty("交易hash")
     private String txHash;
 
     @ApiModelProperty("消耗gas")
-    private int gas;
+    private BigInteger gasUsed;
+
+    @ApiModelProperty("区块高度")
+    private BigInteger blockNumber;
 
     @ApiModelProperty("收货人")
     private String contactName;

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

@@ -75,6 +75,8 @@ public class User extends BaseEntity implements Serializable {
 
     private int followers;
 
+    private int sales;
+
     private String intro;
 
     private String bg;

src/main/java/com/izouma/nineth/dto/CollectionDTO.java

@@ -0,0 +1,9 @@
+package com.izouma.nineth.dto;
+
+import com.izouma.nineth.domain.Collection;
+import lombok.Data;
+
+@Data
+public class CollectionDTO extends Collection {
+    private boolean liked;
+}

src/main/java/com/izouma/nineth/dto/Minter.java

@@ -0,0 +1,34 @@
+package com.izouma.nineth.dto;
+
+import com.alibaba.fastjson.JSON;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.persistence.AttributeConverter;
+
+@AllArgsConstructor
+@Builder
+public class Minter {
+    private Long   id;
+    private String name;
+    private String avatar;
+    private String account;
+
+    public class MinterConverter implements AttributeConverter<Minter, String> {
+
+        @Override
+        public String convertToDatabaseColumn(Minter minter) {
+            if (minter == null) return null;
+            return JSON.toJSONString(minter);
+        }
+
+        @Override
+        public Minter convertToEntityAttribute(String s) {
+            if (StringUtils.isEmpty(s)) {
+                return null;
+            }
+            return JSON.parseObject(s, Minter.class);
+        }
+    }
+}

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

@@ -16,4 +16,10 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
     void softDelete(Long id);
 
     Optional<Collection> findByIdAndDelFalse(Long id);
+
+    @Query("update Collection t set t.likes = t.likes + ?2 where t.id = ?1")
+    @Modifying
+    @Transactional
+    void addLike(Long id, int num);
+
 }

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

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface FollowRepo extends JpaRepository<Follow, Long>, JpaSpecificationExecutor<Follow> {
     @Query("update Follow t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<Follow> findByUserIdAndFollowUserId(Long userId, Long to);
 }

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

@@ -7,10 +7,13 @@ import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import javax.transaction.Transactional;
+import java.util.List;
 
 public interface LikeRepo extends JpaRepository<Like, Long>, JpaSpecificationExecutor<Like> {
     @Query("update Like t set t.del = true where t.id = ?1")
     @Modifying
     @Transactional
     void softDelete(Long id);
+
+    List<Like> findByUserIdAndCollectionId(Long userId, Long collectionId);
 }

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

@@ -26,4 +26,9 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
     Optional<User> findByPhoneAndDelFalse(String phone);
 
     Optional<User> findByIdAndDelFalse(Long userId);
+
+    @Transactional
+    @Modifying
+    @Query("update User u set u.followers = u.followers + ?1 where u.id = ?1")
+    void addFollow(Long userId, int num);
 }

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

@@ -62,7 +62,6 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 //swagger-ui放行路径
                 .antMatchers("/v2/api-docs", "/swagger-ui.html", "/swagger-resources/**", "/webjars/**").permitAll()
                 .antMatchers("/user/register").permitAll()
-                .antMatchers("/user/registerByPhone").permitAll()
                 .antMatchers("/upload/**").permitAll()
                 .antMatchers("/files/**").permitAll()
                 .antMatchers("/static/**").permitAll()

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

@@ -3,13 +3,16 @@ package com.izouma.nineth.service;
 import com.izouma.nineth.domain.Asset;
 import com.izouma.nineth.domain.Order;
 import com.izouma.nineth.domain.User;
+import com.izouma.nineth.dto.NFT;
 import com.izouma.nineth.dto.NFTAccount;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.AssetStatus;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Page;
 import org.springframework.scheduling.annotation.Async;
@@ -17,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 @Service
 @AllArgsConstructor
+@Slf4j
 public class AssetService {
 
     private AssetRepo  assetRepo;
@@ -28,7 +32,7 @@ public class AssetService {
     }
 
     @Async
-    public void createAsset(Order order) {
+    public Asset createAsset(Order order) throws Exception {
         User user = userRepo.findById(order.getUserId()).orElseThrow(new BusinessException("用户不存在"));
         if (StringUtils.isEmpty(user.getPublicKey())) {
             NFTAccount account = nftService.createAccount(user.getUsername());
@@ -38,5 +42,25 @@ public class AssetService {
             userRepo.save(user);
         }
 
+        NFT nft = nftService.createToken(user.getNftAccount());
+        if (nft != null) {
+            Asset asset = Asset.builder()
+                    .userId(user.getId())
+                    .orderId(order.getId())
+                    .minter(order.getMinter())
+                    .minterId(order.getMinterId())
+                    .minterAvatar(order.getMinterAvatar())
+                    .pic(order.getPic())
+                    .tokenId(nft.getTokenId())
+                    .blockNumber(nft.getBlockNumber())
+                    .txHash(nft.getTxHash())
+                    .gasUsed(nft.getGasUsed())
+                    .price(order.getPrice())
+                    .status(AssetStatus.NORMAL)
+                    .build();
+            assetRepo.save(asset);
+            return asset;
+        }
+        throw new BusinessException("创建asset失败");
     }
 }

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

@@ -3,18 +3,41 @@ package com.izouma.nineth.service;
 import com.izouma.nineth.domain.Follow;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.repo.FollowRepo;
+import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
+import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class FollowService {
 
     private FollowRepo followRepo;
+    private UserRepo   userRepo;
 
     public Page<Follow> all(PageQuery pageQuery) {
         return followRepo.findAll(JpaUtils.toSpecification(pageQuery, Follow.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    public void follow(Long userId, Long to) {
+        List<Follow> list = followRepo.findByUserIdAndFollowUserId(userId, to);
+        if (!list.isEmpty()) return;
+        followRepo.save(Follow.builder()
+                .userId(userId)
+                .followUserId(to)
+                .build());
+        userRepo.addFollow(to, 1);
+    }
+
+    public void unfollow(Long userId, Long to) {
+        List<Follow> list = followRepo.findByUserIdAndFollowUserId(userId, to);
+        if (!list.isEmpty()) {
+            followRepo.deleteAll(list);
+            userRepo.addFollow(to, -list.size());
+        }
+    }
 }

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

@@ -2,19 +2,41 @@ package com.izouma.nineth.service;
 
 import com.izouma.nineth.domain.Like;
 import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.repo.CollectionRepo;
 import com.izouma.nineth.repo.LikeRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 @AllArgsConstructor
 public class LikeService {
 
-    private LikeRepo likeRepo;
+    private LikeRepo       likeRepo;
+    private CollectionRepo collectionRepo;
 
     public Page<Like> all(PageQuery pageQuery) {
         return likeRepo.findAll(JpaUtils.toSpecification(pageQuery, Like.class), JpaUtils.toPageRequest(pageQuery));
     }
+
+    public void like(Long userId, Long collectionId) {
+        List<Like> list = likeRepo.findByUserIdAndCollectionId(userId, collectionId);
+        if (!list.isEmpty()) return;
+        likeRepo.save(Like.builder()
+                .userId(userId)
+                .collectionId(collectionId)
+                .build());
+        collectionRepo.addLike(collectionId, 1);
+    }
+
+    public void unlike(Long userId, Long collectionId) {
+        List<Like> list = likeRepo.findByUserIdAndCollectionId(userId, collectionId);
+        if (!list.isEmpty()) {
+            likeRepo.deleteAll(list);
+            collectionRepo.addLike(collectionId, -list.size());
+        }
+    }
 }

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

@@ -96,6 +96,6 @@ public class NFTService {
             // 异步交易未成功需要根据状态码判断交易状态
             log.error("EVM合约执行未成功: " + resp.getCode());
         }
-        return null;
+        throw new BusinessException("创建nft失败");
     }
 }

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

@@ -6,10 +6,7 @@ import com.alipay.api.AlipayApiException;
 import com.alipay.api.AlipayClient;
 import com.alipay.api.request.AlipayTradeWapPayRequest;
 import com.izouma.nineth.config.AlipayProperties;
-import com.izouma.nineth.domain.Collection;
-import com.izouma.nineth.domain.Order;
-import com.izouma.nineth.domain.User;
-import com.izouma.nineth.domain.UserAddress;
+import com.izouma.nineth.domain.*;
 import com.izouma.nineth.dto.NFTAccount;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.enums.OrderStatus;
@@ -22,6 +19,7 @@ import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.utils.JpaUtils;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.core.env.Environment;
 import org.springframework.data.domain.Page;
@@ -38,6 +36,7 @@ import java.util.UUID;
 
 @Service
 @AllArgsConstructor
+@Slf4j
 public class OrderService {
 
     private OrderRepo        orderRepo;
@@ -58,6 +57,7 @@ public class OrderService {
         if (qty <= 0) throw new BusinessException("数量必须大于0");
         User user = userRepo.findByIdAndDelFalse(userId).orElseThrow(new BusinessException("用户不存在"));
         Collection collection = collectionRepo.findById(collectionId).orElseThrow(new BusinessException("藏品不存在"));
+        User minter = userRepo.findById(collection.getMinterId()).orElseThrow(new BusinessException("铸造者不存在"));
 
         if (!collection.isOnShelf()) {
             throw new BusinessException("藏品已下架");
@@ -74,14 +74,15 @@ public class OrderService {
         collection.setSale(collection.getSale() + qty);
         collectionRepo.save(collection);
 
-        User minter = userRepo.findById(collection.getMinterId()).orElse(null);
+        minter.setSales(minter.getSales() + 1);
+
         Order order = Order.builder()
                 .userId(userId)
                 .collectionId(collectionId)
                 .name(collection.getName())
                 .pic(collection.getPics())
-                .minter(Optional.ofNullable(minter).map(User::getNickname).orElse(collection.getMinter()))
-                .minterAvatar(Optional.ofNullable(minter).map(User::getAvatar).orElse(collection.getMinterAvatar()))
+                .minter(minter.getNickname())
+                .minterAvatar(minter.getAvatar())
                 .qty(qty)
                 .price(collection.getPrice())
                 .gasPrice(BigDecimal.valueOf(1))
@@ -148,12 +149,25 @@ public class OrderService {
     public void notifyAlipay(Long orderId, Map<String, String> params) {
         Order order = orderRepo.findById(orderId).orElseThrow(new BusinessException("订单不存在"));
         if (order.getStatus() == OrderStatus.NOT_PAID) {
-            order.setStatus(OrderStatus.PROCESSING);
-            order.setPayTime(LocalDateTime.now());
-            order.setTransactionId(MapUtils.getString(params, "trade_no"));
-            order.setPayMethod(PayMethod.ALIPAY);
-            orderRepo.save(order);
-            assetService.createAsset(order);
+            Asset asset = null;
+            try {
+                asset = assetService.createAsset(order);
+                order.setStatus(OrderStatus.PROCESSING);
+                order.setPayTime(LocalDateTime.now());
+                order.setTransactionId(MapUtils.getString(params, "trade_no"));
+                order.setPayMethod(PayMethod.ALIPAY);
+                orderRepo.save(order);
+
+                if (asset != null) {
+                    order.setTxHash(asset.getTxHash());
+                    order.setGasUsed(asset.getGasUsed());
+                    order.setBlockNumber(asset.getBlockNumber());
+                    order.setStatus(OrderStatus.FINISH);
+                    orderRepo.save(order);
+                }
+            } catch (Exception e) {
+                log.error("支付宝回调出错", e);
+            }
         }
     }
 }

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

@@ -72,6 +72,18 @@ public class UserService {
         return userRepo.save(user);
     }
 
+    public User phoneRegister(String phone, String code, String password) {
+        String name = "9th_" + RandomStringUtils.randomAlphabetic(8);
+        User user = create(UserRegister.builder()
+                .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
+                .username(name)
+                .nickname(name)
+                .avatar(Constants.DEFAULT_AVATAR)
+                .phone(phone)
+                .build());
+        return user;
+    }
+
     public void del(Long id) {
         User user = userRepo.findById(id).orElseThrow(new BusinessException("用户不存在"));
         user.setDel(true);
@@ -240,4 +252,5 @@ public class UserService {
         user.setPhone(phone);
         userRepo.save(user);
     }
+
 }

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

@@ -63,6 +63,13 @@ public class AuthenticationController {
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }
 
+    @PostMapping("/phoneRegister")
+    @ApiOperation(value = "手机号密码注册")
+    public String phonePwdLogin(String phone, String code, String password) {
+        User user = userService.phoneRegister(phone, code, password);
+        return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
+    }
+
     @PostMapping("/mpLogin")
     @ApiOperation(value = "公众号登录")
     public String mpLogin(String code) {

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

@@ -1,11 +1,15 @@
 package com.izouma.nineth.web;
+
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.service.CollectionService;
 import com.izouma.nineth.dto.PageQuery;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.CollectionRepo;
+import com.izouma.nineth.service.LikeService;
 import com.izouma.nineth.utils.ObjUtils;
+import com.izouma.nineth.utils.SecurityUtils;
 import com.izouma.nineth.utils.excel.ExcelUtils;
+import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +24,8 @@ import java.util.List;
 @AllArgsConstructor
 public class CollectionController extends BaseController {
     private CollectionService collectionService;
-    private CollectionRepo collectionRepo;
+    private CollectionRepo    collectionRepo;
+    private LikeService       likeService;
 
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/save")
@@ -56,5 +61,17 @@ public class CollectionController extends BaseController {
         List<Collection> data = all(pageQuery).getContent();
         ExcelUtils.export(response, data);
     }
+
+    @GetMapping("/{id}/like")
+    @ApiOperation("点赞")
+    public void like(@PathVariable Long id) {
+        likeService.like(SecurityUtils.getAuthenticatedUser().getId(), id);
+    }
+
+    @GetMapping("/{id}/unlike")
+    @ApiOperation("取消点赞")
+    public void unlike(@PathVariable Long id) {
+        likeService.unlike(SecurityUtils.getAuthenticatedUser().getId(), id);
+    }
 }
 

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

@@ -33,7 +33,6 @@ public class LikeController extends BaseController {
         return likeRepo.save(record);
     }
 
-
     //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<Like> all(@RequestBody PageQuery pageQuery) {

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

@@ -9,6 +9,7 @@ import com.izouma.nineth.repo.UserRepo;
 import com.izouma.nineth.security.Authority;
 import com.izouma.nineth.security.JwtTokenUtil;
 import com.izouma.nineth.security.JwtUserFactory;
+import com.izouma.nineth.service.FollowService;
 import com.izouma.nineth.service.UserService;
 import com.izouma.nineth.utils.ObjUtils;
 import com.izouma.nineth.utils.SecurityUtils;
@@ -32,6 +33,7 @@ public class UserController extends BaseController {
     private UserRepo     userRepo;
     private UserService  userService;
     private JwtTokenUtil jwtTokenUtil;
+    private FollowService followService;
 
     @PostMapping("/register")
     public User register(@RequestParam String username,
@@ -45,19 +47,6 @@ public class UserController extends BaseController {
         return userService.create(user);
     }
 
-    @PostMapping("/registerByPhone")
-    public User registerByPhone(@RequestParam String phone,
-                         @RequestParam String password) {
-        UserRegister user = UserRegister.builder()
-                .username("用户"+phone)
-                .nickname("用户"+phone)
-                .phone(phone)
-                .password(new BCryptPasswordEncoder().encode(password))
-                .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
-                .build();
-        return userService.create(user);
-    }
-
     @PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/create")
     public User create(@RequestBody UserRegister userRegister) {
@@ -145,4 +134,17 @@ public class UserController extends BaseController {
     public void bindPhone(@RequestParam String phone) {
         userService.bindPhone(SecurityUtils.getAuthenticatedUser().getId(), phone);
     }
+
+    @GetMapping("/{id}/follow")
+    public void follow(@PathVariable Long id) {
+        followService.follow(SecurityUtils.getAuthenticatedUser().getId(), id);
+    }
+
+    @GetMapping("/{id}/unfollow")
+    public void unfollow(@PathVariable Long id) {
+        followService.unfollow(SecurityUtils.getAuthenticatedUser().getId(), id);
+    }
+
 }
+
+

src/main/resources/application.yaml

@@ -127,5 +127,5 @@ spring:
 spring:
   profiles: prod
   datasource:
-    url: jdbc:mysql://mysql.izouma.com/nineth?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+    url: jdbc:mysql://mysql.izouma.com/nineth_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
 

src/main/vue/src/views/OrderList.vue

@@ -1,92 +1,75 @@
 <template>
-    <div  class="list-view">
+    <div class="list-view">
         <page-title>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" :disabled="fetchingData || downloading" class="filter-item">
+            <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
+                @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"
+                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
+            :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="collectionId" label="藏品ID"> </el-table-column>
+            <el-table-column prop="qty" label="数量"> </el-table-column>
+            <el-table-column prop="name" label="名称"> </el-table-column>
+            <el-table-column prop="pic" label="图片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.pic[0]"
+                        fit="cover"
+                        :preview-src-list="row.pic"
+                    ></el-image>
+                </template>
             </el-table-column>
-                                <el-table-column prop="userId" label="用户ID"
->
-                    </el-table-column>
-                    <el-table-column prop="collectionId" label="藏品ID"
->
-                    </el-table-column>
-                    <el-table-column prop="qty" label="数量"
->
-                    </el-table-column>
-                    <el-table-column prop="name" label="名称"
->
-                    </el-table-column>
-                    <el-table-column prop="pic" label="图片"
->
-                            <template slot-scope="{row}">
-                                <el-image style="width: 30px; height: 30px"
-                                          :src="row.pic[0]" fit="cover"
-                                          :preview-src-list="row.pic"></el-image>
-                            </template>
-                    </el-table-column>
-                    <el-table-column prop="minter" label="铸造者"
->
-                    </el-table-column>
-                    <el-table-column prop="price" label="价格"
->
-                    </el-table-column>
-                    <el-table-column prop="gasPrice" label="gas费"
->
-                    </el-table-column>
-                    <el-table-column prop="totalPrice" label="总价"
->
-                    </el-table-column>
-                    <el-table-column prop="status" label="状态"
-                            :formatter="statusFormatter"
-                        >
-                    </el-table-column>
-                    <el-table-column prop="payMethod" label="支付方式"
-                            :formatter="payMethodFormatter"
-                        >
-                    </el-table-column>
-                    <el-table-column prop="transactionId" label="交易ID"
->
-                    </el-table-column>
-                    <el-table-column prop="payTime" label="支付时间"
->
-                    </el-table-column>
-                    <el-table-column prop="txHash" label="链上hash"
->
-                    </el-table-column>
-                    <el-table-column prop="gas" label="消耗gas"
->
-                    </el-table-column>
-            <el-table-column
-                    label="操作"
-                    align="center"
-                    fixed="right"
-                    width="150">
-                <template slot-scope="{row}">
+            <el-table-column prop="minter" label="铸造者"> </el-table-column>
+            <el-table-column prop="price" label="价格"> </el-table-column>
+            <el-table-column prop="gasPrice" label="gas费"> </el-table-column>
+            <el-table-column prop="totalPrice" label="总价"> </el-table-column>
+            <el-table-column prop="status" label="状态" :formatter="statusFormatter"> </el-table-column>
+            <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
+            <el-table-column prop="transactionId" label="交易ID"> </el-table-column>
+            <el-table-column prop="payTime" label="支付时间"> </el-table-column>
+            <el-table-column prop="txHash" label="链上hash"> </el-table-column>
+            <el-table-column prop="gasUsed" label="消耗gas"> </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>
@@ -101,128 +84,140 @@
                     <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
+                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";
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
 
-    export default {
-        name: 'OrderList',
-        mixins: [pageableTable],
-        data() {
-            return {
-                multipleMode: false,
-                search: "",
-                url: "/order/all",
-                downloading: false,
-                        statusOptions:[{"label":"未支付","value":"NOT_PAID"},{"label":"已支付，处理中","value":"PROCESSING"},{"label":"已完成","value":"FINISH"},{"label":"已取消","value":"CANCELLED"}],
-                        payMethodOptions:[{"label":"微信","value":"WEIXIN"},{"label":"支付宝","value":"ALIPAY"}],
+export default {
+    name: 'OrderList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/order/all',
+            downloading: false,
+            statusOptions: [
+                { label: '未支付', value: 'NOT_PAID' },
+                { label: '已支付，处理中', value: 'PROCESSING' },
+                { label: '已完成', value: 'FINISH' },
+                { label: '已取消', value: 'CANCELLED' }
+            ],
+            payMethodOptions: [
+                { label: '微信', value: 'WEIXIN' },
+                { label: '支付宝', value: 'ALIPAY' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        statusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.statusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
             }
+            return '';
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        payMethodFormatter(row, column, cellValue, index) {
+            let selectedOption = this.payMethodOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
             }
+            return '';
         },
-        methods: {
-                    statusFormatter(row, column, cellValue, index) {
-                        let selectedOption = this.statusOptions.find(i => i.value === cellValue);
-                        if (selectedOption) {
-                            return selectedOption.label;
-                        }
-                        return '';
-                    },
-                    payMethodFormatter(row, column, cellValue, index) {
-                        let selectedOption = this.payMethodOptions.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();
+        beforeGetData() {
+            return { search: this.search, query: { del: false } };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/orderEdit',
+                query: {
+                    ...this.$route.query
                 }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/orderEdit",
-                    query: {
-                        ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/orderEdit",
-                    query: {
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/orderEdit',
+                query: {
                     id: row.id
-                    }
-                });
-            },
-            download() {
-                this.downloading = true;
-                this.$axios
-                    .get("/order/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
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/order/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);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/order/del/${row.id}`)
-                }).then(() => {
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/order/del/${row.id}`);
+                })
+                .then(() => {
                     this.$message.success('删除成功');
                     this.getData();
-                }).catch(e => {
+                })
+                .catch(e => {
                     if (e !== 'cancel') {
                         this.$message.error(e.error);
                     }
-                })
-            },
+                });
         }
     }
+};
 </script>
 <style lang="less" scoped>
 </style>