From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java |  442 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 257 insertions(+), 185 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..eeaa7ba 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
@@ -1,185 +1,257 @@
-package com.yeshi.fanli.entity.bus.msg;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.yeshi.utils.mybatis.Column;
-import org.yeshi.utils.mybatis.Table;
-
-import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
-import com.yeshi.fanli.entity.bus.user.Extract;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
-
-/**
- * 濂栭噾鍒拌处璁板綍
- * 
- * @author Administrator
- *
- */
-@Table("yeshi_ec_msg_money")
-public class MsgMoneyDetail {
-	public enum MsgTypeMoneyTypeEnum {
-		share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
-				"鍒嗕韩濂栭噾鎵i櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵i櫎"), orderReward("杩斿埄濂栧姳"), systemEqualize("绯荤粺琛ラ綈");
-		private final String desc;
-
-		private MsgTypeMoneyTypeEnum(String desc) {
-			this.desc = desc;
-		}
-
-		public String getDesc() {
-			return desc;
-		}
-	}
-
-	@Column(name = "mm_id")
-	private Long id;
-	@Column(name = "mm_uid")
-	private UserInfo user;
-	@Column(name = "mm_type")
-	private MsgTypeMoneyTypeEnum msgType;// 娑堟伅绫诲瀷
-	@Column(name = "mm_order_count")
-	private Integer orderCount;// 璁㈠崟鏁�(濂栭噾閫傜敤)
-	@Column(name = "mm_goods_count")
-	private Integer goodsCount;// 鍟嗗搧鏁�
-	@Column(name = "mm_order_id")
-	private String orderId;// 璁㈠崟鍙凤紙杩斿埄閫傜敤锛�
-	@Column(name = "mm_source_id")
-	private Extract extract;// 鎻愮幇璇︽儏
-	private AlipayAccountValidNormalHistory alipayAccountValid;// 鎻愮幇璐﹀彿楠岃瘉璇︽儏
-	@Column(name = "mm_money")
-	private BigDecimal money;// 鍒拌处璧勯噾
-	@Column(name = "mm_balance")
-	private BigDecimal balance;// 璐︽埛浣欓
-	@Column(name = "mm_state_desc")
-	private String stateDesc;// 鐘舵�佽鏄�
-	@Column(name = "mm_beizhu")
-	private String beiZhu;// 澶囨敞
-	@Column(name = "mm_create_time")
-	private Date createTime;
-	@Column(name = "mm_update_time")
-	private Date updateTime;
-	@Column(name = "mm_read")
-	private Boolean read;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public UserInfo getUser() {
-		return user;
-	}
-
-	public void setUser(UserInfo user) {
-		this.user = user;
-	}
-
-	public String getStateDesc() {
-		return stateDesc;
-	}
-
-	public void setStateDesc(String stateDesc) {
-		this.stateDesc = stateDesc;
-	}
-
-	public MsgTypeMoneyTypeEnum getMsgType() {
-		return msgType;
-	}
-
-	public void setMsgType(MsgTypeMoneyTypeEnum msgType) {
-		this.msgType = msgType;
-	}
-
-	public Integer getOrderCount() {
-		return orderCount;
-	}
-
-	public void setOrderCount(Integer orderCount) {
-		this.orderCount = orderCount;
-	}
-
-	public Integer getGoodsCount() {
-		return goodsCount;
-	}
-
-	public void setGoodsCount(Integer goodsCount) {
-		this.goodsCount = goodsCount;
-	}
-
-	public String getOrderId() {
-		return orderId;
-	}
-
-	public void setOrderId(String orderId) {
-		this.orderId = orderId;
-	}
-
-	public Extract getExtract() {
-		return extract;
-	}
-
-	public void setExtract(Extract extract) {
-		this.extract = extract;
-	}
-
-	public BigDecimal getMoney() {
-		return money;
-	}
-
-	public void setMoney(BigDecimal money) {
-		this.money = money;
-	}
-
-	public BigDecimal getBalance() {
-		return balance;
-	}
-
-	public void setBalance(BigDecimal balance) {
-		this.balance = balance;
-	}
-
-	public String getBeiZhu() {
-		return beiZhu;
-	}
-
-	public void setBeiZhu(String beiZhu) {
-		this.beiZhu = beiZhu;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Boolean getRead() {
-		return read;
-	}
-
-	public void setRead(Boolean read) {
-		this.read = read;
-	}
-
-	public AlipayAccountValidNormalHistory getAlipayAccountValid() {
-		return alipayAccountValid;
-	}
-
-	public void setAlipayAccountValid(AlipayAccountValidNormalHistory alipayAccountValid) {
-		this.alipayAccountValid = alipayAccountValid;
-	}
-
-}
+package com.yeshi.fanli.entity.bus.msg;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.yeshi.utils.generater.mybatis.Column;
+import org.yeshi.utils.generater.mybatis.Table;
+
+import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
+import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
+
+/**
+ * 濂栭噾鍒拌处璁板綍
+ * 
+ * @author Administrator
+ *
+ */
+@Table("yeshi_ec_msg_money")
+public class MsgMoneyDetail {
+	public enum MsgTypeMoneyTypeEnum {
+		fanli("璧勯噾鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_money_recieve.png"),
+		share("璧勯噾鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_money_recieve.png"),
+		invite("璧勯噾鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_money_recieve.png"),
+		extract("鎻愮幇", "http://img.flqapp.com/resource/msg/icon_msg_extract.png"),
+		fanliWeiQuan("璧勯噾閫�鍥�","http://img.flqapp.com/resource/msg/icon_msg_money_drawback.png"),
+		shareWeiQuan("璧勯噾閫�鍥�", "http://img.flqapp.com/resource/msg/icon_msg_money_drawback.png"),
+		extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_system.png"),
+		extractValid("鎻愮幇楠岃瘉", "http://img.flqapp.com/resource/msg/icon_msg_extract.png"),
+		inviteWeiQuan("鍥㈤槦濂栭噾鎵i櫎", "http://img.flqapp.com/resource/msg/icon_msg_invite_money.png"),
+		orderReward("杩斿埄濂栧姳","http://img.flqapp.com/resource/msg/icon_msg_order_reward.png"),
+		systemEqualize("绯荤粺琛ラ綈","http://img.flqapp.com/resource/money_detail/icon_system.png"),
+		fanliElme("杩斿埄鍒拌处", "http://img.flqapp.com/resource/msg/icon_msg_fanli.png"),
+		subSidy("棰濆琛ヨ创", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png"),
+		redPackGiveOff("璧犻�佺孩鍖呭畬鎴�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
+		redPackReceiveOff("璧犻�佺孩鍖呴鍙�","http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
+		redPackGiveBack("绾㈠寘閫�鍥�", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),
+		redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+		redPackExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+		redPackOneStageReward("绗竴闃舵-绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		redPackTwoStageReward("绗簩闃舵-閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		redPackThreeStageReward("绗笁闃舵-杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		redPackUseSuccess("绾㈠寘浣跨敤鎴愬姛","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		redPackUseFail("绾㈠寘浣跨敤澶辫触","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		redPackForbid("绾㈠寘灏佺","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		redPackForbidRemove("绾㈠寘瑙e皝","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		redPackDeduct("绾㈠寘鎵i櫎","http://img.flqapp.com/img/tlj/icon_tlj.png"),
+		orderTeamReward("鍥㈤槦濂栧姳","http://img.flqapp.com/resource/msg/icon_msg_team_reward.png");
+
+		private final String desc;
+		private final String icon;
+
+		private MsgTypeMoneyTypeEnum(String desc, String icon) {
+			this.desc = desc;
+			this.icon = icon;
+		}
+
+		public String getDesc() {
+			return desc;
+		}
+		
+		public String getIcon() {
+			return icon;
+		}
+	}
+
+	@Column(name = "mm_id")
+	private Long id;
+	@Column(name = "mm_uid")
+	private UserInfo user;
+	@Column(name = "mm_type")
+	private MsgTypeMoneyTypeEnum msgType;// 娑堟伅绫诲瀷
+	@Column(name = "mm_order_count")
+	private Integer orderCount;// 璁㈠崟鏁�(濂栭噾閫傜敤)
+	@Column(name = "mm_goods_count")
+	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;// 鎻愮幇璐﹀彿楠岃瘉璇︽儏
+	@Column(name = "mm_money")
+	private BigDecimal money;// 鍒拌处璧勯噾
+	@Column(name = "mm_balance")
+	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")
+	private Date createTime;
+	@Column(name = "mm_update_time")
+	private Date updateTime;
+	@Column(name = "mm_read")
+	private Boolean read;
+	@Column(name = "mm_content") // 娑堟伅鍐呭
+	private String content;
+	
+	private String extraInfo;// 鏂扮増娑堟伅鍐呭
+	
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public UserInfo getUser() {
+		return user;
+	}
+
+	public void setUser(UserInfo user) {
+		this.user = user;
+	}
+
+	public String getStateDesc() {
+		return stateDesc;
+	}
+
+	public void setStateDesc(String stateDesc) {
+		this.stateDesc = stateDesc;
+	}
+
+	public MsgTypeMoneyTypeEnum getMsgType() {
+		return msgType;
+	}
+
+	public void setMsgType(MsgTypeMoneyTypeEnum msgType) {
+		this.msgType = msgType;
+	}
+
+	public Integer getOrderCount() {
+		return orderCount;
+	}
+
+	public void setOrderCount(Integer orderCount) {
+		this.orderCount = orderCount;
+	}
+
+	public Integer getGoodsCount() {
+		return goodsCount;
+	}
+
+	public void setGoodsCount(Integer goodsCount) {
+		this.goodsCount = goodsCount;
+	}
+
+	public String getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(String orderId) {
+		this.orderId = orderId;
+	}
+
+	public Extract getExtract() {
+		return extract;
+	}
+
+	public void setExtract(Extract extract) {
+		this.extract = extract;
+	}
+
+	public BigDecimal getMoney() {
+		return money;
+	}
+
+	public void setMoney(BigDecimal money) {
+		this.money = money;
+	}
+
+	public BigDecimal getBalance() {
+		return balance;
+	}
+
+	public void setBalance(BigDecimal balance) {
+		this.balance = balance;
+	}
+
+	public String getBeiZhu() {
+		return beiZhu;
+	}
+
+	public void setBeiZhu(String beiZhu) {
+		this.beiZhu = beiZhu;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public Boolean getRead() {
+		return read;
+	}
+
+	public void setRead(Boolean read) {
+		this.read = read;
+	}
+
+	public AlipayAccountValidNormalHistory getAlipayAccountValid() {
+		return alipayAccountValid;
+	}
+
+	public void setAlipayAccountValid(AlipayAccountValidNormalHistory alipayAccountValid) {
+		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;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getExtraInfo() {
+		return extraInfo;
+	}
+
+	public void setExtraInfo(String extraInfo) {
+		this.extraInfo = extraInfo;
+	}
+}

--
Gitblit v1.8.0