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:
齐天大圣 2024-03-12 17:01:07 +08:00
commit f1e58fc93f
3 changed files with 60 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,29 +164,31 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
queryWrapper1.eq(ActiveApplet::getActiveId,activeRecommendDTO.getId()); queryWrapper1.eq(ActiveApplet::getActiveId,activeRecommendDTO.getId());
ActiveApplet activeApplet = activeAppletService.getOne(queryWrapper1); ActiveApplet activeApplet = activeAppletService.getOne(queryWrapper1);
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd"); if (ObjectUtil.isNotEmpty(activeApplet)) {
String formatSt = dateFormat.format(activeRecommendDTO.getActiveStartTime()); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
String formatEd = dateFormat.format(activeRecommendDTO.getActiveEndTime()); String formatSt = dateFormat.format(activeRecommendDTO.getActiveStartTime());
activeApplet.setTime(formatSt+"-" + formatEd+""); String formatEd = dateFormat.format(activeRecommendDTO.getActiveEndTime());
activeApplet.setTime(formatSt + "-" + formatEd + "");
if (ObjectUtils.isNotEmpty(activeRecommendDTO.getPoints())){ if (ObjectUtils.isNotEmpty(activeRecommendDTO.getPoints())){
activeApplet.setPoints(activeRecommendDTO.getPoints()); activeApplet.setPoints(activeRecommendDTO.getPoints());
}
if (ObjectUtils.isNotEmpty(activeRecommendDTO.getGrowthValue())){
activeApplet.setGrowaValue(activeRecommendDTO.getGrowthValue());
}
activeApplet.setType("7");
activeApplet.setName("推荐有礼活动");
//赠送优惠券兑换券实物
String card = "";
if (CollectionUtils.isNotEmpty(activeRecommendDTO.getActiveRecommendChildList())) {
for (ActiveRecommendChild activeRecommendChild : activeRecommendDTO.getActiveRecommendChildList()) {
card += activeRecommendChild.getGiftCardDetail() + "的券，";
} }
if (ObjectUtils.isNotEmpty(activeRecommendDTO.getGrowthValue())){
activeApplet.setGrowaValue(activeRecommendDTO.getGrowthValue());
}
activeApplet.setType("7");
activeApplet.setName("推荐有礼活动");
//赠送优惠券兑换券实物
String card = "";
if (CollectionUtils.isNotEmpty(activeRecommendDTO.getActiveRecommendChildList())) {
for (ActiveRecommendChild activeRecommendChild : activeRecommendDTO.getActiveRecommendChildList()) {
card += activeRecommendChild.getGiftCardDetail() + "的券，";
}
}
activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+activeApplet.getPoints()+"积分，成长值："+activeApplet.getGrowaValue()+"成长值，赠送券为："+card+"。");
activeAppletService.updateById(activeApplet);
} }
activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+activeApplet.getPoints()+"积分，成长值："+activeApplet.getGrowaValue()+"成长值，赠送券为："+card+"。");
activeAppletService.updateById(activeApplet);

14
gasStation-uni/pagesHome/Activity/index.vue
View File

@ -14,7 +14,7 @@
<view class="right-box" v-if="index == 0"> <view class="right-box" v-if="index == 0">
最新活动 最新活动
</view> </view>
<view class="box-img" @click="intoOtherPage(item.name)"> <view class="box-img" @click="intoOtherPage(item.name,item.type)">
<image src="../../static/imgs/xfyl.png" v-if="item.name == '消费有礼活动'"></image> <image src="../../static/imgs/xfyl.png" v-if="item.name == '消费有礼活动'"></image>
<image src="../../static/imgs/zkyx.png" v-if="item.name == '折扣营销活动'"></image> <image src="../../static/imgs/zkyx.png" v-if="item.name == '折扣营销活动'"></image>
<image src="../../static/imgs/mjyh.png" v-if="item.name == '满减营销活动'"></image> <image src="../../static/imgs/mjyh.png" v-if="item.name == '满减营销活动'"></image>
@ -24,7 +24,7 @@
</view> </view>
<view class="box-size"> <view class="box-size">
<view class="box-s-title">{{item.name || "活动标题"}}</view> <view class="box-s-title">{{item.name || "活动标题"}}</view>
<view class="box-s-size">{{item.des || "内容"}}</view> <view class="box-s-size">{{item.discountActiveDescribe || "内容"}}</view>
<!-- <view class="dis-box"> <!-- <view class="dis-box">
<view class="dian"></view> <view class="dian"></view>
<view class="h_size">适用用户：普通会员、银牌会员、V2</view> <view class="h_size">适用用户：普通会员、银牌会员、V2</view>
@ -67,9 +67,9 @@
this.getData(); this.getData();
}, },
methods: { methods: {
intoOtherPage(name) { intoOtherPage(name,type) {
uni.navigateTo({ uni.navigateTo({
url: '/pagesHome/activeIn/index?name=' + name url: '/pagesHome/activeIn/index?name=' + name + '&type=' + type
}) })
}, },
getData() { getData() {
@ -77,12 +77,12 @@
title: '加载中' title: '加载中'
}); });
request({ request({
url: 'business/marketingActivity/activeExchange/applet', // url: 'business/marketingActivity/activeExchange/applet',
// url: 'business/marketingActivity/activeApplet/appletActive', url: 'business/marketingActivity/activeApplet/appletActive',
method: 'get', method: 'get',
params: this.query params: this.query
}).then(res => { }).then(res => {
console.log(res); console.log(res,111);
if (res.code == 200) { if (res.code == 200) {
this.activityList = res.data this.activityList = res.data
uni.hideLoading(); uni.hideLoading();

46
gasStation-uni/pagesHome/activeIn/index.vue
View File

@ -17,7 +17,7 @@
</view> </view>
<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '消费有礼活动'"> <view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '消费有礼活动'">
<view class=" title-box">活动介绍</view> <view class=" title-box">活动介绍</view>
<view class="h_size">{{item.activeDescribe || ""}}</view> <view class="h_size">{{item.discountActiveDescribe || ""}}</view>
<view class="box-bottom"> <view class="box-bottom">
<view class="">活动时间</view> <view class="">活动时间</view>
<view>{{item.time}}</view> <view>{{item.time}}</view>
@ -61,7 +61,7 @@
</view> </view>
<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '满减营销活动'"> <view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '满减营销活动'">
<view class=" title-box">活动介绍</view> <view class=" title-box">活动介绍</view>
<view class="h_size">{{item.fullminusActiveDescribe || ""}}</view> <view class="h_size">{{item.discountActiveDescribe || ""}}</view>
<view class="box-bottom"> <view class="box-bottom">
<view class="">活动时间</view> <view class="">活动时间</view>
<view>{{item.time}}</view> <view>{{item.time}}</view>
@ -106,12 +106,12 @@
</view> </view>
</view> </view>
</view> </view>
<view class="center-box" v-if="title == '新人有礼活动'"> <view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '新人有礼活动'">
<view class=" title-box">活动介绍</view> <view class=" title-box">活动介绍</view>
<view class="h_size">{{datas.newlywedsActiveDescribe || ""}}</view> <view class="h_size">{{item.discountActiveDescribe || ""}}</view>
<view class="box-bottom"> <view class="box-bottom">
<view class="">活动时间</view> <view class="">活动时间</view>
<view>{{datas.time || ''}}</view> <view>{{item.time || ''}}</view>
</view> </view>
<!-- <view class="title-box">参与油品</view> --> <!-- <view class="title-box">参与油品</view> -->
<!-- <view class="w_box"> <!-- <view class="w_box">
@ -124,20 +124,19 @@
</view> --> </view> -->
<view class="dis-box"> <view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view> <view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{datas.point || ''}}积分</view> <view class="h_size">赠送{{item.points || ''}}积分</view>
</view> </view>
<view class="dis-box"> <view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view> <view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{datas.growValue || ''}}成长值</view> <view class="h_size">赠送{{item.growaValue || ''}}成长值</view>
</view> </view>
</view> </view>
</view> </view>
<view class="center-box" v-if="title == '推荐有礼活动'"> <view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '推荐有礼活动'">
<view class=" title-box">活动介绍</view> <view class=" title-box">活动介绍</view>
<view class="h_size">{{datas.recommendActiveDescribeIn || ""}}</view> <view class="h_size">{{item.discountActiveDescribe || ""}}</view>
<view class="h_size">{{datas.recommendActiveDescribeOut || ""}}</view>
<view class="box-bottom"> <view class="box-bottom">
<view class="">活动时间：{{datas.time}}</view> <view class="">活动时间：{{item.time}}</view>
</view> </view>
<!-- <view class="title-box">参与油品</view> <!-- <view class="title-box">参与油品</view>
<view class="w_box"> <view class="w_box">
@ -150,11 +149,11 @@
</view> --> </view> -->
<view class="dis-box"> <view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view> <view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{datas.point || ''}}积分</view> <view class="h_size">赠送{{item.points || ''}}积分</view>
</view> </view>
<view class="dis-box"> <view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view> <view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{datas.growValue || ''}}成长值</view> <view class="h_size">赠送{{item.growaValue || ''}}成长值</view>
</view> </view>
</view> </view>
</view> </view>
@ -196,7 +195,6 @@
oilName: [], oilName: [],
title: '', title: '',
datas: [], datas: [],
} }
}, },
components: { components: {
@ -206,7 +204,8 @@
this.query.storeId = uni.getStorageSync("storeId"); this.query.storeId = uni.getStorageSync("storeId");
this.title = option.name this.title = option.name
console.log(option.name); console.log(option.name);
this.getData(option.name); this.getInfo(option.type)
// this.getData(option.name);
}, },
methods: { methods: {
goTopup() { goTopup() {
@ -245,6 +244,23 @@
url: '/pagesHome/oilRecharge/oilRecharge' url: '/pagesHome/oilRecharge/oilRecharge'
}) */ }) */
}, },
getInfo(type){
uni.showLoading({
title: '加载中'
});
this.query.type = type
request({
url: 'business/marketingActivity/activeApplet/appletActiveByType',
method: 'get',
params: this.query
}).then(res => {
if (res.code == 200) {
this.datas = res.data,
uni.hideLoading();
}
})
},
getData(name) { getData(name) {
uni.showLoading({ uni.showLoading({
//title: '加载中' //title: '加载中'