From 2b6d0a3a73f5bb7c434ddc708b3468c9798edb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com> Date: Fri, 5 Jan 2024 15:11:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardValue/entity/CardValue.java | 254 +----------------- .../service/impl/CardValueServiceImpl.java | 8 +- .../member/controller/LJStaffController.java | 3 +- .../pagesHome/oilRecharge/oilRecharge.vue | 13 +- 4 files changed, 18 insertions(+), 260 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValue.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValue.java index 7ec93b509..36045b526 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValue.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValue.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-10-31 09:42:02 */ @SuppressWarnings("serial") +@Data public class CardValue extends Model { //主键id @TableId(type = IdType.AUTO) @@ -82,257 +84,5 @@ public class CardValue extends Model { //更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; - - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getChainStoreId() { - return chainStoreId; - } - - public void setChainStoreId(Integer chainStorId) { - this.chainStoreId = chainStoreId; - } - - public Integer getStoreId() { - return storeId; - } - - public void setStoreId(Integer storeId) { - this.storeId = storeId; - } - - public String getIsonline() { - return isonline; - } - - public void setIsonline(String isonline) { - this.isonline = isonline; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public Double getBidBalance() { - return bidBalance; - } - - public void setBidBalance(Double bidBalance) { - this.bidBalance = bidBalance; - } - - public Double getRechargeBalance() { - return rechargeBalance; - } - - public void setRechargeBalance(Double rechargeBalance) { - this.rechargeBalance = rechargeBalance; - } - - public Double getGiftBalance() { - return giftBalance; - } - - public void setGiftBalance(Double giftBalance) { - this.giftBalance = giftBalance; - } - - public Integer getPoints() { - return points; - } - - public void setPoints(Integer points) { - this.points = points; - } - - public Integer getGrowthValue() { - return growthValue; - } - - public void setGrowthValue(Integer growthValue) { - this.growthValue = growthValue; - } - - public Integer getRefuelMoney() { - return refuelMoney; - } - - public void setRefuelMoney(Integer refuelMoney) { - this.refuelMoney = refuelMoney; - } - - - public String getFringeBenefit() { - return fringeBenefit; - } - - public void setFringeBenefit(String fringeBenefit) { - this.fringeBenefit = fringeBenefit; - } - - public Integer getParticipationNo() { - return participationNo; - } - - public void setParticipationNo(Integer participationNo) { - this.participationNo = participationNo; - } - - public String getEmployeeCommission() { - return employeeCommission; - } - - public void setEmployeeCommission(String employeeCommission) { - this.employeeCommission = employeeCommission; - } - - public String getRoyaltyType() { - return royaltyType; - } - - public void setRoyaltyType(String royaltyType) { - this.royaltyType = royaltyType; - } - - public Double getPercentageCommissions() { - return percentageCommissions; - } - - public void setPercentageCommissions(Double percentageCommissions) { - this.percentageCommissions = percentageCommissions; - } - - public Double getAmountCommission() { - return amountCommission; - } - - public void setAmountCommission(Double amountCommission) { - this.amountCommission = amountCommission; - } - - public String getActiveTime() { - return activeTime; - } - - public void setActiveTime(String activeTime) { - this.activeTime = activeTime; - } - - public String getActivityProgress() { - return activityProgress; - } - - public void setActivityProgress(String activityProgress) { - this.activityProgress = activityProgress; - } - - 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; - } - - public String getActiveStatus() { - return activeStatus; - } - - public void setActiveStatus(String activeStatus) { - this.activeStatus = activeStatus; - } - - public String getPaymentValue() { - return paymentValue; - } - - public void setPaymentValue(String paymentValue) { - this.paymentValue = paymentValue; - } - - public String getGroupOriented() { - return groupOriented; - } - - public void setGroupOriented(String groupOriented) { - this.groupOriented = groupOriented; - } - - public String getMembershipLevel() { - return membershipLevel; - } - - public void setMembershipLevel(String membershipLevel) { - this.membershipLevel = membershipLevel; - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - 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/service/impl/CardValueServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java index 0af1c3bdd..625b2a820 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java @@ -100,17 +100,17 @@ public class CardValueServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); //构建查询条件 if (ObjectUtils.isNotEmpty(cardValue.getIsonline())){ - queryWrapper.eq(CardValue::getIsonline,cardValue.getIsonline()); + queryWrapper.eq(CardValue::getIsonline,"0"); } if (ObjectUtils.isNotEmpty(cardValue.getActiveStatus())){ - queryWrapper.eq(CardValue::getActiveStatus,cardValue.getActiveStatus()); + queryWrapper.eq(CardValue::getActiveStatus,"1"); } if (ObjectUtils.isNotEmpty(cardValue.getStoreId())){ queryWrapper.eq(CardValue::getStoreId,cardValue.getStoreId()); } queryWrapper.orderByDesc(CardValue::getCreateTime); IPage page1 = page(page, queryWrapper); - List records = page1.getRecords(); + /*List records = page1.getRecords(); CardValueVOs cardValueVO = new CardValueVOs(); ArrayList cardValueVOs = new ArrayList<>(); //返回储值卡活动进度状态 @@ -137,7 +137,7 @@ public class CardValueServiceImpl extends ServiceImpl { this.columns.push(res.data.records) console.log("columns", this.columns);