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

9.9

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-09-09 16:42:38 +08:00
parent 113c2734ca
commit e53c5ba986
13 changed files with 359 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fuintAdmin/src/api/EventMarketing/SaveBlock.js
View File

@ -41,6 +41,14 @@ export function eitList(data) {
data: data
})
}
// 修改上下架
export function updateStatus(data) {
return request({
url: 'business/marketingActivity/cardValue/updateStatus',
method: 'put',
data: data
})
}
//删除列表
export function deletedelById(id) {
return request({
@ -49,4 +57,26 @@ export function deletedelById(id) {
})
}
export function cardValueRule() {
return request({
url: 'cardValueRule/nowRule',
method: 'get',
})
}
export function saveOrUpdate(data) {
return request({
url: 'cardValueRule/saveOrUpdate',
method: 'post',
data: data
})
}
// 订单查询
export function cardValueRecordList(data) {
return request({
url: 'business/marketingActivity/activeExchange/cardValueOrders',
method: 'get',
params: data
})
}

8
fuintAdmin/src/api/EventMarketing/oilBlock.js
View File

@ -64,4 +64,12 @@ export function getstatistics() {
})
}
export function cardFuleOrders() {
return request({
url: 'business/marketingActivity/cardFuleOrders',
method: 'get',
})
}

BIN
fuintAdmin/src/assets/images/xpiao.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

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

@ -39,10 +39,10 @@
<span v-if="scope.row.activeStatus == 2"> <el-tag type="danger">已结束</el-tag></span>
</template>
</el-table-column>
<el-table-column prop="activityProgress" label="上线/下线" align="center" >
<el-table-column prop="activityProgress" label="上架/下架" align="center" >
<template slot-scope="scope">
<span v-if="scope.row.isonline == 0"> <el-tag>上线</el-tag></span>
<span v-if="scope.row.isonline == 1"> <el-tag>下线</el-tag></span>
<span v-if="scope.row.isonline == 0"> <el-tag>上架</el-tag></span>
<span v-if="scope.row.isonline == 1"> <el-tag>下架</el-tag></span>
</template>
</el-table-column>
@ -59,13 +59,16 @@
<el-button
size="mini"
type="text"
@click="Deletesl(scope.row)"
@click="handleDelete(scope.row)"
slot="reference"
>下架</el-button>
>
<span v-if="scope.row.isonline == 1" >上架</span>
<span v-if="scope.row.isonline == 0" >下架</span>
</el-button>
<el-button
size="mini"
type="text"
@click="viewOrder()"
@click="viewOrder(scope.row.id)"
>查看订单记录</el-button>
<!-- </el-popconfirm>-->
@ -91,24 +94,24 @@
<div class="box-der">
<div class="d-b">
<div class="d-s">
<el-input v-model="input" style="width: 200px;margin-right: 10px" placeholder="请输入订单号"></el-input>
<el-select v-model="value" placeholder="请选择" style="width: 200px;margin-right: 10px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-date-picker
v-model="value1"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
<el-input v-model="order.orderNo" style="width: 200px;margin-right: 10px" placeholder="请输入订单号"></el-input>
<el-select v-model="order.ordertype" placeholder="请选择" style="width: 200px;margin-right: 10px">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-date-picker
v-model="dataRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</div>
<el-button type="primary" icon="el-icon-search">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="RecordList()" >搜索</el-button>
</div>
<el-table
@ -121,40 +124,48 @@
>
</el-table-column>
<el-table-column
prop="date"
prop="orderNo"
label="订单号"
>
</el-table-column>
<el-table-column
prop="date"
prop="mobile"
label="会员手机号"
>
</el-table-column>
<el-table-column
prop="date"
label="礼品卡面值（元）">
prop="bidBalance"
label="充值本金">
</el-table-column>
<el-table-column
prop="amount"
label="赠送金额">
</el-table-column>
<el-table-column
prop="date"
label="数量">
prop="points"
label="赠送积分">
</el-table-column>
<el-table-column
prop="date"
label="礼品卡金额">
prop="growthValue"
label="赠送成长值">
</el-table-column>
<el-table-column
prop="date"
label="实收金额">
</el-table-column>
<el-table-column
prop="date"
prop="status"
label="订单状态">
</el-table-column>
<el-table-column
prop="date"
prop="payTime"
label="订单完成时间">
</el-table-column>
</el-table>
<pagination
v-show="orderTotal>0"
:total="orderTotal"
:page.sync="order.pageNo"
:limit.sync="order.pageSize"
@pagination="RecordList"
/>
</div>
</el-drawer>
@ -180,29 +191,30 @@
<!-- <div>{{form.membershipLevel}}</div>-->
<el-row :gutter="20">
<el-col :span="14">
<el-form-item label="活动名称" label-width="formLabelWidth" prop="rechargeBalance">
<el-input v-model="form.name"></el-input>
<el-form-item label="活动名称" label-width="formLabelWidth" prop="activeName">
<el-input v-model="form.activeName"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<div style="display: flex">
<el-form-item label="充值" label-width="" prop="">
<el-col :span="14">
<el-form-item label="充值" label-width="" prop="rechargeBalance">
<div style="width: 250px">
<el-input type="number" v-model="form.rechargeBalance" autocomplete="off">
<template slot="append">元</template>
</el-input>
</div>
</el-form-item>
<el-form-item label="赠送" label-width="" prop="">
</el-col>
<el-col :span="14">
<el-form-item label="赠送" label-width="" prop="giftBalance">
<div style="width: 250px">
<el-input type="number" v-model="form.giftBalance" autocomplete="off">
<template slot="append">元</template>
</el-input>
</div>
</el-form-item>
</div>
</el-col>
<el-col :span="14">
<el-form-item label="赠送积分" :label-width="formLabelWidth" prop="points">
<div style="width: 250px">
@ -254,7 +266,6 @@
</el-date-picker>
</el-form-item>
<div>
</div>
<div>
<el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
@ -273,10 +284,6 @@
<el-button type="primary" style="margin-left: 30px" size="mini" @click="getlistFavorable()" >添加</el-button>
</el-form-item>
</div>
<!-- <el-form-item label="排序" :label-width="formLabelWidth" prop="sort">
<el-input-number v-model="form.sort" controls-position="right" :min="1" :max="10"></el-input-number>
</el-form-item>-->
</el-form>
<!-- 赠送卡券-->
<!-- 选择优惠券-->
@ -448,7 +455,6 @@
<img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 1" style="width: 20px;height: 20px;">
<div>不限</div>
</div>
<div class="d-s" @click="ruleForm.oilLimit = 2" >
<img src="../../../assets/images/wx.png" v-if="ruleForm.oilLimit != 2" style="width: 20px;height: 20px;">
<img src="../../../assets/images/xz.png" v-if="ruleForm.oilLimit == 2" style="width: 20px;height: 20px;">
@ -518,7 +524,19 @@
</template>
<script>
import { getList,addList,eitList,deleteList,listUserGrade,mmc,deletedelById,cardValueRule,saveOrUpdate } from "@/api/EventMarketing/SaveBlock";
import {
getList,
addList,
eitList,
deleteList,
listUserGrade,
mmc,
deletedelById,
cardValueRule,
saveOrUpdate,
cardValueRecordList,
updateStatus
} from "@/api/EventMarketing/SaveBlock";
import {oilNumberList1} from "@/api/order/oilnumgun";
import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
import {delLJGoods} from "@/api/convenienceStore/ljgoods";
@ -542,6 +560,15 @@
},
Crule:false,
orderShow:false,
orderTotal:0,
order:{
orderNo:'',
ordertype:'',
cardValueId:'',
pageNo:1,
pageSize:10
},
dataRange:[],
orderData: [{
date: '2016-05-02',
name: '王小虎',
@ -579,10 +606,9 @@
participationNo: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
name: [
activeName: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
refuelMoney: [
{ required: true, message: '不能为空', trigger: 'blur' },
],
@ -663,7 +689,7 @@
options: [ ],
total:0,
pageNo:1,
pageSize:10,
pageSize:5,
value: '',
tableData: [ ],
vipname:[]
@ -826,12 +852,22 @@
}
},
viewOrder(){
viewOrder(id){
this.orderShow =! this.orderShow
this.order.cardValueId = id
this.RecordList()
},
RecordList(){
cardValueRecordList(this.addDateRange(this.order,this.dataRange)).then(res=>{
this.orderData = res.data.records
this.order.total = res.data.total
})
},
getlist(){
let data = {
isonline:this.isonline,
// isonline:this.isonline,
pageNo:this.pageNo,
pageSize:this.pageSize,
}
@ -919,13 +955,13 @@
let ddata = {
isonline : "1",
id:resData.id
id:data.id
}
eitList(ddata).then(res=>{
updateStatus(ddata).then(res=>{
if (res.code === 200){
this.$message({
message: '下线成功',
message: '操作成功',
type: 'success'
});
this.getlist()
@ -936,9 +972,7 @@
},
handleDeletes(data){
let resData = JSON.parse(JSON.stringify(data))
let ddata = {
isonline : "0",
id:resData.id

150
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

@ -158,8 +158,8 @@
<div class="box-der">
<div class="d-b">
<div class="d-s">
<el-input v-model="input" style="width: 200px;margin-right: 10px" placeholder="请输入订单号"></el-input>
<el-select v-model="value" placeholder="请选择" style="width: 200px;margin-right: 10px">
<el-input v-model="order.orderNo" style="width: 200px;margin-right: 10px" placeholder="请输入订单号"></el-input>
<el-select v-model="order.ordertype" placeholder="请选择" style="width: 200px;margin-right: 10px">
<el-option
v-for="item in options"
:key="item.value"
@ -168,59 +168,67 @@
</el-option>
</el-select>
<el-date-picker
v-model="value1"
v-model="dataRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</div>
<el-button type="primary" icon="el-icon-search">搜索</el-button>
<el-button type="primary" icon="el-icon-search" @click="RecordList()" >搜索</el-button>
</div>
<el-table
:data="orderData"
border
style="width: 100%">
<el-table-column
label="序号"
type="index"
>
</el-table-column>
<el-table-column
prop="date"
label="订单号"
<el-table
:data="orderData"
border
style="width: 100%">
<el-table-column
label="序号"
type="index"
>
</el-table-column>
<el-table-column
prop="date"
label="会员手机号"
>
</el-table-column>
<el-table-column
prop="date"
label="礼品卡面值（元）">
</el-table-column>
<el-table-column
prop="date"
label="数量">
</el-table-column>
<el-table-column
prop="date"
label="礼品卡金额">
</el-table-column>
<el-table-column
prop="date"
label="实收金额">
</el-table-column>
<el-table-column
prop="date"
label="订单状态">
</el-table-column>
<el-table-column
prop="date"
label="订单完成时间">
</el-table-column>
</el-table>
</el-table-column>
<el-table-column
prop="orderNo"
label="订单号"
>
</el-table-column>
<el-table-column
prop="mobile"
label="会员手机号"
>
</el-table-column>
<el-table-column
prop="amount"
label="订单金额">
</el-table-column>
<el-table-column
prop="incomeLitres"
label="所得升数">
</el-table-column>
<el-table-column
prop="points"
label="赠送积分">
</el-table-column>
<el-table-column
prop="growthValue"
label="赠送成长值">
</el-table-column>
<el-table-column
prop="status"
label="订单状态">
</el-table-column>
<el-table-column
prop="payTime"
label="订单完成时间">
</el-table-column>
</el-table>
<pagination
v-show="orderTotal>0"
:total="orderTotal"
:page.sync="order.pageNo"
:limit.sync="order.pageSize"
@pagination="RecordList"
/>
</div>
</el-drawer>
<el-dialog
@ -299,6 +307,17 @@
<el-radio label="2">禁用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="附加特权" prop="resource">
<el-input
type="textarea"
placeholder="请输入内容"
maxlength="225"
v-model="ruleForm.fringeBenefit"
show-word-limit
>
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
@ -309,8 +328,8 @@
</template>
<script>
import { getList,oilName,addList,eitList,getById,getoilnum,getstatistics,deleteById} from "@/api/EventMarketing/oilBlock";
import {deletedelById} from "@/api/EventMarketing/SaveBlock";
import { getList,oilName,addList,eitList,getById,getoilnum,getstatistics,deleteById,cardFuleOrders} from "@/api/EventMarketing/oilBlock";
import {cardValueRecordList, deletedelById} from "@/api/EventMarketing/SaveBlock";
export default {
dicts: ['oil_type'],
name: 'index',
@ -321,12 +340,26 @@
tjlist:[],
value:'',
type:0,
dataRange:[],
orderShow:false,
centerDialogVisible:false,
value1:'',
total:0,
pageNo:1,
pageSize:10,
options:[
{
value: '0',
label: '汽油卡'
},
{
value: '1',
label: '柴油卡'
}, {
value: '2',
label: '天然气'
},],
option: [
{
value: '',
@ -339,12 +372,19 @@
value: '2',
label: '禁用'
},],
orderTotal:0,
order:{
orderNo:'',
ordertype:'',
cardValueId:'',
pageNo:1,
pageSize:10
},
orderData: [{
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄'
}, ],
tableData: [],
oilList:[],
ruleForm:{
@ -431,6 +471,16 @@
methods:{
lookorder(){
this.orderShow = !this.orderShow
this.RecordList()
},
RecordList(){
cardFuleOrders(this.addDateRange(this.order,this.dataRange)).then(res=>{
this.orderData = res.data.records
this.order.total = res.data.total
console.log(res)
})
},
getoiltype(e){
getoilnum(e).then(res=>{

71
fuintAdmin/src/views/power/receiptPrint.vue
View File

@ -1,6 +1,40 @@
<template>
<div class="container">
<img :src="logo" alt="Logo" style="margin-left: 80px;" class="logo">
<!-- <img :src="logo" alt="Logo" style="margin-left: 80px;" class="logo">-->
<div class="left-img">
<div class="top-p" style="height: 130px" >
<div v-if="iflogoSet(0)" style="font-size: 16px;font-weight: bold">{{form.storeName}}</div>
<div v-if="iflogoSet(1)" >{{form.title}}</div>
<div v-if="iflogoSet(2)">注：会员充值、一件加油、收银台消费</div>
</div>
<div class="conten-p" style="height: 150px">
<div v-if="ifcentent(0)" >订单编号：xf155666555</div>
<div v-if="ifcentent(1)">卡号：15xx858777</div>
<div v-if="ifcentent(2)">车牌号：鲁A7788</div>
<div v-if="ifcentent(3)">等级：黄金会员</div>
<div v-if="ifcentent(4)">手机号：13583017106</div>
<div v-if="ifcentent(5)">余额：999</div>
</div>
<div class="conten-p" style="height: 150px">
该区域为小票模板的固定排版
</div>
<div class="conten-p" style="height: 150px">
该区域为小票模板的固定排版
</div>
<div class="conten-p">
<div v-if="ifbottoms(0)">操作时间：2019-09-09 12:00:00</div>
<div v-if="ifbottoms(1)">联系方式：13583017776</div>
<div v-if="ifbottoms(2)">操作员：张三</div>
<div v-if="ifbottoms(3)">员工：张三，李四，王五</div>
<div v-if="ifbottoms(4)">地址：xx街道</div>
<div v-if="ifbottoms(5)">备注：{{form.remarks}}</div>
</div>
<div>
<img v-if="this.form.logeImage" :src="imagePath + this.form.logeImage" alt="">
</div>
</div>
<div class="form-container">
<el-form ref="form" :model="form" label-width="120px">
<p style="font-weight: bold;">LOGO设置</p>
@ -66,7 +100,7 @@
<el-checkbox :label="2" >操作员</el-checkbox>
<el-checkbox :label="3" >地址</el-checkbox>
<el-checkbox :label="4" >备注</el-checkbox>
<el-input v-model="form.remarks" style="width: 300px" placeholder="请输入备注"></el-input>
<el-input v-model="form.remarks" style="width: 300px;margin-left: 15px" placeholder="请输入备注"></el-input>
</el-checkbox-group>
<p style="font-weight: bold;">二维码设置</p>
<div class="radio-and-upload">
@ -158,6 +192,15 @@ export default {
this.getList()
},
methods: {
ifbottoms(id){
return this.form.bottomSets.includes(id)
},
iflogoSet(id){
return this.form.headfootSets.includes(id)
},
ifcentent(id){
return this.form.topSets.includes(id)
},
getList() {
getApi().then(res => {
if (res.code === 200) {
@ -209,7 +252,14 @@ export default {
</script>
<style lang="scss" scoped>
.left-img{
width: 300px;
height: 830px;
background: url("../../assets/images/xpiao.png") no-repeat;
background-size: 100% 100%;
box-sizing: border-box;
padding: 20px;
}
.checkbox-input-container {
display: flex;
align-items: center; /* 垂直居中对齐 */
@ -258,11 +308,24 @@ export default {
display: block;
margin:10px 0;
}
.top-p{
text-align: center;
box-sizing: border-box;
padding: 15px;
padding-top: 30px;
font-size: 14px;
}
.conten-p{
box-sizing: border-box;
padding: 15px;
padding-left: 30px;
font-size: 14px;
}
.container {
display: flex;
}
.logo {
width: 200px; /* 根据需要调整图片宽度 */
height: auto; /* 保持图片比例 */

18
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueController.java
View File

@ -127,6 +127,24 @@ public class CardValueController extends BaseController {
return getSuccessResult(this.cardValueService.updateOneById(cardValueDTO));
}
/**
* 修改上下架
*
* @param cardValue 实体对象
* @return 修改结果
*/
@PutMapping("updateStatus")
public ResponseObject updateStatus(@RequestBody CardValue cardValue) {
try {
SysLog sysLog =new SysLog();
sysLog.setSystemName("2");
sysLog.setMoudle("营销中心");
sysLog.setContent("更新储值卡");
sysLogService.saveVo(sysLog);
}catch (Exception ignored){}
return getSuccessResult(this.cardValueService.updateStatus(cardValue));
}
/**
* 删除数据
*

253
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueDTO.java
View File

@ -7,10 +7,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.business.marketingActivity.activeNewlyweds.entity.ActiveNewlywedsChild;
import com.fuint.business.marketingActivity.cardValue.entity.CardValue;
import com.fuint.business.marketingActivity.cardValue.entity.CardValueChild;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
public class CardValueDTO extends Model<CardValue> {
//主键id
@ -80,253 +82,8 @@ public class CardValueDTO extends Model<CardValue> {
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
//20240821追加字段
//活动名称
private String activeName;
public List<CardValueChild> getCardValueChildList() {
return cardValueChildList;
}
public String[] getMembershipLevel() {
return membershipLevel;
}
public void setMembershipLevel(String[] membershipLevel) {
this.membershipLevel = membershipLevel;
}
public void setCardValueChildList(List<CardValueChild> cardValueChildList) {
this.cardValueChildList = cardValueChildList;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getChainStoreId() {
return chainStoreId;
}
public void setChainStoreId(Integer chainStoreId) {
this.chainStoreId = chainStoreId;
}
public Integer getStoreId() {
return storeId;
}
public void setStoreId(Integer storeId) {
this.storeId = storeId;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getIsonline() {
return isonline;
}
public void setIsonline(String isonline) {
this.isonline = isonline;
}
public Double getBidBalance() {
return bidBalance;
}
public void setBidBalance(Double bidBalance) {
this.bidBalance = bidBalance;
}
public Double getRechargeBalance() {
return rechargeBalance;
}
public void setRechargeBalance(Double rechargeBalance) {
this.rechargeBalance = rechargeBalance;
}
public Double getGiftBalance() {
return giftBalance;
}
public void setGiftBalance(Double giftBalance) {
this.giftBalance = giftBalance;
}
public Integer getPoints() {
return points;
}
public void setPoints(Integer points) {
this.points = points;
}
public Integer getGrowthValue() {
return growthValue;
}
public void setGrowthValue(Integer growthValue) {
this.growthValue = growthValue;
}
public Integer getRefuelMoney() {
return refuelMoney;
}
public void setRefuelMoney(Integer refuelMoney) {
this.refuelMoney = refuelMoney;
}
public String getFringeBenefit() {
return fringeBenefit;
}
public void setFringeBenefit(String fringeBenefit) {
this.fringeBenefit = fringeBenefit;
}
public Integer getParticipationNo() {
return participationNo;
}
public void setParticipationNo(Integer participationNo) {
this.participationNo = participationNo;
}
public String getEmployeeCommission() {
return employeeCommission;
}
public void setEmployeeCommission(String employeeCommission) {
this.employeeCommission = employeeCommission;
}
public String getRoyaltyType() {
return royaltyType;
}
public void setRoyaltyType(String royaltyType) {
this.royaltyType = royaltyType;
}
public Double getAmountCommission() {
return amountCommission;
}
public void setAmountCommission(Double amountCommission) {
this.amountCommission = amountCommission;
}
public Double getPercentageCommissions() {
return percentageCommissions;
}
public void setPercentageCommissions(Double percentageCommissions) {
this.percentageCommissions = percentageCommissions;
}
public String getActiveTime() {
return activeTime;
}
public void setActiveTime(String activeTime) {
this.activeTime = activeTime;
}
public String getActivityProgress() {
return activityProgress;
}
public void setActivityProgress(String activityProgress) {
this.activityProgress = activityProgress;
}
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public String getActiveStatus() {
return activeStatus;
}
public void setActiveStatus(String activeStatus) {
this.activeStatus = activeStatus;
}
public String getPaymentValue() {
return paymentValue;
}
public void setPaymentValue(String paymentValue) {
this.paymentValue = paymentValue;
}
public String getGroupOriented() {
return groupOriented;
}
public void setGroupOriented(String groupOriented) {
this.groupOriented = groupOriented;
}
public Integer getSort() {
return sort;
}
public void setSort(Integer sort) {
this.sort = sort;
}
public String getCreateBy() {
return createBy;
}
public void setCreateBy(String createBy) {
this.createBy = createBy;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public String getUpdateBy() {
return updateBy;
}
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
View File

@ -294,6 +294,9 @@
<if test="cardValueRecord.paymentType != null and cardValueRecord.paymentType != ''">
and payment_type = #{cardValueRecord.paymentType}
</if>
<if test="cardValueRecord.cardValueId != null and cardValueRecord.cardValueId != ''">
and card_value_id = #{cardValueRecord.cardValueId}
</if>
<if test="cardValueRecord.mobile != null and cardValueRecord.mobile != ''">
and mobile like concat('%', #{cardValueRecord.mobile}, '%')
</if>

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueService.java
View File

@ -71,5 +71,12 @@ public interface CardValueService extends IService<CardValue> {
* @return
*/
boolean delById(Long id);
/**
* 修改上下架状态
* @param cardValue
* @return
*/
int updateStatus(CardValue cardValue);
}

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

@ -378,8 +378,8 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
cardValue.setActiveStatus("2");
cardValue.setUpdateBy(TokenUtil.getNowAccountInfo().getRealName());
}
cardValue.setMembershipLevel(arrayToString(cardValueDTO.getMembershipLevel()));
cardValue.setActiveStatus(cardValueDTO.getActiveStatus());
if (ObjectUtil.isNotEmpty(cardValueDTO.getMembershipLevel())) cardValue.setMembershipLevel(arrayToString(cardValueDTO.getMembershipLevel()));
if (ObjectUtil.isNotEmpty(cardValueDTO.getActiveStatus())) cardValue.setActiveStatus(cardValueDTO.getActiveStatus());
cardValue.setIsonline(cardValueDTO.getIsonline());
update =updateById(cardValue);
//更新子表数据
@ -417,13 +417,15 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
str = "普通群体";
}
//活动时间
if (cardValue.getActiveTime().equals("1")){
activeApplet.setTime("不限时间");
}else {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
String formatSt = dateFormat.format(cardValue.getStartTime());
String formatEd = dateFormat.format(cardValue.getEndTime());
activeApplet.setTime(formatSt+"-" + formatEd+"");
if (ObjectUtil.isNotEmpty(cardValue.getActiveTime())) {
if (cardValue.getActiveTime().equals("1")) {
activeApplet.setTime("不限时间");
} else {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd");
String formatSt = dateFormat.format(cardValue.getStartTime());
String formatEd = dateFormat.format(cardValue.getEndTime());
activeApplet.setTime(formatSt + "-" + formatEd + "");
}
}
//赠送优惠券兑换券实物
@ -520,6 +522,15 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
return flag;
}
@Override
public int updateStatus(CardValue cardValue) {
CardValue cardValue1 = baseMapper.selectById(cardValue.getId());
if (ObjectUtil.isNotEmpty(cardValue1.getIsonline())){
cardValue1.setIsonline(cardValue1.getIsonline().equals("1") ? "0" : "1");
}
return baseMapper.updateById(cardValue1);
}
/**
* 数组转字符串
* @param array

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/CardValueVO.java
View File

@ -80,4 +80,7 @@ public class CardValueVO extends Model<CardValue> {
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
//20240821追加字段
//活动名称
private String activeName;
}

4
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -1,10 +1,10 @@
# \u57FA\u672C\u914D\u7F6E
server.port=8080
env.profile=dev
env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
#env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
#env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure/
env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E