拍卖订单

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

@@ -1,51 +1,32 @@
 package com.izouma.nineth.domain;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.nineth.annotations.Searchable;
 import com.izouma.nineth.annotations.SearchableOne;
 import com.izouma.nineth.converter.FileObjectListConverter;
 import com.izouma.nineth.converter.PrivilegeListConverter;
 import com.izouma.nineth.converter.PropertyListConverter;
+import com.izouma.nineth.dto.AuctionPaymentType;
 import com.izouma.nineth.enums.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedBy;
-import org.springframework.data.annotation.LastModifiedDate;
 
 import javax.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
+@Entity
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class AuctionOrder {
+public class AuctionOrder extends BaseEntityNoID {
     @Id
     private Long id;
 
-    @JsonIgnore
-    @CreatedBy
-    private String createdBy;
-
-    @JsonIgnore
-    @CreatedDate
-    private LocalDateTime createdAt;
-
-    @JsonIgnore
-    @LastModifiedBy
-    private String modifiedBy;
-
-    @JsonIgnore
-    @LastModifiedDate
-    private LocalDateTime modifiedAt;
-
     @ApiModelProperty("用户ID")
     private Long userId;
 
@@ -91,13 +72,17 @@ public class AuctionOrder {
     @Enumerated(EnumType.STRING)
     private AuctionSource source;
 
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty("支付类型")
+    private AuctionPaymentType paymentType;
+
     @ApiModelProperty("价格")
     @Column(precision = 10, scale = 2)
     private BigDecimal price;
 
-    @ApiModelProperty("gas费")
-    @Column(precision = 10, scale = 2)
-    private BigDecimal gasPrice;
+//    @ApiModelProperty("gas费")
+//    @Column(precision = 10, scale = 2)
+//    private BigDecimal gasPrice;
 
     @ApiModelProperty("总价")
     @Column(precision = 10, scale = 2)
@@ -130,4 +115,7 @@ public class AuctionOrder {
 
     @ApiModelProperty("收货地址")
     private String address;
+
+    @ApiModelProperty("拍卖记录id")
+    private Long auctionRecordId;
 }

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

@@ -0,0 +1,17 @@
+package com.izouma.nineth.dto;
+
+public enum AuctionPaymentType {
+    deposit("保证金"),
+    purchase_price("成交金"),
+    FIXED_PRICE("一口价");
+
+    private final String description;
+
+    AuctionPaymentType(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

src/main/java/com/izouma/nineth/enums/AssetStatus.java

@@ -6,7 +6,9 @@ public enum AssetStatus {
     TRANSFERRED("已转让"),
     GIFTING("转赠中"),
     GIFTED("已转赠"),
-    MINTING("铸造中")
+    MINTING("铸造中"),
+    AUCTIONING("拍卖中"),
+    AUCTIONED("已拍卖")
     ;
 
     private final String description;

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

@@ -0,0 +1,21 @@
+package com.izouma.nineth.repo;
+
+import com.izouma.nineth.domain.AuctionOrder;
+import com.izouma.nineth.dto.AuctionPaymentType;
+import com.izouma.nineth.enums.OrderStatus;
+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;
+import java.util.Collection;
+
+public interface AuctionOrderRepo extends JpaRepository<AuctionOrder, Long>, JpaSpecificationExecutor<AuctionOrder> {
+    @Query("update AuctionOrder t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+
+    AuctionOrder findByUserIdAndAuctionIdAndPaymentTypeAndStatusIn(Long userId, Long auctionId, AuctionPaymentType paymentType, Collection<OrderStatus> status);
+}

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

@@ -370,7 +370,16 @@ public class AssetService {
         asset.setPublicShow(false);
         asset.setConsignment(false);
         asset.setPublicCollectionId(null);
-        asset.setStatus(TransferReason.GIFT == reason ? AssetStatus.GIFTED : AssetStatus.TRANSFERRED);
+        switch (reason) {
+            case TransferReason.GIFT:
+                asset.setStatus(AssetStatus.GIFTED);
+                break;
+            case "拍卖":
+                asset.setStatus(AssetStatus.AUCTIONED);
+                break;
+            case TransferReason.TRANSFER:
+                asset.setStatus(AssetStatus.TRANSFERRED);
+        }
         asset.setOwner(toUser.getNickname());
         asset.setOwnerId(toUser.getId());
         asset.setOwnerAvatar(toUser.getAvatar());

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

@@ -0,0 +1,92 @@
+package com.izouma.nineth.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ArrayUtil;
+import com.izouma.nineth.domain.AuctionOrder;
+import com.izouma.nineth.domain.User;
+import com.izouma.nineth.dto.AuctionPaymentType;
+import com.izouma.nineth.dto.PageQuery;
+import com.izouma.nineth.enums.AuctionSource;
+import com.izouma.nineth.enums.OrderStatus;
+import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AuctionOrderRepo;
+import com.izouma.nineth.repo.UserRepo;
+import com.izouma.nineth.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+
+@Service
+@AllArgsConstructor
+public class AuctionOrderService {
+
+    private AuctionOrderRepo auctionOrderRepo;
+    private SysConfigService sysConfigService;
+    private UserRepo         userRepo;
+    private AssetService     assetService;
+
+    public Page<AuctionOrder> all(PageQuery pageQuery) {
+        return auctionOrderRepo.findAll(JpaUtils.toSpecification(pageQuery, AuctionOrder.class), JpaUtils.toPageRequest(pageQuery));
+    }
+
+    public void create(Long userId, Long auctionId, Long addressId) {
+
+    }
+
+    public void createDeposit(Long userId, Long auctionId, Long auctionRecordId) {
+        User user = userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
+
+        //保证金
+        BigDecimal deposit = sysConfigService.getBigDecimal("deposit");
+        AuctionOrder order = auctionOrderRepo.findByUserIdAndAuctionIdAndPaymentTypeAndStatusIn(userId, auctionId,
+                AuctionPaymentType.deposit, Arrays.asList(OrderStatus.NOT_PAID, OrderStatus.FINISH));
+        if (ObjectUtils.isNotEmpty(order)) {
+            if (OrderStatus.FINISH.equals(order.getStatus())) {
+                throw new BusinessException("保证金已交过，无需再交");
+            }
+            throw new BusinessException("保证金未支付，取消后在支付");
+
+        }
+
+        //查询拍卖信息
+        //..
+
+        order = AuctionOrder.builder()
+                .auctionId(auctionId)
+                .userId(userId)
+                .nickname(user.getNickname())
+                .paymentType(AuctionPaymentType.deposit)
+                .price(deposit)
+                .totalPrice(deposit)
+                .auctionRecordId(auctionRecordId)
+                .build();
+
+        auctionOrderRepo.save(order);
+
+    }
+
+    public void notify(Long id) {
+        AuctionOrder order = auctionOrderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+        order.setStatus(OrderStatus.FINISH);
+
+        if (AuctionPaymentType.deposit.equals(order.getPaymentType())) {
+            //改出价记录表
+
+        } else {
+            //退保证金
+        }
+
+        if (AuctionSource.OFFICIAL.equals(order.getSource())) {
+        } else {
+            //转让流程
+//            assetService.transfer();
+        }
+    }
+
+
+}

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

@@ -8,7 +8,14 @@ import com.izouma.nineth.config.RedisKeys;
 import com.izouma.nineth.config.SandPayProperties;
 import com.izouma.nineth.dto.PayQuery;
 import com.izouma.nineth.enums.PayStatus;
+import com.izouma.nineth.domain.AuctionOrder;
+import com.izouma.nineth.domain.GiftOrder;
+import com.izouma.nineth.domain.MintOrder;
+import com.izouma.nineth.domain.Order;
+import com.izouma.nineth.enums.MintOrderStatus;
+import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.exception.BusinessException;
+import com.izouma.nineth.repo.AuctionOrderRepo;
 import com.izouma.nineth.repo.GiftOrderRepo;
 import com.izouma.nineth.repo.MintOrderRepo;
 import com.izouma.nineth.repo.OrderRepo;
@@ -18,6 +25,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -39,14 +47,15 @@ import java.util.Optional;
 @AllArgsConstructor
 @Slf4j
 public class SandPayService {
-    private final OrderRepo                     orderRepo;
-    private final GiftOrderRepo                 giftOrderRepo;
-    private final SandPayProperties             sandPayProperties;
-    private final MintOrderRepo                 mintOrderRepo;
-    private final SnowflakeIdWorker             snowflakeIdWorker;
-    private final GeneralProperties             generalProperties;
+    private final OrderRepo         orderRepo;
+    private final GiftOrderRepo     giftOrderRepo;
+    private final SandPayProperties sandPayProperties;
+    private final MintOrderRepo     mintOrderRepo;
+    private final SnowflakeIdWorker snowflakeIdWorker;
+    private final GeneralProperties generalProperties;
+    private final AuctionOrderRepo  auctionOrderRepo;
     private final RedisTemplate<String, Object> redisTemplate;
-
+    
     public static String paddingOrderId(String orderId) {
         if (orderId != null && orderId.length() < 12) {
             StringBuilder orderIdBuilder = new StringBuilder(orderId);
@@ -276,6 +285,35 @@ public class SandPayService {
         return requestServer(header, body, "https://cashier.sandpay.com.cn/qr/api/order/refund");
     }
 
+    @Cacheable(value = "sandPay", key = "#orderId")
+    public String payAuctionOrder(Long orderId) {
+        AuctionOrder order = auctionOrderRepo.findById(orderId).orElseThrow(new BusinessException("订单不存在"));
+        if (order.getStatus() != OrderStatus.NOT_PAID) {
+            throw new BusinessException("订单状态错误");
+        }
+        JSONObject extend = new JSONObject();
+        extend.put("type", "auctionOrder");
+        extend.put("id", orderId);
+
+        JSONObject res = requestAlipay(orderId.toString(), order.getTotalPrice(), "拍卖:" + order.getAuctionId(),
+                "拍卖:" + order.getName(), 180, extend.toJSONString());
+        if (res == null)
+            throw new BusinessException("下单失败，请稍后再试");
+
+        if (!"000000".equals(res.getJSONObject("head").getString("respCode"))) {
+            String msg = res.getJSONObject("head").getString("respMsg");
+            if (msg.contains("超限")) {
+                throw new BusinessException("超过商户单日额度");
+            }
+            if (msg.contains("商户状态")) {
+                throw new BusinessException("超过商户单日额度");
+            }
+            throw new BusinessException(msg);
+        }
+
+        return res.getJSONObject("body").getString("qrCode");
+    }
+
     public JSONObject transfer(String id, String name, String bank, BigDecimal amount) {
         JSONObject request = new JSONObject();
         DecimalFormat df = new DecimalFormat("000000000000", DecimalFormatSymbols.getInstance(Locale.US));

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

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

src/main/vue/src/router.js

@@ -708,6 +708,22 @@ const router = new Router({
                         title: 'captcha'
                     }
                 },
+                {
+                    path: '/auctionOrderEdit',
+                    name: 'AuctionOrderEdit',
+                    component: () => import(/* webpackChunkName: "auctionOrderEdit" */ '@/views/AuctionOrderEdit.vue'),
+                    meta: {
+                       title: '拍卖订单编辑',
+                    },
+                },
+                {
+                    path: '/auctionOrderList',
+                    name: 'AuctionOrderList',
+                    component: () => import(/* webpackChunkName: "auctionOrderList" */ '@/views/AuctionOrderList.vue'),
+                    meta: {
+                       title: '拍卖订单',
+                    },
+               },
                 {
                     path: '/tagEdit',
                     name: 'TagEdit',
@@ -807,4 +823,4 @@ router.beforeEach((to, from, next) => {
     }
 });
 
-export default router;
+export default router;

src/main/vue/src/views/AuctionOrderEdit.vue

@@ -0,0 +1,222 @@
+<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="id" label="id">
+                                    <el-input-number type="number" v-model="formData.id"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="userId" label="用户ID">
+                                    <el-input-number type="number" v-model="formData.userId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="nickname" label="昵称">
+                                    <el-input v-model="formData.nickname"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="auctionId" label="拍卖ID">
+                                    <el-input-number type="number" v-model="formData.auctionId"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="name" label="名称">
+                                    <el-input v-model="formData.name"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="pic" label="图片">
+                                    <el-input v-model="formData.pic"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="detail" label="详情">
+                                    <el-input v-model="formData.detail"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="properties" label="特性">
+                                    <el-input v-model="formData.properties"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="privileges" label="特权">
+                                    <el-input v-model="formData.privileges"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="royalties" label="版税比例">
+                                    <el-input v-model="formData.royalties"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="serviceCharge" label="手续费比例">
+                                    <el-input v-model="formData.serviceCharge"></el-input>
+                        </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="source" label="来源">
+                                    <el-select v-model="formData.source" clearable filterable placeholder="请选择">
+                                        <el-option
+                                                v-for="item in sourceOptions"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                        </el-form-item>
+                        <el-form-item prop="paymentType" label="支付类型">
+                                    <el-select v-model="formData.paymentType" clearable filterable placeholder="请选择">
+                                        <el-option
+                                                v-for="item in paymentTypeOptions"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                        </el-form-item>
+                        <el-form-item prop="price" label="价格">
+                                    <el-input-number type="number" v-model="formData.price"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="gasPrice" label="gas费">
+                                    <el-input-number type="number" v-model="formData.gasPrice"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="totalPrice" label="总价">
+                                    <el-input-number type="number" v-model="formData.totalPrice"></el-input-number>
+                        </el-form-item>
+                        <el-form-item prop="status" label="状态">
+                                    <el-select v-model="formData.status" clearable filterable placeholder="请选择">
+                                        <el-option
+                                                v-for="item in statusOptions"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                        </el-form-item>
+                        <el-form-item prop="payMethod" label="支付方式">
+                                    <el-select v-model="formData.payMethod" clearable filterable placeholder="请选择">
+                                        <el-option
+                                                v-for="item in payMethodOptions"
+                                                :key="item.value"
+                                                :label="item.label"
+                                                :value="item.value">
+                                        </el-option>
+                                    </el-select>
+                        </el-form-item>
+                        <el-form-item prop="transactionId" label="交易ID">
+                                    <el-input v-model="formData.transactionId"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="payTime" label="支付时间">
+                                    <el-date-picker
+                                            v-model="formData.payTime"
+                                            type="datetime"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                            placeholder="选择日期时间">
+                                    </el-date-picker>
+                        </el-form-item>
+                        <el-form-item prop="cancelTime" label="取消时间">
+                                    <el-date-picker
+                                            v-model="formData.cancelTime"
+                                            type="datetime"
+                                            value-format="yyyy-MM-dd HH:mm:ss"
+                                            placeholder="选择日期时间">
+                                    </el-date-picker>
+                        </el-form-item>
+                        <el-form-item prop="contactName" label="收货人">
+                                    <el-input v-model="formData.contactName"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="contactPhone" label="收货电话">
+                                    <el-input v-model="formData.contactPhone"></el-input>
+                        </el-form-item>
+                        <el-form-item prop="address" label="收货地址">
+                                    <el-input v-model="formData.address"></el-input>
+                        </el-form-item>
+                    <el-form-item class="form-submit">
+                        <el-button @click="onSave" :loading="saving" type="primary">
+                            保存
+                        </el-button>
+                        <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
+                            删除
+                        </el-button>
+                        <el-button @click="$router.go(-1)" :disabled="saving">取消</el-button>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'AuctionOrderEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('auctionOrder/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: {
+                },
+                typeOptions: [{"label":"默认","value":"DEFAULT"},{"label":"盲盒","value":"BLIND_BOX"},{"label":"拍卖","value":"AUCTION"},{"label":"展厅","value":"SHOWROOM"}],
+                sourceOptions: [{"label":"官方拍卖","value":"OFFICIAL"},{"label":"转让拍卖","value":"TRANSFER"}],
+                paymentTypeOptions: [{"label":"保证金","value":"deposit"},{"label":"成交金","value":"purchase_price"},{"label":"一口价","value":"FIXED_PRICE"}],
+                statusOptions: [{"label":"未支付","value":"NOT_PAID"},{"label":"已支付，处理中","value":"PROCESSING"},{"label":"已完成","value":"FINISH"},{"label":"已取消","value":"CANCELLED"}],
+                payMethodOptions: [{"label":"微信","value":"WEIXIN"},{"label":"支付宝","value":"ALIPAY"},{"label":"无GAS费","value":"FREE"}],
+            }
+        },
+        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('/auctionOrder/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(`/auctionOrder/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/AuctionOrderList.vue

@@ -0,0 +1,280 @@
+<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="id" label="id"
+>
+                    </el-table-column>
+                    <el-table-column prop="userId" label="用户ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="nickname" label="昵称"
+>
+                    </el-table-column>
+                    <el-table-column prop="auctionId" label="拍卖ID"
+>
+                    </el-table-column>
+                    <el-table-column prop="name" label="名称"
+>
+                    </el-table-column>
+                    <el-table-column prop="pic" label="图片"
+>
+                    </el-table-column>
+                    <el-table-column prop="detail" label="详情"
+>
+                    </el-table-column>
+                    <el-table-column prop="properties" label="特性"
+>
+                    </el-table-column>
+                    <el-table-column prop="privileges" label="特权"
+>
+                    </el-table-column>
+                    <el-table-column prop="royalties" label="版税比例"
+>
+                    </el-table-column>
+                    <el-table-column prop="serviceCharge" label="手续费比例"
+>
+                    </el-table-column>
+                    <el-table-column prop="type" label="类型"
+                            :formatter="typeFormatter"
+                        >
+                    </el-table-column>
+                    <el-table-column prop="source" label="来源"
+                            :formatter="sourceFormatter"
+                        >
+                    </el-table-column>
+                    <el-table-column prop="paymentType" label="支付类型"
+                            :formatter="paymentTypeFormatter"
+                        >
+                    </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="cancelTime" label="取消时间"
+>
+                    </el-table-column>
+                    <el-table-column prop="contactName" label="收货人"
+>
+                    </el-table-column>
+                    <el-table-column prop="contactPhone" label="收货电话"
+>
+                    </el-table-column>
+                    <el-table-column prop="address" label="收货地址"
+>
+                    </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: 'AuctionOrderList',
+        mixins: [pageableTable],
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/auctionOrder/all",
+                downloading: false,
+                        typeOptions:[{"label":"默认","value":"DEFAULT"},{"label":"盲盒","value":"BLIND_BOX"},{"label":"拍卖","value":"AUCTION"},{"label":"展厅","value":"SHOWROOM"}],
+                        sourceOptions:[{"label":"官方拍卖","value":"OFFICIAL"},{"label":"转让拍卖","value":"TRANSFER"}],
+                        paymentTypeOptions:[{"label":"保证金","value":"deposit"},{"label":"成交金","value":"purchase_price"},{"label":"一口价","value":"FIXED_PRICE"}],
+                        statusOptions:[{"label":"未支付","value":"NOT_PAID"},{"label":"已支付，处理中","value":"PROCESSING"},{"label":"已完成","value":"FINISH"},{"label":"已取消","value":"CANCELLED"}],
+                        payMethodOptions:[{"label":"微信","value":"WEIXIN"},{"label":"支付宝","value":"ALIPAY"},{"label":"无GAS费","value":"FREE"}],
+            }
+        },
+        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 '';
+                    },
+                    sourceFormatter(row, column, cellValue, index) {
+                        let selectedOption = this.sourceOptions.find(i => i.value === cellValue);
+                        if (selectedOption) {
+                            return selectedOption.label;
+                        }
+                        return '';
+                    },
+                    paymentTypeFormatter(row, column, cellValue, index) {
+                        let selectedOption = this.paymentTypeOptions.find(i => i.value === cellValue);
+                        if (selectedOption) {
+                            return selectedOption.label;
+                        }
+                        return '';
+                    },
+                    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();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/auctionOrderEdit",
+                    query: {
+                        ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/auctionOrderEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/auctionOrder/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(`/auctionOrder/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>