From 9d106fb0a35d09ba57a81b40d936bf4a34c0c8ab Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 27 May 2020 18:44:26 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/home/entity/MemberPaymentMethodEntity.java | 70 +++++++++++------------------------
1 files changed, 22 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/home/entity/MemberPaymentMethodEntity.java b/src/main/java/com/xcong/excoin/modules/home/entity/MemberPaymentMethodEntity.java
index d3de533..29e3e3e 100644
--- a/src/main/java/com/xcong/excoin/modules/home/entity/MemberPaymentMethodEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/home/entity/MemberPaymentMethodEntity.java
@@ -1,7 +1,5 @@
package com.xcong.excoin.modules.home.entity;
-import java.math.BigDecimal;
-
import com.baomidou.mybatisplus.annotation.TableName;
import com.xcong.excoin.common.system.base.BaseEntity;
@@ -10,33 +8,20 @@
@EqualsAndHashCode(callSuper = true)
@Data
-@TableName("member_quick_buy_sale")
+@TableName("member_payment_method")
public class MemberPaymentMethodEntity extends BaseEntity{
/**
- * 订单状态 1-新建
+ * 付款方式：支付宝
*/
- public static final Integer CHARGE_STATUS_CREATE = 1;
-
+ public static String PAYMENT_TYPE_ALIPAY = "1";
/**
- * 订单状态 2-已付款
+ * 付款方式：微信
*/
- public static final Integer CHARGE_STATUS_PAID = 2;
-
+ public static String PAYMENT_TYPE_WEPAY = "2";
/**
- * 订单状态 3-已审核
+ * 付款方式：银行卡
*/
- public static final Integer CHARGE_STATUS_CHECKED = 3;
-
- /**
- * 订单状态 4-撤单
- */
- public static final Integer CHARGE_STATUS_CANCEL_USER = 4;
-
- /**
- * 订单状态 5-系统取消
- */
- public static final Integer CHARGE_STATUS_CANCEL_SYSTEM = 5;
-
+ public static String PAYMENT_TYPE_BANK = "3";
private static final long serialVersionUID = 1L;
/**
@@ -44,43 +29,32 @@
*/
private Long memberId;
/**
- * 金额(人民币)
+ * 姓名
*/
- private BigDecimal amountCny;
+ private String name;
/**
- * 金额(USDT)
+ * 账号
*/
- private BigDecimal amountUsdt;
+ private String account;
/**
- * 付款方式 1-支付宝2-微信3-银行卡
+ * 收款二维码
*/
- private Integer paymentType;
+ private String paymentQrcode;
/**
- * 收款账号
+ * 银行
*/
- private String paymentAccount;
+ private String bank;
/**
- * 收款人姓名
+ * 支行
*/
- private String paymentName;
+ private String subBank;
/**
- * 支付码
+ * 类型 1-支付宝2-微信3-银行卡
*/
- private String paymentCode;
+ private String paymentType;
/**
- * 单价
+ * 默认收款方式
*/
- private BigDecimal unitPrice;
- /**
- * 订单状态 1-新建2-已付款3-已审核4-撤单5-系统取消
- */
- private int orderStatus;
- /**
- * 订单编号
- */
- private String orderNo;
- /**
- * 订单类型 B买入 S卖出
- */
- private String orderType;
+ private int isDefualt;
+
}
--
Gitblit v1.9.1