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

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

@ -7,6 +7,7 @@
<view class="my-icons"></view> <view class="my-icons"></view>
</view> </view>
<!-- 顶部区域 --> <!-- 顶部区域 -->
<view style="height: 200px;!important">
<view style="text-align: center;"> <view style="text-align: center;">
<image src="../../static/imgs/xfyl.png" v-if="title == '消费有礼活动'"></image> <image src="../../static/imgs/xfyl.png" v-if="title == '消费有礼活动'"></image>
<image src="../../static/imgs/zkyx.png" v-if="title == '折扣营销活动'"></image> <image src="../../static/imgs/zkyx.png" v-if="title == '折扣营销活动'"></image>
@ -183,6 +184,7 @@
</view> </view>
</view> </view>
</view> </view>
</view>
<view class="anniu" @click="goTopup()"> <view class="anniu" @click="goTopup()">
去参与 去参与
</view> </view>