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 10:48:59 +08:00
commit 4328a0dd4b
10 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
View File

@ -986,9 +986,10 @@ export default {
validityOne: null, validityOne: null,
validityTwo:null, validityTwo:null,
validity:row.validity, validity:row.validity,
giftCardDetail: row.useInstructions , //券详情 giftCardDetail: row.cardDetail, //券详情
giftCardTime: row.validity, //券有效期 giftCardTime: row.validity, //券有效期
giftCardTotal: 1 //券数量 giftCardTotal: 1, //券数量
instruction: row.useInstructions, //使用说明
} }
this.tableDatas.push(data) this.tableDatas.push(data)
@ -1011,14 +1012,15 @@ export default {
goodsTotal: "", //商品数量 goodsTotal: "", //商品数量
vouchersId:row.id, //券id vouchersId:row.id, //券id
giftCardName:row.name, //赠送卡券名称 giftCardName:row.name, //赠送卡券名称
giftCardType: row.type, //券类型 giftCardType: row.discountType, //券类型
timeType: row.timeType, timeType: row.timeType,
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明
} }
// this.form.tableDatas.push(data) // this.form.tableDatas.push(data)

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

@ -785,9 +785,10 @@ export default {
validityOne: null, validityOne: null,
validityTwo:null, validityTwo:null,
validity:row.validity, validity:row.validity,
giftCardDetail: row.useInstructions , //券详情 giftCardDetail: row.cardDetail , //券详情
giftCardTime: row.validity, //券有效期 giftCardTime: row.validity, //券有效期
giftCardTotal: 1 //券数量 giftCardTotal: 1, //券数量
instruction: row.useInstructions, //使用说明
} }
this.tableDatas.push(data) this.tableDatas.push(data)
@ -810,14 +811,15 @@ export default {
goodsTotal: "", //商品数量 goodsTotal: "", //商品数量
vouchersId:row.id, //券id vouchersId:row.id, //券id
giftCardName:row.name, //赠送卡券名称 giftCardName:row.name, //赠送卡券名称
giftCardType: row.type, //券类型 giftCardType: row.discountType, //券类型
timeType: row.timeType, timeType: row.timeType,
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明
} }
this.form.tableDatas.push(data) this.form.tableDatas.push(data)

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

@ -943,9 +943,10 @@ export default {
validityOne: null, validityOne: null,
validityTwo:null, validityTwo:null,
validity:row.validity, validity:row.validity,
giftCardDetail: row.useInstructions , //券详情 giftCardDetail: row.cardDetail , //券详情
giftCardTime: row.validity, //券有效期 giftCardTime: row.validity, //券有效期
giftCardTotal: 1 //券数量 giftCardTotal: 1 , //券数量
instruction: row.useInstructions, //使用说明
} }
this.ruleForm.dlist.push(data) this.ruleForm.dlist.push(data)
@ -979,14 +980,15 @@ export default {
goodsTotal: "", //商品数量 goodsTotal: "", //商品数量
vouchersId:row.id, //券id vouchersId:row.id, //券id
giftCardName:row.name, //赠送卡券名称 giftCardName:row.name, //赠送卡券名称
giftCardType: row.type, //券类型 giftCardType: row.discountType, //券类型
timeType: row.timeType, timeType: row.timeType,
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明
} }
this.ruleForm.xylist.push(data) this.ruleForm.xylist.push(data)
this.$message.success("新增成功") this.$message.success("新增成功")
@ -1008,14 +1010,15 @@ export default {
goodsTotal: "", //商品数量 goodsTotal: "", //商品数量
vouchersId:row.id, //券id vouchersId:row.id, //券id
giftCardName:row.name, //赠送卡券名称 giftCardName:row.name, //赠送卡券名称
giftCardType: row.type, //券类型 giftCardType: row.discountType, //券类型
timeType: row.timeType, timeType: row.timeType,
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明
} }
console.log(data) console.log(data)
this.ruleForm.ylist.push(data) this.ruleForm.ylist.push(data)

2
fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
View File

@ -194,8 +194,8 @@
</el-form-item> </el-form-item>
<el-form-item label="卡券有效期" prop="validity"> <el-form-item label="卡券有效期" prop="validity">
<el-input-number :min="1" placeholder="请输入卡券有效期" v-model="form.validity"> <el-input-number :min="1" placeholder="请输入卡券有效期" v-model="form.validity">
<template slot="append">天</template>
</el-input-number> </el-input-number>
<span style="margin-left: 10px">天</span>
<!-- <div style="width: 217px"> <!-- <div style="width: 217px">
<el-input type="number" placeholder="请输入卡券有效期" v-model="form.validity"> <el-input type="number" placeholder="请输入卡券有效期" v-model="form.validity">
<template slot="append">天</template> <template slot="append">天</template>

3
fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
View File

@ -75,7 +75,8 @@
</el-table-column> </el-table-column>
<el-table-column label="优惠金额" align="center" prop="discountAmount" > <el-table-column label="优惠金额" align="center" prop="discountAmount" >
<template slot-scope="scope"> <template slot-scope="scope">
减 <el-tag effect="plain" >{{scope.row.discountAmount}}</el-tag> 元 <span v-if="scope.row.discountType == 0">减 <el-tag effect="plain" >{{scope.row.discountAmount}}</el-tag> 元</span>
<span v-if="scope.row.discountType == 1">打 <el-tag effect="plain" >{{scope.row.specialDiscount}}</el-tag> 折</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="有效期" align="center" prop="validity" > <el-table-column label="有效期" align="center" prop="validity" >

1
fuintAdmin/src/views/staff/list.vue
View File

@ -501,6 +501,7 @@ export default {
}) })
} else { } else {
this.auditPrem = [] this.auditPrem = []
this.form.auditPrem = ""
} }
}, },
getAuditPrem(){ getAuditPrem(){

18
fuintAdmin/src/views/userGrade/index.vue
View File

@ -328,8 +328,8 @@
label="券类型" label="券类型"
width="80"> width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.giftCardType == 0" >油品券</span> <span v-if="scope.row.giftCardType == 0" >满减券</span>
<!-- <span v-if="scope.row.giftCardType == 1" >洗车券</span>--> <span v-if="scope.row.giftCardType == 1" >折扣券</span>
<!-- <span v-if="scope.row.giftCardType == 2" >通用券</span>--> <!-- <span v-if="scope.row.giftCardType == 2" >通用券</span>-->
</template> </template>
</el-table-column> </el-table-column>
@ -626,8 +626,8 @@
label="券类型" label="券类型"
width="100"> width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.type == 0" >油品券</span> <span v-if="scope.row.discountType == 0" >满减券</span>
<!-- <span v-if="scope.row.type == 1" >洗车券</span>--> <span v-if="scope.row.discountType == 1" >折扣券</span>
<!-- <span v-if="scope.row.type == 2" >通用券</span>--> <!-- <span v-if="scope.row.type == 2" >通用券</span>-->
</template> </template>
</el-table-column> </el-table-column>
@ -950,9 +950,10 @@ export default {
validityOne: null, validityOne: null,
validityTwo:null, validityTwo:null,
validity:row.validity, validity:row.validity,
giftCardDetail: row.useInstructions , //券详情 giftCardDetail: row.cardDetail , //券详情
giftCardTime: row.validity, //券有效期 giftCardTime: row.validity, //券有效期
giftCardTotal: 1 //券数量 giftCardTotal: 1 , //券数量
instruction: row.useInstructions, //使用说明
} }
this.tableDatas.push(data) this.tableDatas.push(data)
@ -972,14 +973,15 @@ export default {
activeGift: 1, //充值赠送类型：1、赠送优惠券 2、赠送兑换券 activeGift: 1, //充值赠送类型：1、赠送优惠券 2、赠送兑换券
vouchersId:row.id, //券id vouchersId:row.id, //券id
giftCardName:row.name, //赠送卡券名称 giftCardName:row.name, //赠送卡券名称
giftCardType: row.type, //券类型 giftCardType: row.discountType, //券类型
timeType: row.timeType, timeType: row.timeType,
validityZero: row.validityZero, validityZero: row.validityZero,
validityOne: row.validityOne, validityOne: row.validityOne,
validityTwo:row.validityTwo, validityTwo:row.validityTwo,
giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情 giftCardDetail: "满"+ row.satisfiedAmount+"减 "+row.discountAmount+"元" , //券详情
giftCardTime: "", //券有效期 giftCardTime: "", //券有效期
giftCardTotal: 1//券数量 giftCardTotal: 1,//券数量
instruction: row.instruction,//使用说明
} }
this.tableDatas1.push(data) this.tableDatas1.push(data)

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.member.controller; package com.fuint.business.member.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.entity.LJStaff;
@ -148,6 +149,8 @@ public class LJStaffController extends BaseController {
*/ */
@PutMapping @PutMapping
public ResponseObject edit(@Validated @RequestBody LJStaff staff){ public ResponseObject edit(@Validated @RequestBody LJStaff staff){
if (ObjectUtil.isEmpty(staff.getAuditPrem()))
mtStaffService.lambdaUpdate().eq(LJStaff::getId,staff.getId()).set(LJStaff::getAuditPrem,null).update();
return getSuccessResult(mtStaffService.updateStaff(staff)); return getSuccessResult(mtStaffService.updateStaff(staff));
} }

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

@ -133,9 +133,6 @@
<if test="user.chainStoreId != null and user.chainStoreId != ''"> <if test="user.chainStoreId != null and user.chainStoreId != ''">
and mub.chain_store_id = #{user.chainStoreId} and mub.chain_store_id = #{user.chainStoreId}
</if> </if>
<if test="user.storeId != null and user.storeId != ''">
and mub.store_id = #{user.storeId}
</if>
<if test="user.mobile != null and user.mobile != ''"> <if test="user.mobile != null and user.mobile != ''">
and mu.mobile like concat('%', #{user.mobile}, '%') and mu.mobile like concat('%', #{user.mobile}, '%')
</if> </if>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -147,11 +147,13 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
// Double refuelMoney = baseMapper.selectSumByStore(storeId, "refuel_money"); // Double refuelMoney = baseMapper.selectSumByStore(storeId, "refuel_money");
QueryWrapper queryWrapper = new QueryWrapper<>(); QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("chain_store_id",chainStoreId);
queryWrapper.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 0"); queryWrapper.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 0");
// Integer addNum = baseMapper.selectCount(queryWrapper); // Integer addNum = baseMapper.selectCount(queryWrapper);
Integer addNum = userBalanceMapper.selectCount(queryWrapper); Integer addNum = userBalanceMapper.selectCount(queryWrapper);
QueryWrapper queryWrapper1 = new QueryWrapper<>(); QueryWrapper queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("chain_store_id",chainStoreId);
queryWrapper1.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 1"); queryWrapper1.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 1");
// Integer yesterdayAddNum = baseMapper.selectCount(queryWrapper1); // Integer yesterdayAddNum = baseMapper.selectCount(queryWrapper1);