diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java index 20ac5bca4..ce6d23976 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java @@ -186,6 +186,9 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/controller/ActiveExchangeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/controller/ActiveExchangeController.java index 9896610a4..1fb6ac16b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/controller/ActiveExchangeController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/controller/ActiveExchangeController.java @@ -1,8 +1,8 @@ package com.fuint.business.marketingActivity.activeExchange.controller; import com.fuint.business.marketingActivity.activeExchange.dto.ActiveExchangeRecordDTO; -import com.fuint.business.marketingActivity.activeExchange.service.ActiveExchangeService; import com.fuint.business.marketingActivity.activeExchange.dto.TransferDTO; +import com.fuint.business.marketingActivity.activeExchange.service.ActiveExchangeService; import com.fuint.business.marketingActivity.cardExchange.entity.CardExchangeRecord; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java index 8d079c097..baedf70e9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java @@ -1,8 +1,8 @@ package com.fuint.business.marketingActivity.activeExchange.service; import com.fuint.business.marketingActivity.activeExchange.dto.ActiveExchangeRecordDTO; -import com.fuint.business.marketingActivity.activeExchange.vo.ActiveExchangeRecordVO; import com.fuint.business.marketingActivity.activeExchange.dto.TransferDTO; +import com.fuint.business.marketingActivity.activeExchange.vo.ActiveExchangeRecordVO; import com.fuint.business.marketingActivity.activeExchange.vo.ExchangeFavorableVO; import com.fuint.business.marketingActivity.activeExchange.vo.MaxoutVO; import com.fuint.business.marketingActivity.cardExchange.entity.CardExchangeRecord; @@ -12,7 +12,7 @@ import java.util.List; public interface ActiveExchangeService { /** * 分页查询所有数据 - * @param page + * @param * @param cardExchangeRecord * @return */ @@ -29,7 +29,7 @@ public interface ActiveExchangeService { * 查询满减活动 * @param pageNo * @param pageSize - * @param transferVO + * @param transferDTO * @return */ List selectConsumptionList(Integer pageNo, Integer pageSize, TransferDTO transferDTO); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 69447975d..9a60f3d89 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -19,7 +19,6 @@ import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorable; import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord; import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService; import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableService; -import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableVO; import com.fuint.business.userManager.service.LJUserGradeService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.BeanUtils; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/ExchangeFavorableVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/ExchangeFavorableVO.java index 96e013007..51d8720f4 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/ExchangeFavorableVO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/ExchangeFavorableVO.java @@ -3,7 +3,6 @@ package com.fuint.business.marketingActivity.activeExchange.vo; import java.io.Serializable; public class ExchangeFavorableVO implements Serializable { - //主键id private Integer id; //优惠券名称 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java index 4a76bc90b..ffa87b46e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java @@ -176,6 +176,10 @@ public class ActiveFullminusServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java index 49aa3e2b3..dfab00326 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java @@ -151,6 +151,9 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java index 204f5ddcd..71295197c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java @@ -74,6 +74,9 @@ public class CardExchangeController extends BaseController { */ @PutMapping public ResponseObject update(@RequestBody CardExchange cardExchange) { + if (cardExchange.getIsonline().equals("1")){ + cardExchange.setStatus("1"); + } return getSuccessResult(this.cardExchangeService.updateById(cardExchange)); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java index c7bfa3b89..bfabc2389 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java @@ -113,7 +113,7 @@ public class CardFavorableServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueDTO.java index 109e21069..f699fdf38 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueDTO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueDTO.java @@ -65,7 +65,7 @@ public class CardValueDTO extends Model { //面向群体 1:普通群体 2:等级会员 private String groupOriented; //会员等级 会员等级 0:新人会员 1:V1会员 2:V2会员..... - private String membershipLevel; + private String[] membershipLevel; //排序 (数值越大,顺序越在前) private Integer sort; //新人有礼卡券列表 @@ -85,6 +85,14 @@ public class CardValueDTO extends Model { return cardValueChildList; } + public String[] getMembershipLevel() { + return membershipLevel; + } + + public void setMembershipLevel(String[] membershipLevel) { + this.membershipLevel = membershipLevel; + } + public void setCardValueChildList(List cardValueChildList) { this.cardValueChildList = cardValueChildList; } @@ -282,14 +290,6 @@ public class CardValueDTO extends Model { this.groupOriented = groupOriented; } - public String getMembershipLevel() { - return membershipLevel; - } - - public void setMembershipLevel(String membershipLevel) { - this.membershipLevel = membershipLevel; - } - public Integer getSort() { return sort; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueVO.java index b4d7ad3c8..dd74e3519 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueVO.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueVO.java @@ -64,7 +64,7 @@ public class CardValueVO extends Model { //面向群体 1:普通群体 2:等级会员 private String groupOriented; //会员等级 会员等级 0:新人会员 1:V1会员 2:V2会员..... - private String membershipLevel; + private String[] membershipLevel; //排序 (数值越大,顺序越在前) private Integer sort; //新人有礼卡券列表 @@ -80,6 +80,14 @@ public class CardValueVO extends Model { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; + public String[] getMembershipLevel() { + return membershipLevel; + } + + public void setMembershipLevel(String[] membershipLevel) { + this.membershipLevel = membershipLevel; + } + public Integer getId() { return id; } @@ -272,14 +280,6 @@ public class CardValueVO extends Model { this.groupOriented = groupOriented; } - public String getMembershipLevel() { - return membershipLevel; - } - - public void setMembershipLevel(String membershipLevel) { - this.membershipLevel = membershipLevel; - } - public Integer getSort() { return sort; }