diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchangeRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchangeRecord.java index 824246136..0fa40a914 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchangeRecord.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/entity/CardExchangeRecord.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; @@ -16,6 +17,7 @@ import java.io.Serializable; * @since 2023-11-06 14:15:07 */ @SuppressWarnings("serial") +@Data public class CardExchangeRecord extends Model { //主键id @TableId(type = IdType.AUTO) @@ -50,7 +52,7 @@ public class CardExchangeRecord extends Model { private String ticketCode; //券来源 private String exchangeFrom; - //使用状态 ：0 ：未使用 1：已使用 + //使用状态 ：0 ：未使用 1：已使用 private String status; //创建者 private String createBy; @@ -74,216 +76,5 @@ public class CardExchangeRecord extends Model { //结束时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date endTime; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getCardExchangeId() { - return cardExchangeId; - } - - public void setCardExchangeId(Integer cardExchangeId) { - this.cardExchangeId = cardExchangeId; - } - - public Integer getChainStorId() { - return chainStorId; - } - - public void setChainStorId(Integer chainStorId) { - this.chainStorId = chainStorId; - } - - public Integer getStoreId() { - return storeId; - } - - public void setStoreId(Integer storeId) { - this.storeId = storeId; - } - - public String getGiftName() { - return giftName; - } - - public void setGiftName(String giftName) { - this.giftName = giftName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public Integer getMtStaffId() { - return mtStaffId; - } - - public void setMtStaffId(Integer mtStaffId) { - this.mtStaffId = mtStaffId; - } - - public String getRealName() { - return realName; - } - - public void setRealName(String realName) { - this.realName = realName; - } - - public String getStaffMobile() { - return staffMobile; - } - - public void setStaffMobile(String staffMobile) { - this.staffMobile = staffMobile; - } - - public Integer getMtUserId() { - return mtUserId; - } - - public void setMtUserId(Integer mtUserId) { - this.mtUserId = mtUserId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getMobile() { - return mobile; - } - - public void setMobile(String mobile) { - this.mobile = mobile; - } - - public String getPhoto() { - return photo; - } - - public void setPhoto(String photo) { - this.photo = photo; - } - - public String getExchangeName() { - return exchangeName; - } - - public void setExchangeName(String exchangeName) { - this.exchangeName = exchangeName; - } - - public String getTicketCode() { - return ticketCode; - } - - public void setTicketCode(String ticketCode) { - this.ticketCode = ticketCode; - } - - public String getExchangeFrom() { - return exchangeFrom; - } - - public void setExchangeFrom(String exchangeFrom) { - this.exchangeFrom = exchangeFrom; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - 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 Date getOutTime() { - return outTime; - } - - public void setOutTime(Date outTime) { - this.outTime = outTime; - } - - public Date getCancelTime() { - return cancelTime; - } - - public void setCancelTime(Date cancelTime) { - this.cancelTime = cancelTime; - } - - public Date getStartTime() { - return startTime; - } - - public void setStartTime(Date startTime) { - this.startTime = startTime; - } - - public Date getEndTime() { - return endTime; - } - - public void setEndTime(Date endTime) { - this.endTime = endTime; - } - - /** - * 获取主键值 - * - * @return 主键值 - */ - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java index 0397e7c9c..a557c0822 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java @@ -3,11 +3,8 @@ package com.fuint.business.marketingActivity.cardValue.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.api.ApiController; -import com.baomidou.mybatisplus.extension.api.R; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO; -import com.fuint.business.marketingActivity.cardValue.entity.CardValue; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; import com.fuint.framework.web.BaseController; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueChild.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueChild.java index 0dc8c52af..ec10e3f20 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueChild.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueChild.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; import java.io.Serializable; @@ -17,6 +18,7 @@ import java.io.Serializable; * @since 2023-11-20 17:51:05 */ @SuppressWarnings("serial") +@Data public class CardValueChild extends Model { //主键id @TableId(type = IdType.AUTO) @@ -55,151 +57,5 @@ public class CardValueChild extends Model { //更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - - public String getTimeType() { - return timeType; - } - - public void setTimeType(String timeType) { - this.timeType = timeType; - } - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getCardValueId() { - return cardValueId; - } - - public void setCardValueId(Integer cardValueId) { - this.cardValueId = cardValueId; - } - - public Integer getVouchersId() { - return vouchersId; - } - - public void setVouchersId(Integer vouchersId) { - this.vouchersId = vouchersId; - } - - public String getActiveGift() { - return activeGift; - } - - public void setActiveGift(String activeGift) { - this.activeGift = activeGift; - } - - public String getGiftCardName() { - return giftCardName; - } - - public void setGiftCardName(String giftCardName) { - this.giftCardName = giftCardName; - } - - public String getGiftCardType() { - return giftCardType; - } - - public void setGiftCardType(String giftCardType) { - this.giftCardType = giftCardType; - } - - public String getGiftCardDetail() { - return giftCardDetail; - } - - public void setGiftCardDetail(String giftCardDetail) { - this.giftCardDetail = giftCardDetail; - } - - public Integer getGiftCardTime() { - return giftCardTime; - } - - public void setGiftCardTime(Integer giftCardTime) { - this.giftCardTime = giftCardTime; - } - - public Integer getGiftCardTotal() { - return giftCardTotal; - } - - public void setGiftCardTotal(Integer giftCardTotal) { - this.giftCardTotal = giftCardTotal; - } - - public Integer getValidityZero() { - return validityZero; - } - - public void setValidityZero(Integer validityZero) { - this.validityZero = validityZero; - } - - public Integer getValidityOne() { - return validityOne; - } - - public void setValidityOne(Integer validityOne) { - this.validityOne = validityOne; - } - - public Integer getValidityTwo() { - return validityTwo; - } - - public void setValidityTwo(Integer validityTwo) { - this.validityTwo = validityTwo; - } - - 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; - } - - /** - * 获取主键值 - * - * @return 主键值 - */ - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml index da729b010..a545e12c7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml @@ -81,7 +81,7 @@ and combined_result.recordName = #{cardValueRecord.recordName} - ORDER BY combined_result.createTime + ORDER BY combined_result.createTime desc