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 17:05:48 +08:00
commit bc54119f5d
3 changed files with 163 additions and 161 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/activeApplet/mapper/xml/ActiveAppletMapper.xml
View File

@ -10,7 +10,7 @@
FROM FROM
active_applet active_applet
where where
store_id = #{activeApplet.storeId} store_id = #{activeApplet.storeId} and isonline = '0'
GROUP BY GROUP BY
type type
ORDER BY create_time,type desc ORDER BY create_time,type desc
@ -23,7 +23,7 @@
FROM FROM
active_applet active_applet
WHERE type = #{activeApplet.type} WHERE type = #{activeApplet.type}
and store_id = #{activeApplet.storeId} and store_id = #{activeApplet.storeId} and isonline = '0'
ORDER BY create_time desc ORDER BY create_time desc
</select> </select>

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

@ -229,7 +229,7 @@ public class CardFuelDieselController extends BaseController {
activeApplet.setPoints(cardFuelDiesel.getPoints()); activeApplet.setPoints(cardFuelDiesel.getPoints());
if (cardFuelDiesel.getActiveStatus().equals("1")) activeApplet.setActiveStatus("2"); if (cardFuelDiesel.getActiveStatus().equals("1")) activeApplet.setActiveStatus("2");
if (cardFuelDiesel.getActiveStatus().equals("0")) activeApplet.setActiveStatus("1"); if (cardFuelDiesel.getActiveStatus().equals("2")) activeApplet.setActiveStatus("1");
activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1"); activeApplet.setIsonline((cardFuelDiesel.getActiveStatus().equals("1")) ? "0" : "1");
activeAppletService.updateById(activeApplet); activeAppletService.updateById(activeApplet);
return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel)); return getSuccessResult(this.cardFuelDieselService.updateById(cardFuelDiesel));

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

@ -7,179 +7,181 @@
<view class="my-icons"></view> <view class="my-icons"></view>
</view> </view>
<!-- 顶部区域 --> <!-- 顶部区域 -->
<view style="text-align: center;"> <view style="height: 200px;!important">
<image src="../../static/imgs/xfyl.png" v-if="title == '消费有礼活动'"></image> <view style="text-align: center;">
<image src="../../static/imgs/zkyx.png" v-if="title == '折扣营销活动'"></image> <image src="../../static/imgs/xfyl.png" v-if="title == '消费有礼活动'"></image>
<image src="../../static/imgs/mjyh.png" v-if="title == '满减营销活动'"></image> <image src="../../static/imgs/zkyx.png" v-if="title == '折扣营销活动'"></image>
<image src="../../static/imgs/xryl.png" v-if="title == '新人有礼活动'"></image> <image src="../../static/imgs/mjyh.png" v-if="title == '满减营销活动'"></image>
<image src="../../static/imgs/yqyl.png" v-if="title == '推荐有礼活动'"></image> <image src="../../static/imgs/xryl.png" v-if="title == '新人有礼活动'"></image>
<image src="../../static/imgs/chongzhi.png" v-if="title == '储值卡充值活动'"></image> <image src="../../static/imgs/yqyl.png" v-if="title == '推荐有礼活动'"></image>
<image src="../../static/imgs/oilCard.png" v-if="title == '囤油卡充值活动'"></image> <image src="../../static/imgs/chongzhi.png" v-if="title == '储值卡充值活动'"></image>
</view> <image src="../../static/imgs/oilCard.png" v-if="title == '囤油卡充值活动'"></image>
<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="">活动时间</view>
<view>{{item.time}}</view>
</view> </view>
<view class="title-box">参与油品</view> <view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '消费有礼活动'">
<view class="w_box"> <view class=" title-box">活动介绍</view>
<view class="w_oil" v-for="(item,index) in item.oilName" :key="index">{{item}}</view> <view class="h_size">{{item.discountActiveDescribe || ""}}</view>
</view> <view class="box-bottom">
<view class="h_bottom"> <view class="">活动时间</view>
<view class="dis-box"> <view>{{item.time}}</view>
<view class="dian"></view>
<view class="h_size">参与会员：{{item.adaptUserType}}</view>
</view> </view>
<view class="dis-box"> <view class="title-box">参与油品</view>
<view class="dian" style="background: #FA5E03;"></view> <view class="w_box">
<view class="h_size">获得奖励：赠送{{item.points}}积分</view> <view class="w_oil" v-for="(item,index) in item.oilName" :key="index">{{item}}</view>
</view>
<view class="h_bottom">
<view class="dis-box">
<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}}积分</view>
</view>
</view> </view>
</view> </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.discountActiveDescribe || ""}}</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>
</view>
<view class="title-box">参与油品</view>
<view class="w_box">
<view class="w_oil" v-for="(item,index) in item.oilName" :key="index">{{item}}</view>
</view>
<view class="h_bottom">
<view class="dis-box">
<view class="dian"></view>
<view class="h_size">参与会员：{{item.adaptUserType}}</view>
</view> </view>
<!-- <view class="dis-box"> <view class="title-box">参与油品</view>
<view class="dian" style="background: #FA5E03;"></view> <view class="w_box">
<view class="h_size">获得折扣：赠送{{item.points}}积分</view> <view class="w_oil" v-for="(item,index) in item.oilName" :key="index">{{item}}</view>
</view>
<view class="h_bottom">
<view class="dis-box">
<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}}积分</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>
<view class="box-bottom">
<view class="">活动时间</view>
<view>{{item.time}}</view>
</view>
<view class="title-box">参与油品</view>
<view class="w_box">
<view class="w_oil" v-for="(item,index) in item.oilName" :key="index">{{item}}</view>
</view>
<view class="h_bottom">
<view class="dis-box">
<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">获得折扣：赠送10积分</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>
<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> -->
</view> <view class="h_bottom">
</view> <view class="dis-box">
<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '满减营销活动'"> <view class="dian"></view>
<view class=" title-box">活动介绍</view> <view class="h_size">参与会员：{{item.adaptUserType}}</view>
<view class="h_size">{{item.discountActiveDescribe || ""}}</view> </view>
<view class="box-bottom"> <view class="dis-box">
<view class="">活动时间</view> <view class="dian" style="background: #FA5E03;"></view>
<view>{{item.time}}</view> <view class="h_size">获得折扣：赠送{{item.points}}积分</view>
</view> </view>
<view class="title-box">参与油品</view> <view class="dis-box">
<view class="w_box"> <view class="dian" style="background: #FA5E03;"></view>
<view class="w_oil" v-for="(item,index) in item.oilName" :key="index">{{item}}</view> <view class="h_size">获得折扣：赠送{{item.growaValue}}成长值</view>
</view> </view>
<view class="h_bottom">
<view class="dis-box">
<view class="dian"></view>
<view class="h_size">参与会员：{{item.adaptUserType}}</view>
</view> </view>
<!-- <view class="dis-box"> </view>
<view class="dian" style="background: #FA5E03;"></view> <view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '囤油卡充值活动'">
<view class="h_size">获得折扣：赠送10积分</view> <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> -->
</view> <view class="h_bottom">
</view> <view class="dis-box" v-if="item.adaptUserType">
<view class="center-box" v-for="(item,index) in datas" :key="index" v-if="title == '储值卡充值活动'"> <view class="dian"></view>
<view class=" title-box">活动介绍</view> <view class="h_size">参与会员：{{item.adaptUserType}}</view>
<view class="h_size">{{item.discountActiveDescribe || ""}}</view> </view>
<view class="box-bottom"> <view class="dis-box">
<view class="">活动时间：{{item.time}}</view> <view class="dian" style="background: #FA5E03;"></view>
</view> <view class="h_size">获得折扣：赠送{{item.points || 0}}积分</view>
<!-- <view class="title-box">参与油品</view> </view>
<view class="w_box"> <view class="dis-box">
<view class="w_oil" v-for="(item,index) in 3" :key="index">#95</view> <view class="dian" style="background: #FA5E03;"></view>
</view> --> <view class="h_size">获得折扣：赠送{{item.growaValue || 0}}成长值</view>
<view class="h_bottom"> </view>
<view class="dis-box">
<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}}积分</view>
</view>
<view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">获得折扣：赠送{{item.growaValue}}成长值</view>
</view> </view>
</view> </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.discountActiveDescribe || ""}}</view>
<view class="h_size">{{item.discountActiveDescribe || ""}}</view> <view class="box-bottom">
<view class="box-bottom"> <view class="">活动时间</view>
<view class="">活动时间：{{item.time}}</view> <view>{{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>
<view class="dis-box"> <!-- <view class="title-box">参与油品</view> -->
<view class="dian" style="background: #FA5E03;"></view> <!-- <view class="w_box">
<view class="h_size">获得折扣：赠送{{item.points || 0}}积分</view> <view class="w_oil" v-for="(item,index) in 3" :key="index">#95</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>
<view class="box-bottom">
<view class="">活动时间</view>
<view>{{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">
<view class="dian"></view>
<view class="h_size">参与会员：普通会员、银牌会员、V2</view>
</view> --> </view> -->
<view class="dis-box"> <view class="h_bottom">
<view class="dian" style="background: #FA5E03;"></view> <!-- <view class="dis-box">
<view class="h_size">赠送{{item.points || ''}}积分</view> <view class="dian"></view>
</view> <view class="h_size">参与会员：普通会员、银牌会员、V2</view>
<view class="dis-box"> </view> -->
<view class="dian" style="background: #FA5E03;"></view> <view class="dis-box">
<view class="h_size">赠送{{item.growaValue || ''}}成长值</view> <view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{item.points || ''}}积分</view>
</view>
<view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{item.growaValue || ''}}成长值</view>
</view>
</view> </view>
</view> </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.discountActiveDescribe || ""}}</view>
<view class="h_size">{{item.discountActiveDescribe || ""}}</view> <view class="box-bottom">
<view class="box-bottom"> <view class="">活动时间：{{item.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"> <view class="w_oil" v-for="(item,index) in 3" :key="index">#95</view>
<view class="w_oil" v-for="(item,index) in 3" :key="index">#95</view>
</view> -->
<view class="h_bottom">
<!-- <view class="dis-box">
<view class="dian"></view>
<view class="h_size">参与会员：普通会员、银牌会员、V2</view>
</view> --> </view> -->
<view class="dis-box"> <view class="h_bottom">
<view class="dian" style="background: #FA5E03;"></view> <!-- <view class="dis-box">
<view class="h_size">赠送{{item.points || ''}}积分</view> <view class="dian"></view>
</view> <view class="h_size">参与会员：普通会员、银牌会员、V2</view>
<view class="dis-box"> </view> -->
<view class="dian" style="background: #FA5E03;"></view> <view class="dis-box">
<view class="h_size">赠送{{item.growaValue || ''}}成长值</view> <view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{item.points || ''}}积分</view>
</view>
<view class="dis-box">
<view class="dian" style="background: #FA5E03;"></view>
<view class="h_size">赠送{{item.growaValue || ''}}成长值</view>
</view>
</view> </view>
</view> </view>
</view> </view>