dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

一键发券

Browse Source
This commit is contained in:
齐天大圣 2024-03-04 15:56:33 +08:00
parent 2acc8efe2c
commit da011b4860
8 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -101,7 +101,7 @@
</template>
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="activeStatus"
label="活动状态"
align="center"
@ -118,7 +118,7 @@
</el-switch>
</template>
</el-table-column>
</el-table-column>-->
<el-table-column
prop="createTime"

31
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -89,7 +89,7 @@
</div>
<div class="sshi">
<div class="tj-text">已使用卡量</div>
<div class="tj-text">未使用卡量</div>
<el-divider></el-divider>
<div class="tj-num" v-if="twolist&&twolist.length == 0 ">暂无数据...</div>
<div>
@ -125,7 +125,7 @@
</div>
<div class="sshi">
<div class="tj-text">未使用卡量</div>
<div class="tj-text">已使用卡量</div>
<el-divider></el-divider>
<div class="tj-num" v-if="threelist&&threelist.length == 0 ">暂无数据...</div>
<div>
@ -165,17 +165,15 @@
</div>
<el-card style="margin-bottom: 20px">
<div>
<!-- <div>
<el-button type="primary" icon="el-icon-plus" @click="daking()" >新增礼品卡</el-button>
</div>-->
<div class="title_">
电子礼品卡列表
</div>
<el-table
:data="tableData"
style="width: 100%">
<el-table-column
prop="id"
label="ID"
width="80">
</el-table-column>
<el-table-column
prop="number"
label="电子礼品卡号"
@ -239,11 +237,11 @@
width="220"
>
</el-table-column>
<el-table-column
<!-- <el-table-column
prop="remark"
label="备注信息"
width="280">
</el-table-column>
</el-table-column>-->
</el-table>
<pagination
v-show="total>0"
@ -579,9 +577,14 @@ import {
margin-bottom: 15px;
display: flex;
justify-content: space-between;
}
.title_{
width: 100%;
display: flex;
align-items: center;
font-size: 20px;
font-weight: bold;
justify-content: center;
margin-bottom: 20px;
}
</style>

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/controller/ActiveOneCouponController.java
View File

@ -88,5 +88,6 @@ public class ActiveOneCouponController extends BaseController {
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
return getSuccessResult(this.activeOneCouponService.removeByIds(idList));
}
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeOneCoupon/service/impl/ActiveOneCouponServiceImpl.java
View File

@ -73,11 +73,11 @@ public class ActiveOneCouponServiceImpl extends ServiceImpl<ActiveOneCouponMappe
String gradeIdStr = "";
String gradeIdName = "";
Integer[] gradeIds = activeOneCouponDTO.getGradeIds();
for (Integer gradeId : gradeIds) {
/* for (Integer gradeId : gradeIds) {
gradeIdStr+=gradeId + ",";
MtUserGrade mtUserGrade = mtUserGradeMapper.selectById(gradeId);
gradeIdName += mtUserGrade.getName() + ",";
}
}*/
activeOneCoupon.setGradeId(gradeIdStr);
activeOneCoupon.setGradeName(gradeIdName);
activeOneCoupon.setStoreId(nowAccountInfo.getStoreId());

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
View File

@ -112,8 +112,8 @@ public class CardFavorableRecordController extends BaseController {
* 查询一键发券会员数接口
*
*/
@GetMapping("getAdaptUserList")
public ResponseObject getAdaptUserList(@Param("cardFavorableAdnUserDTO") CardFavorableAdnUserDTO cardFavorableAdnUserDTO) {
@PostMapping("getAdaptUserList")
public ResponseObject getAdaptUserList(@RequestBody CardFavorableAdnUserDTO cardFavorableAdnUserDTO) {
return getSuccessResult(this.cardFavorableRecordService.getAdaptUserList(cardFavorableAdnUserDTO));
}

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

@ -277,8 +277,9 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
@Autowired
private RedisLock redisLock;
@Autowired
private StaffCommissionService staffCommissionService;
/*@Autowired
private StaffCommissionService staffCommissionService;*/
private static String beforeLitres = new String("0");
/**
* 查询支付状态 修改相关关联表

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
View File

@ -155,10 +155,10 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
if(ObjectUtils.isNotEmpty(cardGift.getStatus())) {
queryWrapper.eq(CardGift::getStatus,cardGift.getStatus());
}
if(ObjectUtils.isNotEmpty(cardGift.getStatus())) {
if(ObjectUtils.isNotEmpty(cardGift.getSailStatus())) {
queryWrapper.eq(CardGift::getSailStatus,cardGift.getSailStatus());
}
if(ObjectUtils.isNotEmpty(cardGift.getStatus())) {
if(ObjectUtils.isNotEmpty(cardGift.getCardAmount())) {
queryWrapper.eq(CardGift::getCardAmount,cardGift.getCardAmount());
}
queryWrapper.eq(CardGift::getStoreId, TokenUtil.getNowAccountInfo().getStoreId());

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

@ -262,13 +262,14 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
@Override
public boolean updateOneById(CardValueDTO cardValueDTO) {
boolean update = false;
//更新新人有礼活动
//更新活动
CardValue cardValue = new CardValue();
BeanUtils.copyProperties(cardValueDTO,cardValue);
if (cardValueDTO.getIsonline().equals("1")){
cardValue.setActiveStatus("2");
cardValue.setUpdateBy(TokenUtil.getNowAccountInfo().getRealName());
}
cardValue.setMembershipLevel(arrayToString(cardValueDTO.getMembershipLevel()));
update =updateById(cardValue);
//更新子表数据
LambdaQueryWrapper<CardValueChild> queryWrapper = new LambdaQueryWrapper<>();