From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java | 234 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 178 insertions(+), 56 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
index 524a8d2..0787c91 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
@@ -1,26 +1,66 @@
package com.matrix.system.hive.bean;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
+import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.plugin.util.MoneyUtil;
-import com.matrix.system.hive.pojo.MoneyCardUserVo;
import org.springframework.format.annotation.DateTimeFormat;
-import java.io.Serializable;
import java.util.Date;
/**
*
* @date 2016-09-17 10:17
*/
-public class MoneyCardUse extends MoneyCardUserVo implements Serializable{
- private static final long serialVersionUID = 1L;
+public class MoneyCardUse {
-
+ @TableId(value = "id",type = IdType.AUTO)
private Long id;
-
-
+
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createTime;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateTime;
+
+ /**
+ * 剩余次数
+ */
+ @TableField(exist = false)
+ String lastCountName;
+ /**
+ * 数据来源
+ */
+ @TableField(exist = false)
+ String sourceName;
+
+ /*vo对象************/
+
+ /**
+ * 剩余次数
+ */
+
+ private Integer lastCount;
+
+ /**
+ * 来源,购买，转让，赠送
+ */
+ private String source;
+ /**
+ * 是会籍卡? Y 是，N否
+ */
+ private String isVipCar;
+
/**
* 订单明细id
*/
@@ -33,12 +73,7 @@
private Integer useTotal;
- /**
- * 剩余次数
- */
-
- private Integer lastCount;
-
+
/**
* 本金
@@ -58,23 +93,28 @@
private String status;
- /**
- * 来源,购买，转让，赠送
- */
- private String source;
+
/**
* 失效时间
*/
- @DateTimeFormat(pattern= DateUtils.DATE_FORMAT_DD)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
+ @DateTimeFormat(pattern= DateUtil.DATE_FORMAT_DD)
private Date failTime;
-
+
+
/**
* 充值卡的id
*/
private Long goodsId;
+
+ /**
+ * 订单ID
+ */
+ @TableField(exist = false)
+ private Long orderId;
private Long vipId;
@@ -85,10 +125,7 @@
*/
private String isOver;
- /**
- * 是会籍卡? Y 是，N否
- */
- private String isVipCar;
+
/**
* 备注
*/
@@ -96,12 +133,21 @@
/**
* 前台输入的退款金额
*/
+ @TableField(exist = false)
private String returnMonery;
/**
* 充值卡名称
*/
private String cardName;
+
+ public Long getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Long orderId) {
+ this.orderId = orderId;
+ }
public String getCardName() {
return cardName;
@@ -126,6 +172,87 @@
public void setRemark(String remark) {
this.remark = remark;
}
+
+ /**
+ * 当大于10000时使用次数为不限,或者为会籍卡时
+ * @return
+ */
+ public String getLastCountName() {
+ if(getLastCount()==null){
+ return "";
+ }
+ if(Dictionary.FLAG_YES.equals(getIsVipCar())||getLastCount()>Dictionary.MAX_USE_COUNT_SIGN){
+ lastCountName=Dictionary.MAX_USE_STRING;
+ }else{
+ lastCountName=getLastCount().toString();
+ }
+ return lastCountName;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public void setLastCountName(String lastCountName) {
+ this.lastCountName = lastCountName;
+ }
+
+ public String getSourceName() {
+ if(getSource()==null){
+ return "";
+ }
+ if(getSource().contains(Dictionary.TAOCAN_SOURCE_ZS)){
+ sourceName=Dictionary.FLAG_YES;
+ }else{
+ sourceName=Dictionary.FLAG_NO;;
+ }
+ return sourceName;
+ }
+
+ public void setSourceName(String sourceName) {
+ this.sourceName = sourceName;
+ }
+
+
+ public String getIsVipCar() {
+ return isVipCar;
+ }
+
+ public void setIsVipCar(String isVipCar) {
+ this.isVipCar = isVipCar;
+ }
+
+
+
+
/**
* 扩展对象
*/
@@ -134,12 +261,14 @@
/**
* 会员信息
*/
+ @TableField(exist = false)
private SysVipInfo vipInfo;
/**
* 调整说明
*/
@Extend
+ @TableField(exist = false)
private String changeRemark;
@@ -151,117 +280,110 @@
this.changeRemark = changeRemark;
}
- public String getIsVipCar() {
- return isVipCar;
- }
-
- public void setIsVipCar(String isVipCar) {
- this.isVipCar = isVipCar;
- }
public Long getId() {
return id;
}
-
+
public void setId(Long id) {
this.id=id;
}
-
+
public Long getOrderItemId() {
return orderItemId;
}
-
+
public void setOrderItemId(Long orderItemId) {
this.orderItemId=orderItemId;
}
-
+
public Integer getUseTotal() {
return useTotal;
}
-
+
public void setUseTotal(Integer useTotal) {
this.useTotal=useTotal;
}
-
+
public Integer getLastCount() {
return lastCount;
}
-
+
public void setLastCount(Integer lastCount) {
this.lastCount=lastCount;
}
-
+
public Double getRealMoney() {
return realMoney;
}
-
+
public void setRealMoney(Double realMoney) {
this.realMoney=realMoney;
}
-
+
public Double getGiftMoney() {
return giftMoney;
}
-
+
public void setGiftMoney(Double giftMoney) {
this.giftMoney=giftMoney;
}
-
+
public String getStatus() {
return status;
}
-
+
public void setStatus(String status) {
this.status=status;
}
-
+
public String getSource() {
return source;
}
-
+
public void setSource(String source) {
this.source=source;
}
-
+
public Date getFailTime() {
return failTime;
}
-
+
public void setFailTime(Date failTime) {
this.failTime=failTime;
}
-
+
public Long getGoodsId() {
return goodsId;
}
-
+
public void setGoodsId(Long goodsId) {
this.goodsId=goodsId;
}
-
+
public Long getVipId() {
return vipId;
}
-
+
public void setVipId(Long vipId) {
this.vipId=vipId;
}
-
+
public String getIsOver() {
return isOver;
}
-
+
public void setIsOver(String isOver) {
this.isOver=isOver;
}
@@ -280,6 +402,6 @@
return MoneyUtil.add(realMoney,giftMoney);
}
-
-
+
+
}
\ No newline at end of file
--
Gitblit v1.9.1