拍卖

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

@@ -70,7 +70,7 @@ public class AuctionOrder extends BaseEntityNoID {
 
     @Enumerated(EnumType.STRING)
     @ApiModelProperty("拍卖类型")
-    private AuctionType auctionType;
+    private AuctionSource auctionSource;
 
     @Enumerated(EnumType.STRING)
     @ApiModelProperty("支付类型")
@@ -90,7 +90,7 @@ public class AuctionOrder extends BaseEntityNoID {
 
     @ApiModelProperty("状态")
     @Enumerated(EnumType.STRING)
-    private OrderStatus status;
+    private AuctionOrderStatus status;
 
     @ApiModelProperty("支付方式")
     @Enumerated(EnumType.STRING)

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

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import java.math.BigDecimal;
 
 @Entity
@@ -28,10 +30,13 @@ public class AuctionRecord extends BaseEntity {
     private Long              name;
     @ApiModelProperty("拍卖活动图片")
     private String            auctionPic;
+    @Enumerated(EnumType.STRING)
     @ApiModelProperty("类型")
     private AuctionRecordType type;
     @ApiModelProperty("是否竞得")
     private boolean           purchased;
     @ApiModelProperty("出价")
     private BigDecimal        bidderPrice;
+    @ApiModelProperty("是否支付保证金")
+    private boolean           payDeposit;
 }

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

@@ -0,0 +1,19 @@
+package com.izouma.nineth.enums;
+
+public enum AuctionOrderStatus {
+    NOT_PAID("未支付"),
+    FINISH("已完成"),
+    CANCELLED("已取消"),
+    REFUNDING("退款中"),
+    REFUNDED("已退款");
+
+    private final String description;
+
+    AuctionOrderStatus(String description) {
+        this.description = description;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.AuctionOrder;
 import com.izouma.nineth.dto.AuctionPaymentType;
+import com.izouma.nineth.enums.AuctionOrderStatus;
 import com.izouma.nineth.enums.OrderStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -17,5 +18,5 @@ public interface AuctionOrderRepo extends JpaRepository<AuctionOrder, Long>, Jpa
     @Transactional
     void softDelete(Long id);
 
-    AuctionOrder findByUserIdAndAuctionIdAndPaymentTypeAndStatusIn(Long userId, Long auctionId, AuctionPaymentType paymentType, Collection<OrderStatus> status);
+    AuctionOrder findByUserIdAndAuctionIdAndPaymentTypeAndStatusIn(Long userId, Long auctionId, AuctionPaymentType paymentType, Collection<AuctionOrderStatus> status);
 }

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

@@ -1,15 +1,12 @@
 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.AuctionOrderStatus;
 import com.izouma.nineth.enums.AuctionSource;
 import com.izouma.nineth.enums.AuctionType;
-import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.repo.AuctionOrderRepo;
 import com.izouma.nineth.repo.UserRepo;
@@ -20,6 +17,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 
 @Service
@@ -35,7 +33,7 @@ public class AuctionOrderService {
         return auctionOrderRepo.findAll(JpaUtils.toSpecification(pageQuery, AuctionOrder.class), JpaUtils.toPageRequest(pageQuery));
     }
 
-    public void create(Long userId, Long auctionId, Long addressId) {
+    public void create(Long userId, Long auctionId, Long addressId, AuctionPaymentType paymentType) {
 
     }
 
@@ -45,9 +43,9 @@ public class AuctionOrderService {
         //保证金
         BigDecimal deposit = sysConfigService.getBigDecimal("deposit");
         AuctionOrder order = auctionOrderRepo.findByUserIdAndAuctionIdAndPaymentTypeAndStatusIn(userId, auctionId,
-                AuctionPaymentType.deposit, Arrays.asList(OrderStatus.NOT_PAID, OrderStatus.FINISH));
+                AuctionPaymentType.deposit, Arrays.asList(AuctionOrderStatus.NOT_PAID, AuctionOrderStatus.FINISH));
         if (ObjectUtils.isNotEmpty(order)) {
-            if (OrderStatus.FINISH.equals(order.getStatus())) {
+            if (AuctionOrderStatus.FINISH.equals(order.getStatus())) {
                 throw new BusinessException("保证金已交过，无需再交");
             }
             throw new BusinessException("保证金未支付，取消后在支付");
@@ -65,6 +63,7 @@ public class AuctionOrderService {
                 .price(deposit)
                 .totalPrice(deposit)
                 .auctionRecordId(auctionRecordId)
+                .status(AuctionOrderStatus.NOT_PAID)
                 .build();
 
         auctionOrderRepo.save(order);
@@ -73,21 +72,55 @@ public class AuctionOrderService {
 
     public void notify(Long id) {
         AuctionOrder order = auctionOrderRepo.findById(id).orElseThrow(new BusinessException("无记录"));
-        order.setStatus(OrderStatus.FINISH);
+        order.setStatus(AuctionOrderStatus.FINISH);
 
         if (AuctionPaymentType.deposit.equals(order.getPaymentType())) {
             //改出价记录表
 
         } else {
+            //此拍卖结束
             //退保证金
         }
 
-        if (AuctionType.ENTITY.equals(order.getAuctionType())) {
+        if (AuctionSource.OFFICIAL.equals(order.getAuctionSource())) {
         } else {
             //转让流程
 //            assetService.transfer();
         }
     }
 
+    public void cancel(AuctionOrder order) {
+        order.setStatus(AuctionOrderStatus.CANCELLED);
+        order.setCancelTime(LocalDateTime.now());
+
+        switch (order.getPaymentType()) {
+            case deposit:
+                //删除出价记录
+                break;
+            case FIXED_PRICE:
+                //返回拍卖状态
+                break;
+            case purchase_price:
+                //获取时长
+                //超过时长不返回保证金
+                //状态为流拍
+                //退换其余保证金
+
+        }
+        if (AuctionPaymentType.deposit.equals(order.getPaymentType())) {
+            //删除出价记录
+
+        } else {
+            //退保证金
+        }
+
+        if (AuctionSource.OFFICIAL.equals(order.getAuctionSource())) {
+        } else {
+            //改回资产状态
+
+        }
+
+    }
+
 
 }

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

@@ -12,6 +12,7 @@ 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.AuctionOrderStatus;
 import com.izouma.nineth.enums.MintOrderStatus;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.exception.BusinessException;
@@ -288,7 +289,7 @@ public class SandPayService {
     @Cacheable(value = "sandPay", key = "#orderId")
     public String payAuctionOrder(Long orderId) {
         AuctionOrder order = auctionOrderRepo.findById(orderId).orElseThrow(new BusinessException("订单不存在"));
-        if (order.getStatus() != OrderStatus.NOT_PAID) {
+        if (order.getStatus() != AuctionOrderStatus.NOT_PAID) {
             throw new BusinessException("订单状态错误");
         }
         JSONObject extend = new JSONObject();

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

@@ -2,140 +2,149 @@
     <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="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
+                    :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="onSave" :loading="saving" type="primary"> 保存 </el-button>
                         <el-button @click="onDelete" :disabled="saving" type="danger" v-if="formData.id">
                             删除
                         </el-button>
@@ -147,76 +156,98 @@
     </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;
-                    }
+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);
                 });
-            },
-            submit() {
-                let data = {...this.formData};
+        }
+    },
+    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.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 => {
+                })
+                .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

@@ -1,120 +1,79 @@
 <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> -->
+            <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="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="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="createdAt" label="下单时间"> </el-table-column>
+            <el-table-column prop="payTime" label="支付时间"> </el-table-column>
+            <el-table-column prop="cancelTime" label="取消时间"> </el-table-column>
+            <el-table-column label="收件人信息" min-width="120" show-overflow-tooltip>
+                <template slot-scope="{ row }">
+                    <span>{{ row.contactName }}</span>
+                    <span style="margin-left: 10px">{{ row.contactPhone }}</span
+                    ><br />
+                    <span>{{ row.address }}</span>
+                </template>
             </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-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>
@@ -129,152 +88,177 @@
                     <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: '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"}],
+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 } };
         },
-        computed: {
-            selection() {
-                return this.$refs.table.selection.map(i => i.id);
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
             }
         },
-        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
                 }
-            },
-            addRow() {
-                this.$router.push({
-                    path: "/auctionOrderEdit",
-                    query: {
-                        ...this.$route.query
-                    }
-                });
-            },
-            editRow(row) {
-                this.$router.push({
-                    path: "/auctionOrderEdit",
-                    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
+                }
+            });
+        },
+        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);
                 });
-            },
-            operation2() {
-                this.$message('操作2');
-            },
-            deleteRow(row) {
-                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
-                    return this.$http.post(`/auctionOrder/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(`/auctionOrder/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>