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

本站活动

Browse Source
This commit is contained in:
齐天大圣 2024-01-20 13:55:05 +08:00
parent ba181d2ce7
commit 83a0e8367a
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,7 +389,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
}
//新人有礼
ActiveNewlywedsAppletVO activeNewlywedsAppletVO = activeNewlywedsService.selectApplet(consumption);
if (ObjectUtils.isNotEmpty(activeNewlywedsAppletVO)){
if (ObjectUtils.isNotEmpty(activeNewlywedsAppletVO) && ObjectUtils.isNotEmpty(activeNewlywedsAppletVO.getNewlywedsActiveDescribe())){
ActiveAppletVO activeAppletVO = new ActiveAppletVO();
activeAppletVO.setName("新人有礼活动");
activeAppletVO.setDes(activeNewlywedsAppletVO.getNewlywedsActiveDescribe());
@ -403,7 +403,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
}
//推荐有礼
ActiveRecommendAppletVO activeRecommendAppletVO = activeRecommendService.selectApplet(consumption);
if (ObjectUtils.isNotEmpty(activeRecommendAppletVO)){
if (ObjectUtils.isNotEmpty(activeRecommendAppletVO) && ObjectUtils.isNotEmpty(activeRecommendAppletVO.getRecommendActiveDescribeIn())){
ActiveAppletVO activeAppletVO = new ActiveAppletVO();
activeAppletVO.setName("推荐有礼活动");
activeAppletVO.setDes(activeRecommendAppletVO.getRecommendActiveDescribeIn());

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java
View File

@ -243,9 +243,16 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
if (ObjectUtils.isNotEmpty(activeRecommendVO.getGrowthValue())){
activeRecommendAppletVO.setGrowValue(activeRecommendVO.getGrowthValue().toString());
}
activeRecommendAppletVO.setRecommendActiveDescribeIn("欢迎各位亲朋好友来参加本店的推荐有礼活动，对于邀请人，参加即送：优惠券："+cardi1+"兑换券："+cardo1);
//被邀请人的券
activeRecommendAppletVO.setRecommendActiveDescribeOut("对于被邀请人，参加即送：优惠券："+cardi2);
if (ObjectUtils.isEmpty(cardi1)){
activeRecommendAppletVO.setRecommendActiveDescribeIn("");
}
if (ObjectUtils.isEmpty(cardi2)){
activeRecommendAppletVO.setRecommendActiveDescribeOut("");
}
return activeRecommendAppletVO;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
View File

@ -324,7 +324,7 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
cardValueAppletVO.setPoints(s.getPoints());
cardValueAppletVO.setGrowaValue(s.getGrowthValue());
cardValueAppletVO.setDiscountActiveDescribe("本充值活动,充值满"+
s.getBidBalance()+"元，赠送金额为："+s.getGiftBalance()+"元，赠送券："+card+"。");
s.getRechargeBalance()+"元，赠送金额为："+s.getGiftBalance()+"元，赠送券："+card+"。");
return cardValueAppletVO;
}).collect(Collectors.toList());
return appletVOList;