From 7e4a23688ff82fbecccb9f7fa8aa1d67eade58cd Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 14 十月 2019 17:38:48 +0800
Subject: [PATCH] 免单券激活条件：3个不同订单号-自购
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index 75407c9..33a47fa 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -19,7 +19,7 @@
@Table("yeshi_ec_msg_money")
public class MsgMoneyDetail {
public enum MsgTypeMoneyTypeEnum {
- share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
+ share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractAutoWX("鑷姩鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
"鍒嗕韩濂栭噾鎵ｉ櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵ｉ櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈");
private final String desc;
@@ -44,6 +44,8 @@
private Integer goodsCount;// 鍟嗗搧鏁�
@Column(name = "mm_order_id")
private String orderId;// 璁㈠崟鍙凤紙杩斿埄閫傜敤锛�
+ @Column(name = "mm_order_type")
+ private Integer orderType;
@Column(name = "mm_source_id")
private Extract extract;// 鎻愮幇璇︽儏
private AlipayAccountValidNormalHistory alipayAccountValid;// 鎻愮幇璐﹀彿楠岃瘉璇︽儏
@@ -53,6 +55,8 @@
private BigDecimal balance;// 璐︽埛浣欓
@Column(name = "mm_state_desc")
private String stateDesc;// 鐘舵�佽鏄�
+ @Column(name = "mm_desc")
+ private String desc;// 璇存槑
@Column(name = "mm_beizhu")
private String beiZhu;// 澶囨敞
@Column(name = "mm_create_time")
@@ -182,4 +186,19 @@
this.alipayAccountValid = alipayAccountValid;
}
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
}
--
Gitblit v1.8.0