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-15 17:43:51 +08:00
commit 93af385295
5 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -108,7 +108,11 @@
tooltip-effect="dark">
<el-table-column type="selection" width="55"/>
<!-- <el-table-column type="index" width="80" align="center" label="序号"/>-->
<el-table-column label="分类名称" prop="cvsGoodName" align="center" width="120"/>
<el-table-column label="分类名称" prop="cvsGoodName" align="center" width="120">
<template slot-scope="scope">
<span>{{scope.row.cvsGoodName || "--"}}</span>
</template>
</el-table-column>
<el-table-column label="商品名称" prop="name" align="center" width="160"/>
<el-table-column label="供应商" prop="supplierName" align="center" width="120"/>
<el-table-column label="条码" prop="goodsNo" align="center" width="160"/>

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelDieselServiceImpl.java
View File

@ -68,7 +68,15 @@ public class CardFuelDieselServiceImpl extends ServiceImpl<CardFuelDieselMapper,
queryWrapper.eq(CardFuelDiesel::getStoreId, TokenUtil.getNowAccountInfo().getStoreId());
queryWrapper.orderByDesc(CardFuelDiesel::getCreateTime);
IPage page1 = page(page, queryWrapper);
List<CardFuelDiesel> records = page1.getRecords();
List<CardFuelDiesel> records1 = page1.getRecords();
for (CardFuelDiesel fuelDiesel : records1) {
if (ObjectUtils.isNotEmpty(fuelDiesel.getEndTime()) && fuelDiesel.getEndTime().before(new Date())){
fuelDiesel.setActiveStatus("2");
baseMapper.updateById(fuelDiesel);
}
}
IPage page2 = page(page, queryWrapper);
List<CardFuelDiesel> records = page2.getRecords();
//返回囤油卡状态
for (CardFuelDiesel record : records) {
OilNumber oilPrice = oilNumberService.getOilPrice(Integer.parseInt(record.getOilType()));

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

@ -88,7 +88,16 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
queryWrapper.eq(CardValue::getStoreId, TokenUtil.getNowAccountInfo().getStoreId());
queryWrapper.orderByDesc(CardValue::getCreateTime);
IPage page1 = page(page, queryWrapper);
List<CardValue> records = page1.getRecords();
List<CardValue> records1 = page1.getRecords();
for (CardValue record : records1) {
if (ObjectUtils.isNotEmpty(record.getEndTime()) && record.getEndTime().before(new Date())){
record.setActiveStatus("2");
record.setIsonline("1");
baseMapper.updateById(record);
}
}
IPage page2 = page(page, queryWrapper);
List<CardValue> records = page2.getRecords();
//返回储值卡活动进度状态
for (CardValue record : records) {
if(ObjectUtils.isNotEmpty(record.getActiveTime()) && record.getActiveTime().equals("1")){

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/LJUserMapper.xml
View File

@ -122,6 +122,22 @@
<if test="user.params.endTime != null and user.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(mu.create_time,'%y%m%d') &lt;= date_format(#{user.params.endTime},'%y%m%d')
</if>
<if test="user.days != null and user.days != ''">
or oo.id IS NULL
</if>
<if test="user.chainStoreId != null and user.chainStoreId != ''">
and mub.chain_store_id = #{user.chainStoreId}
</if>
<if test="user.storeId != null and user.storeId != ''">
and mub.store_id = #{user.storeId}
</if>
<if test="user.gradeId != null and user.gradeId != ''">
and mub.grade_id = #{user.gradeId}
</if>
</where>
GROUP BY mu.id
ORDER BY oo.create_time desc

6
gasStation-uni/pages/index/index.vue
View File

@ -272,10 +272,10 @@
await this.getTheJudgmentIsTheSame();
}
},
onShow() {
this.isJoined()
async onShow() {
await this.getTheJudgmentIsTheSame();
await this.isJoined()
this.isRecharge()
this.getTheJudgmentIsTheSame();
// this.getIndexBanner()
},
components: {