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-13 16:16:14 +08:00
commit 8b69eae4bb
11 changed files with 93 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue
View File

@ -290,9 +290,16 @@
size="mini"
type="text"
icon="el-icon-sort-up"
@click="handleDeletexia(scope.row)"
@click="handleDeletexia(scope.row,0)"
v-if="scope.row.isonline == 1"
>上线</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-sort-up"
@click="handleDeletexia(scope.row,1)"
v-if="scope.row.isonline == 0"
>下线</el-button>
<el-button
size="mini"
type="text"
@ -898,7 +905,7 @@ export default {
this.title = "编辑";
});
},
handleDeletexia(row){
handleDeletexia(row,isonline){
// getActiveNewlyweds(row.id).then(response => {
//
// let data = response.data
@ -911,7 +918,7 @@ export default {
//
// });
this.$modal.confirm('确定上线此条新人有礼活动信息？').then(function() {
return editActiveNewlyweds({id:row.id,isonline:0});
return editActiveNewlyweds({id:row.id,isonline:isonline});
}).then(() => {
this.$modal.msgSuccess("上线成功");
this.open = false;

13
fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue
View File

@ -96,9 +96,16 @@
size="mini"
type="text"
icon="el-icon-sort-up"
@click="handleDeletexia(scope.row)"
@click="handleDeletexia(scope.row,0)"
v-if="scope.row.isonline == 1"
>上线</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-sort-up"
@click="handleDeletexia(scope.row,1)"
v-if="scope.row.isonline == 0"
>下线</el-button>
<el-button
size="mini"
type="text"
@ -1166,7 +1173,7 @@ export default {
});
},
handleDeletexia(row){
handleDeletexia(row,isonline){
// getActiveRecommend(row.id).then(response => {
//
// let data = response.data
@ -1181,7 +1188,7 @@ export default {
// });
this.$modal.confirm('是否确认上线此条推荐有礼活动的信息？').then(function() {
return editActiveRecommend({id:row.id,isonline : 0});
return editActiveRecommend({id:row.id,isonline : isonline});
}).then(() => {
this.$modal.msgSuccess("上线成功");

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/mapper/xml/ActiveAppletMapper.xml
View File

@ -13,7 +13,7 @@
store_id = #{activeApplet.storeId}
GROUP BY
type
ORDER BY create_time desc
ORDER BY create_time,type desc
</select>
<select id="appletActiveByType"

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

@ -182,7 +182,8 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
type ="实付金额";
}
activeApplet.setDiscountActiveDescribe("此项消费有礼活动,"+type+"满"+
activeConsumption.getParticipationConditionMoney()+"元可参与，赠送积分为："+activeConsumption.getPoints()+"积分,赠送券："+card+"。");
activeConsumption.getParticipationConditionMoney()+"元可参与，赠送积分为："+activeConsumption.getPoints()+"积分,赠送券："+
(ObjectUtil.isNotEmpty(card) ? card : "无")+"。");
activeAppletService.save(activeApplet);
//新增兑换物品
@ -421,7 +422,8 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
type ="实付金额";
}
activeApplet.setDiscountActiveDescribe("此项消费有礼活动,"+type+"满"+
activeConsumptionDTO.getParticipationConditionMoney()+"元可参与，赠送积分为："+activeConsumptionDTO.getPoints()+"积分,赠送券："+card+"。");
activeConsumptionDTO.getParticipationConditionMoney()+"元可参与，赠送积分为："+
activeConsumptionDTO.getPoints()+"积分,赠送券："+(ObjectUtil.isNotEmpty(card) ? card : "无")+"。");
activeAppletService.updateById(activeApplet);
//更新消费有礼

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

@ -125,7 +125,9 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
card += activeNewlywedsChild.getGiftCardDetail() + "的券，";
}
}
activeApplet.setDiscountActiveDescribe("此项新人有礼活动，登录赠送积分为："+activeNewlywedsDTO.getPoints()+"积分，赠送成长值为："+activeNewlywedsDTO.getGrowthValue()+"成长值，赠送券为："+card+"。");
activeApplet.setDiscountActiveDescribe("此项新人有礼活动，登录赠送积分为："+activeNewlywedsDTO.getPoints()+
"积分，赠送成长值为："+activeNewlywedsDTO.getGrowthValue()+"成长值，赠送券为："+
(ObjectUtil.isNotEmpty(card) ? card : "无")+"。");
activeAppletService.save(activeApplet);
//新增兑换物品
@ -556,7 +558,8 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
for (ActiveNewlyweds newlyweds : activeNewlywedsList) {
if (newlyweds.getId().equals(id)){
ActiveNewlyweds activeNewlyweds = baseMapper.selectById(id);
activeNewlyweds.setStatus("0");
if (isonline.equals("0")) activeNewlyweds.setStatus("0");
if (isonline.equals("1")) activeNewlyweds.setStatus("1");
activeNewlyweds.setIsonline(isonline);
row = baseMapper.updateById(activeNewlyweds);

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

@ -131,7 +131,10 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
card += activeRecommendChild.getGiftCardDetail() + "的券，";
}
}
activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+activeApplet.getPoints()+"积分，成长值："+activeApplet.getGrowaValue()+"成长值，赠送券为："+card+"。");
activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+
(ObjectUtil.isNotEmpty(activeApplet.getPoints()) ? activeApplet.getPoints() : 0)+"积分，成长值："+
(ObjectUtil.isNotEmpty(activeApplet.getGrowaValue()) ? activeApplet.getGrowaValue() : 0)+"成长值，赠送券为："+
(ObjectUtil.isNotEmpty(card) ? card : "无")+"。");
activeAppletService.save(activeApplet);
//礼品
@ -186,7 +189,10 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
card += activeRecommendChild.getGiftCardDetail() + "的券，";
}
}
activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+activeApplet.getPoints()+"积分，成长值："+activeApplet.getGrowaValue()+"成长值，赠送券为："+card+"。");
activeApplet.setDiscountActiveDescribe("此项推荐有礼活动，推荐即可获得积分："+
(ObjectUtil.isNotEmpty(activeApplet.getPoints()) ? activeApplet.getPoints() : 0)+"积分，成长值："+
(ObjectUtil.isNotEmpty(activeApplet.getGrowaValue()) ? activeApplet.getGrowaValue() : 0)+"成长值，赠送券为："+
(ObjectUtil.isNotEmpty(card) ? card : "无")+"。");
activeAppletService.updateById(activeApplet);
}
@ -339,7 +345,8 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
for (ActiveRecommend recommend : activeRecommendList) {
if(recommend.getId().equals(id)){
ActiveRecommend activeRecommend = baseMapper.selectById(id);
activeRecommend.setStatus("0");
if (isonline.equals("0")) activeRecommend.setStatus("0");
if (isonline.equals("1")) activeRecommend.setStatus("1");
activeRecommend.setIsonline(isonline);
row = baseMapper.updateById(activeRecommend);
LambdaQueryWrapper<ActiveApplet> queryWrapper1 = new LambdaQueryWrapper<>();
@ -465,9 +472,11 @@ public class ActiveRecommendServiceImpl extends ServiceImpl<ActiveRecommendMappe
activeRecommendAppletVO.setGrowValue(activeRecommendVO.getGrowthValue().toString());
}
activeRecommendAppletVO.setRecommendActiveDescribeIn("欢迎各位亲朋好友来参加本店的推荐有礼活动，对于邀请人，参加即送：优惠券："+cardi1+"兑换券："+cardo1);
activeRecommendAppletVO.setRecommendActiveDescribeIn("欢迎各位亲朋好友来参加本店的推荐有礼活动，对于邀请人，参加即送：优惠券："+
(ObjectUtil.isNotEmpty(cardi1) ? cardi1 : "无")+"兑换券："+(ObjectUtil.isNotEmpty(cardo1) ? cardo1 : "无"));
//被邀请人的券
activeRecommendAppletVO.setRecommendActiveDescribeOut("对于被邀请人，参加即送：优惠券："+cardi2);
activeRecommendAppletVO.setRecommendActiveDescribeOut("对于被邀请人，参加即送：优惠券："+
(ObjectUtil.isNotEmpty(cardo1) ? cardi2 : "无"));
if (ObjectUtils.isEmpty(cardi1)){
activeRecommendAppletVO.setRecommendActiveDescribeIn("");
}

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

@ -157,14 +157,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
}
CardValueVO cardValue = new CardValueVO();
//自定义
if (ObjectUtils.isNotEmpty(cardValueRecordDTO.getTypes()) && cardValueRecordDTO.getTypes().equals("1")){
cardValueOrders.setRechargeType("1");
cardValueOrders.setBidBalance(cardValueRecordDTO.getBalance());
cardValueOrders.setRechargeBalance(cardValueRecordDTO.getBalance());
//支付金额
cardValueOrders.setAmount(cardValueRecordDTO.getBalance());
cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());
}else if(ObjectUtils.isNotEmpty(cardValueRecordDTO.getTypes()) && cardValueRecordDTO.getTypes().equals("0") && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
if(ObjectUtils.isNotEmpty(cardValueRecordDTO.getTypes()) && cardValueRecordDTO.getTypes().equals("1")
&& ObjectUtils.isNotEmpty(cardValueRecordDTO.getId())){
//查询储值卡信息
cardValue = cardValueService.getOneById(cardValueRecordDTO.getId());
@ -180,6 +174,13 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
if (ObjectUtils.isNotEmpty(cardValue.getFringeBenefit())){
cardValueOrders.setFringeBenefit(cardValue.getFringeBenefit());
}
}else if (ObjectUtils.isNotEmpty(cardValueRecordDTO.getTypes()) && cardValueRecordDTO.getTypes().equals("1")){
cardValueOrders.setRechargeType("1");
cardValueOrders.setBidBalance(cardValueRecordDTO.getBalance());
cardValueOrders.setRechargeBalance(cardValueRecordDTO.getBalance());
//支付金额
cardValueOrders.setAmount(cardValueRecordDTO.getBalance());
cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());
}else {
//查询储值卡信息
cardValue = cardValueService.getOneById(cardValueRecordDTO.getId());
@ -262,7 +263,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
}
if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance()) && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
//订单金额
BigDecimal add = BigDecimal.valueOf(cardValue.getRechargeBalance()).add(BigDecimal.valueOf(cardValue.getGiftBalance()));
BigDecimal add = BigDecimal.valueOf(cardValue.getGiftBalance());
cardValueOrders.setAmount(add.doubleValue() + cardValueRecordDTO.getBalance());
//支付金额
cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());

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

@ -1,5 +1,6 @@
package com.fuint.business.marketingActivity.cardValue.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -333,7 +334,8 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
activeApplet.setType("1");
activeApplet.setName("储值卡充值活动");
activeApplet.setDiscountActiveDescribe("本充值活动,充值满"+
cardValue.getRechargeBalance()+"元，赠送金额为："+cardValue.getGiftBalance()+"元，赠送券："+card+"。");
cardValue.getRechargeBalance()+"元，赠送金额为："+cardValue.getGiftBalance()+"元，赠送券："+
(ObjectUtil.isNotEmpty(card) ? card : "无")+"。");
//新增兑换物品
List<CardValueChild> cardValueChildList = cardValueDTO.getCardValueChildList();
cardValueChildList.stream().map(s ->{
@ -418,13 +420,14 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
}
activeApplet.setAdaptUserType(str);
activeApplet.setId(one.getId());
if (ObjectUtil.isNotEmpty(one)) activeApplet.setId(one.getId());
activeApplet.setGrowaValue(cardValue.getGrowthValue());
activeApplet.setPoints(cardValue.getPoints());
activeApplet.setType("1");
activeApplet.setName("储值卡充值活动");
activeApplet.setDiscountActiveDescribe("本充值活动,充值满"+
cardValue.getRechargeBalance()+"元，赠送金额为："+cardValue.getGiftBalance()+"元，赠送券："+card+"。");
cardValue.getRechargeBalance()+"元，赠送金额为："+cardValue.getGiftBalance()+"元，赠送券："+
(ObjectUtil.isNotEmpty(card) ? card : "无")+"。");
activeAppletService.updateById(activeApplet);
return update;
}

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

@ -21,6 +21,7 @@
<image src="../../static/imgs/xryl.png" v-if="item.name == '新人有礼活动'"></image>
<image src="../../static/imgs/yqyl.png" v-if="item.name == '推荐有礼活动'"></image>
<image src="../../static/imgs/chongzhi.png" v-if="item.name == '储值卡充值活动'"></image>
<image src="../../static/imgs/oilCard.png" v-if="item.name == '囤油卡充值活动'"></image>
</view>
<view class="box-size">
<view class="box-s-title">{{item.name || "活动标题"}}</view>
@ -40,6 +41,7 @@
</view>
</view>
</view>
<u-empty v-if="activityList.length == 0" mode="data" text="暂未设置,请敬请期待"></u-empty>
<!-- 顶部区域 -->

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

@ -14,6 +14,7 @@
<image src="../../static/imgs/xryl.png" v-if="title == '新人有礼活动'"></image>
<image src="../../static/imgs/yqyl.png" v-if="title == '推荐有礼活动'"></image>
<image src="../../static/imgs/chongzhi.png" v-if="title == '储值卡充值活动'"></image>
<image src="../../static/imgs/oilCard.png" v-if="title == '囤油卡充值活动'"></image>
</view>
<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '消费有礼活动'">
<view class=" title-box">活动介绍</view>
@ -106,6 +107,31 @@
</view>
</view>
</view>
<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '囤油卡充值活动'">
<view class=" title-box">活动介绍</view>
<view class="h_size">{{item.discountActiveDescribe || ""}}</view>
<view class="box-bottom">
<view class="">活动时间：{{item.time}}</view>
</view>
<!-- <view class="title-box">参与油品</view>
<view class="w_box">
<view class="w_oil" v-for="(item,index) in 3" :key="index">#95</view>
</view> -->
<view class="h_bottom">
<view class="dis-box" v-if="item.adaptUserType">
<view class="dian"></view>
<view class="h_size">参与会员：{{item.adaptUserType}}</view>
</view>
<view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">获得折扣：赠送{{item.points || 0}}积分</view>
</view>
<view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">获得折扣：赠送{{item.growaValue || 0}}成长值</view>
</view>
</view>
</view>
<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '新人有礼活动'">
<view class=" title-box">活动介绍</view>
<view class="h_size">{{item.discountActiveDescribe || ""}}</view>

6
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -592,9 +592,11 @@
getindex(index) {
// this.actinput = index
this.types = index
// if (index == 0) {
if (index == 0) {
// this.getValueCars();
// }
if (this.cardValueList.length>0)
this.xzindex(0,this.cardValueList[0].rechargeBalance,this.cardValueList[0].fringeBenefit,this.cardValueList[0].giftBalance,this.cardValueList[0].points,this.cardValueList[0].growthValue,this.cardValueList[0].count,this.cardValueList[0].id)
}
if (index == 1) {
// this.getFuelCars();
this.text = ""