dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
@QQNZX 2023-11-21 15:58:09 +08:00
commit f6e71dac8d
13 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
View File

@ -186,6 +186,9 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
activeConsumption.setGasolineUserLevel(arrayToString(activeConsumptionDTO.getGasolineUserLevel()));
//天然气会员等级
activeConsumption.setNaturalUserLevel(arrayToString(activeConsumptionDTO.getNaturalUserLevel()));
if (activeConsumptionDTO.getIsonline().equals("1")){
activeConsumption.setStatus("1");
}
//更新子表数据
update = updateById(activeConsumption);

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java
View File

@ -183,6 +183,9 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
activeDiscount.setNaturalUserLevel(arrayToString(activeDiscountDTO.getNaturalUserLevel()));
activeDiscount.setAdaptOil(arrayToString(activeDiscountDTO.getAdaptOil()));
if (activeDiscountDTO.getIsonline().equals("1")){
activeDiscount.setStatus("1");
}
update = updateById(activeDiscount);
//更新子表数据
LambdaQueryWrapper<ActiveDiscountChild> queryWrapper = new LambdaQueryWrapper<>();

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/controller/ActiveExchangeController.java
View File

@ -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;

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java
View File

@ -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<MaxoutVO> selectConsumptionList(Integer pageNo, Integer pageSize, TransferDTO transferDTO);

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -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;

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/vo/ExchangeFavorableVO.java
View File

@ -3,7 +3,6 @@ package com.fuint.business.marketingActivity.activeExchange.vo;
import java.io.Serializable;
public class ExchangeFavorableVO implements Serializable {
//主键id
private Integer id;
//优惠券名称

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java
View File

@ -176,6 +176,10 @@ public class ActiveFullminusServiceImpl extends ServiceImpl<ActiveFullminusMappe
activeFullminus.setNaturalUserLevel(arrayToString(activeFullminusDTO.getNaturalUserLevel()));
activeFullminus.setAdaptOil(arrayToString(activeFullminusDTO.getAdaptOil()));
if (activeFullminusDTO.getIsonline().equals("1")){
activeFullminus.setStatus("1");
}
updateById(activeFullminus);
//更新子表数据
LambdaQueryWrapper<ActiveDiscountChild> queryWrapper = new LambdaQueryWrapper<>();

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
View File

@ -151,6 +151,9 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
//奖励类型
activeNewlyweds.setCourtesyReward(arrayToString(activeNewlywedsDTO.getCourtesyReward()));
if (activeNewlywedsDTO.getIsonline().equals("1")){
activeNewlyweds.setStatus("2");
}
update = updateById(activeNewlyweds);
//更新子表数据
LambdaQueryWrapper<ActiveNewlywedsChild> queryWrapper = new LambdaQueryWrapper<>();

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/controller/CardExchangeController.java
View File

@ -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));
}

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableServiceImpl.java
View File

@ -113,7 +113,7 @@ public class CardFavorableServiceImpl extends ServiceImpl<CardFavorableMapper, C
/**
* 修改数据
* @param cardFavorable
* @param cardFavorableDTO
* @return
*/
@Override
@ -137,6 +137,9 @@ public class CardFavorableServiceImpl extends ServiceImpl<CardFavorableMapper, C
checkTime += s + ",";
}
cardFavorable.setCheckTime(checkTime);
if (cardFavorableDTO.getIsonline().equals("1")){
cardFavorable.setStatus("1");
}
return updateById(cardFavorable);
}
}

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
View File

@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.activeNewlyweds.controller.vo.ActiveNewlywedsVO;
import com.fuint.business.marketingActivity.activeNewlyweds.entity.ActiveNewlyweds;
import com.fuint.business.marketingActivity.activeNewlyweds.entity.ActiveNewlywedsChild;
import com.fuint.business.marketingActivity.cardValue.dto.CardValueDTO;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueChild;
@ -119,6 +116,7 @@ public class CardValueController extends BaseController {
if (CollectionUtils.isNotEmpty(activeNewlywedsChildList)){
//封装VO返回
BeanUtils.copyProperties(cardValue,cardValueVO);
cardValueVO.setMembershipLevel(cardValue.getMembershipLevel().split(","));
cardValueVO.setCardValueChildList(activeNewlywedsChildList);
}
}
@ -145,6 +143,8 @@ public class CardValueController extends BaseController {
CardValue cardValue = new CardValue();
cardValue.setStartTime(new Date());
cardValue.setEndTime(new Date());
//柴油会员等级
cardValue.setMembershipLevel(arrayToString(cardValueDTO.getMembershipLevel()));
if (ObjectUtils.isNotEmpty(cardValueDTO)){
BeanUtils.copyProperties(cardValueDTO,cardValue);
save = this.cardValueService.save(cardValue);
@ -181,7 +181,9 @@ public class CardValueController extends BaseController {
//更新新人有礼活动
CardValue cardValue = new CardValue();
BeanUtils.copyProperties(cardValueDTO,cardValue);
if (cardValueDTO.getIsonline().equals("1")){
cardValue.setActiveStatus("2");
}
update =this.cardValueService.updateById(cardValue);
//更新子表数据
LambdaQueryWrapper<CardValueChild> queryWrapper = new LambdaQueryWrapper<>();

18
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueDTO.java
View File

@ -65,7 +65,7 @@ public class CardValueDTO extends Model<CardValue> {
//面向群体 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<CardValue> {
return cardValueChildList;
}
public String[] getMembershipLevel() {
return membershipLevel;
}
public void setMembershipLevel(String[] membershipLevel) {
this.membershipLevel = membershipLevel;
}
public void setCardValueChildList(List<CardValueChild> cardValueChildList) {
this.cardValueChildList = cardValueChildList;
}
@ -282,14 +290,6 @@ public class CardValueDTO extends Model<CardValue> {
this.groupOriented = groupOriented;
}
public String getMembershipLevel() {
return membershipLevel;
}
public void setMembershipLevel(String membershipLevel) {
this.membershipLevel = membershipLevel;
}
public Integer getSort() {
return sort;
}

18
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueVO.java
View File

@ -64,7 +64,7 @@ public class CardValueVO extends Model<CardValue> {
//面向群体 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<CardValue> {
@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<CardValue> {
this.groupOriented = groupOriented;
}
public String getMembershipLevel() {
return membershipLevel;
}
public void setMembershipLevel(String membershipLevel) {
this.membershipLevel = membershipLevel;
}
public Integer getSort() {
return sort;
}