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-11 10:46:04 +08:00
commit 0e95e453e3
24 changed files with 348 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuintAdmin/src/api/EventMarketing/activeConsumption.js
View File

@ -75,6 +75,15 @@ export function updateActiveConsumption(data) {
})
}
// 修改消费有礼活动
export function editActiveConsumption(data) {
return request({
url: 'business/marketingActivity/activeConsumption/edit',
method: 'put',
data: data
})
}
// 删除消费有礼活动
export function delActiveConsumption(id) {
return request({

9
fuintAdmin/src/api/EventMarketing/activeDiscount.js
View File

@ -44,6 +44,15 @@ export function updateActiveDiscount(data) {
})
}
// 修改折扣营销
export function editActiveDiscount(data) {
return request({
url: '/business/marketingActivity/activeDiscount/updateIsOnline',
method: 'post',
data: data
})
}
// 删除折扣营销
export function delActiveDiscount(id) {
return request({

9
fuintAdmin/src/api/EventMarketing/activeFullminus.js
View File

@ -42,6 +42,15 @@ export function updateActiveFullminus(data) {
})
}
// 修改满减营销
export function editActiveFullminus(data) {
return request({
url: '/business/marketingActivity/activeFullminus/edit',
method: 'post',
data: data
})
}
// 删除满减营销
export function delActiveFullminus(id) {
return request({

10
fuintAdmin/src/api/EventMarketing/activeNewlyweds.js
View File

@ -51,6 +51,16 @@ export function updateActiveNewlyweds(data) {
})
}
// 修改新人有礼活动
export function editActiveNewlyweds(data) {
return request({
url: '/business/marketingActivity/activeNewlyweds/edit',
method: 'post',
data: data
})
}
// 删除新人有礼活动
export function delActiveNewlyweds(id) {
return request({

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

@ -635,9 +635,24 @@
</template>
<script>
import { getoiltype,getoilName, listActiveConsumption,listExchange,listLJGoods, getActiveConsumption, delActiveConsumption, addActiveConsumption, updateActiveConsumption,listFavorable,looklook,looklooklook } from "@/api/EventMarketing/activeConsumption";
import {
getoiltype,
getoilName,
listActiveConsumption,
listExchange,
listLJGoods,
getActiveConsumption,
delActiveConsumption,
addActiveConsumption,
updateActiveConsumption,
listFavorable,
looklook,
looklooklook,
editActiveConsumption
} from "@/api/EventMarketing/activeConsumption";
import {listUserGrade} from "@/api/staff/user/usergrade";
import {getOilNameList} from "@/api/order/oilnumgun";
import {updateExchange} from "@/api/EventMarketing/cardExchange";
export default {
name: "ActiveConsumption",
@ -1150,17 +1165,25 @@ export default {
});
},
handleDeletexia(row){
getActiveConsumption(row.id).then(response => {
// this.form = response.data;
let data = response.data
data.isonline = 1
updateActiveConsumption(data).then(response => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
});
// getActiveConsumption(row.id).then(response => {
// // this.form = response.data;
// let data = response.data
// data.isonline = 1
// updateActiveConsumption(data).then(response => {
// this.$modal.msgSuccess("下线成功");
// this.open = false;
// this.getList();
// });
//
// });
});
this.$modal.confirm('确定下线此条修改消费有礼活动信息？').then(function() {
return editActiveConsumption({id:row.id,isonline:1});
}).then(() => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
}).catch(() => {});
},
qiyong(row){
if(row.isonline == 1){

39
fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
View File

@ -282,9 +282,16 @@
</template>
<script>
import { listActiveDiscount, getActiveDiscount, delActiveDiscount, addActiveDiscount, updateActiveDiscount } from "@/api/EventMarketing/activeDiscount";
import {
delActiveConsumption,
listActiveDiscount,
getActiveDiscount,
delActiveDiscount,
addActiveDiscount,
updateActiveDiscount,
editActiveDiscount
} from "@/api/EventMarketing/activeDiscount";
import {
delActiveConsumption, editActiveConsumption,
getActiveConsumption,
getoilName, looklook, looklooklook,
updateActiveConsumption
@ -535,17 +542,25 @@ export default {
});
},
handleDeletexia(row){
getActiveDiscount(row.id).then(response => {
// this.form = response.data;
let data = response.data
data.isonline = 1
updateActiveDiscount(data).then(response => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
});
// getActiveDiscount(row.id).then(response => {
// // this.form = response.data;
// let data = response.data
// data.isonline = 1
// updateActiveDiscount(data).then(response => {
// this.$modal.msgSuccess("下线成功");
// this.open = false;
// this.getList();
// });
//
// });
});
this.$modal.confirm('确定下线此条修改折扣营销活动信息？').then(function() {
return editActiveDiscount({id:row.id,isonline:1});
}).then(() => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
}).catch(() => {});
},
qiyong(row){
//

47
fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
View File

@ -262,8 +262,20 @@
</template>
<script>
import { listActiveFullminus, getActiveFullminus, delActiveFullminus, addActiveFullminus, updateActiveFullminus } from "@/api/EventMarketing/activeFullminus";
import {delActiveDiscount, getActiveDiscount, updateActiveDiscount} from "@/api/EventMarketing/activeDiscount";
import {
listActiveFullminus,
getActiveFullminus,
delActiveFullminus,
addActiveFullminus,
updateActiveFullminus,
editActiveFullminus
} from "@/api/EventMarketing/activeFullminus";
import {
delActiveDiscount,
editActiveDiscount,
getActiveDiscount,
updateActiveDiscount
} from "@/api/EventMarketing/activeDiscount";
import {getoilName, looklook, looklooklook} from "@/api/EventMarketing/activeConsumption";
import {listUserGrade} from "@/api/staff/user/usergrade";
import {getOilNameList} from "@/api/order/oilnumgun";
@ -500,17 +512,24 @@ export default {
});
},
handleDeletexia(row){
getActiveFullminus(row.id).then(response => {
// this.form = response.data;
let data = response.data
data.isonline = 1
updateActiveFullminus(data).then(response => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
});
});
// getActiveFullminus(row.id).then(response => {
// // this.form = response.data;
// let data = response.data
// data.isonline = 1
// updateActiveFullminus(data).then(response => {
// this.$modal.msgSuccess("下线成功");
// this.open = false;
// this.getList();
// });
//
// });
this.$modal.confirm('确定下线此条修改满减营销活动信息？').then(function() {
return editActiveFullminus({id:row.id,isonline:1});
}).then(() => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
}).catch(() => {});
},
qiyong(row){
if(row.isonline == 1){
@ -584,7 +603,7 @@ export default {
},
Deleteshan(row){
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除此条修改满减营销活动信息？').then(function() {
return delActiveFullminus(ids);
}).then(() => {
this.getList();

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

@ -502,10 +502,23 @@
</template>
<script>
import { listActiveNewlyweds, getActiveNewlyweds, delActiveNewlyweds, addActiveNewlyweds, updateActiveNewlyweds,huiActiveNewlyweds } from "@/api/EventMarketing/activeNewlyweds";
import {
listActiveNewlyweds,
getActiveNewlyweds,
delActiveNewlyweds,
addActiveNewlyweds,
updateActiveNewlyweds,
huiActiveNewlyweds,
editActiveNewlyweds
} from "@/api/EventMarketing/activeNewlyweds";
import {getoilName, listExchange, listFavorable, looklook, looklooklook} from "@/api/EventMarketing/activeConsumption";
import QRCode from "qrcodejs2";
import {delActiveFullminus, getActiveFullminus, updateActiveFullminus} from "@/api/EventMarketing/activeFullminus";
import {
delActiveFullminus,
editActiveFullminus,
getActiveFullminus,
updateActiveFullminus
} from "@/api/EventMarketing/activeFullminus";
export default {
name: "ActiveNewlyweds",
@ -885,17 +898,24 @@ export default {
});
},
handleDeletexia(row){
getActiveNewlyweds(row.id).then(response => {
let data = response.data
data.isonline = 1
updateActiveNewlyweds(data).then(response => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
});
});
// getActiveNewlyweds(row.id).then(response => {
//
// let data = response.data
// data.isonline = 1
// updateActiveNewlyweds(data).then(response => {
// this.$modal.msgSuccess("下线成功");
// this.open = false;
// this.getList();
// });
//
// });
this.$modal.confirm('确定下线此条新人有礼活动信息？').then(function() {
return editActiveNewlyweds({id:row.id,isonline:1});
}).then(() => {
this.$modal.msgSuccess("下线成功");
this.open = false;
this.getList();
}).catch(() => {});
},
submitForm() {
// this.form.activeNewlywedsChildList
@ -947,7 +967,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除新人有礼活动编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除此条新人有礼活动信息？').then(function() {
return delActiveNewlyweds(ids);
}).then(() => {
this.getList();

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

@ -186,8 +186,9 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="商品数量" prop="productCount">
<el-input type="number" placeholder="请输入商品数量" v-model="form.productCount">
<el-form-item label="商品数量" prop="productCount" v-if="form.type==0">
<el-input placeholder="请输入商品数量" oninput="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
v-model="form.productCount" :min="0" :max="stock" @input="goodsStock">
<template slot="append">个</template>
</el-input>
</el-form-item>
@ -242,6 +243,8 @@ import {
updateExchange,
getqueryGoods, exchangeInfo
} from '@/api/EventMarketing/cardExchange'
import {delFavorable} from "@/api/EventMarketing/cardFavorable";
import {getLJGoods} from "@/api/convenienceStore/ljgoods";
export default {
name: 'Exchange',
@ -288,6 +291,7 @@ export default {
},
// 表单参数
form: {},
stock:1,
// 表单校验
rules: {
name: [
@ -305,9 +309,9 @@ export default {
useInstructions: [
{ required: true, message: '请输入使用说明', trigger: 'change' }
],
productCount: [
{ required: true, message: '请输入礼品数量', trigger: 'change' }
],
// productCount: [
// { required: true, message: '请输入礼品数量', trigger: 'change' }
// ],
/*count: [
{ required: true, message: '请输入参与次数', trigger: 'change' }
],*/
@ -326,7 +330,20 @@ export default {
change(e){
console.log(e)
this.form.giftId = e
getLJGoods(e).then(res => {
this.form.productCount = res.data.stock
this.stock = res.data.stock
this.$forceUpdate()
console.log(res.data.stock,111,this.form.productCount)
})
},
goodsStock(val){
console.log(val)
this.$forceUpdate()
if (this.form.productCount>this.stock){
this.form.productCount = this.stock
return
}
},
qrcodelook(url) {
this.loadingdialog = true
@ -445,20 +462,32 @@ export default {
handleXia(row) {
let data = row
data.isonline = 1
updateExchange(data).then(res => {
if (res.code == 200) {
this.$message.success('下线成功')
this.getList()
}
})
// updateExchange(data).then(res => {
// if (res.code == 200) {
// this.$message.success('下线成功')
// this.getList()
// }
// })
this.$modal.confirm('确定下线此条兑换券信息？').then(function() {
return updateExchange(data);
}).then(() => {
this.$message.success('下线成功')
this.getList()
}).catch(() => {});
},
handleDelete(data){
delExchange(data.id).then(res => {
if (res.code == 200) {
this.$message.success('删除成功')
this.getList()
}
})
// delExchange(data.id).then(res => {
// if (res.code == 200) {
// this.$message.success('删除成功')
// this.getList()
// }
// })
this.$modal.confirm('确定删除此条兑换券信息？').then(function() {
return delExchange(data.id);
}).then(() => {
this.$message.success('删除成功')
this.getList()
}).catch(() => {});
},
/** 上线操作 */

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

@ -1098,7 +1098,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除此条一键发券活动的信息？').then(function() {
return deleteCardFavorable(ids);
}).then(() => {
this.getList();

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/controller/ActiveConsumptionController.java
View File

@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 消费有礼活动(ActiveConsumption)表控制层
@ -101,6 +102,19 @@ public class ActiveConsumptionController extends BaseController {
return getSuccessResult(this.activeConsumptionService.updateOneById(activeConsumptionDTO));
}
/**
* 修改数据
*
* @param map 实体对象
* @return 修改结果
*/
@PutMapping("/edit")
public ResponseObject edit(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
return getSuccessResult(this.activeConsumptionService.editIsLone(id, isonline));
}
/**
* 删除数据
* @param ids

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/ActiveConsumptionService.java
View File

@ -49,6 +49,14 @@ public interface ActiveConsumptionService extends IService<ActiveConsumption> {
*/
Boolean updateOneById(ActiveConsumptionDTO activeConsumptionDTO);
/**
* 修改下线
* @param id
* @param isonline
* @return
*/
Boolean editIsLone(Integer id,String isonline);
/**
* 查询所有数据(小程序端)
* @param activeConsumption

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionServiceImpl.java
View File

@ -363,6 +363,18 @@ public class ActiveConsumptionServiceImpl extends ServiceImpl<ActiveConsumptionM
return update;
}
@Override
public Boolean editIsLone(Integer id, String isonline) {
int row = 0;
ActiveConsumption activeConsumption = baseMapper.selectById(id);
if (ObjectUtil.isNotEmpty(activeConsumption)){
activeConsumption.setIsonline(isonline);
activeConsumption.setStatus("1");
row = baseMapper.updateById(activeConsumption);
}
return row == 1;
}
/**
* 查询所有数据(小程序端)
* @param activeConsumption

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/controller/ActiveDiscountController.java
View File

@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 折扣营销表(ActiveDiscount)表控制层
@ -91,6 +92,19 @@ public class ActiveDiscountController extends BaseController {
return getSuccessResult(this.activeDiscountService.updateOneById(activeDiscountDTO));
}
/**
* 修改数据
*
* @param map 实体对象
* @return 修改结果
*/
@PostMapping("/updateIsOnline")
public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
return getSuccessResult(this.activeDiscountService.updateIsOnline(id,isonline));
}
/**
* 删除数据
*

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/ActiveDiscountService.java
View File

@ -49,6 +49,8 @@ public interface ActiveDiscountService extends IService<ActiveDiscount> {
*/
Boolean updateOneById(ActiveDiscountDTO activeDiscountDTO);
Boolean updateIsOnline(Integer id,String isonline);
/**
* 查询所有数据(小程序端)
* @param activeDiscount

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeDiscount/service/impl/ActiveDiscountServiceImpl.java
View File

@ -251,6 +251,18 @@ public class ActiveDiscountServiceImpl extends ServiceImpl<ActiveDiscountMapper,
return update;
}
@Override
public Boolean updateIsOnline(Integer id, String isonline) {
int row = 0;
ActiveDiscount activeDiscount = baseMapper.selectById(id);
if (ObjectUtil.isNotEmpty(activeDiscount)){
activeDiscount.setStatus("1");
activeDiscount.setIsonline(isonline);
row = baseMapper.updateById(activeDiscount);
}
return row==1;
}
@Override
public List<ActiveDiscountAppletVO> selectAllApplet(ActiveDiscount activeDiscount) {
IPage page = select(new Page(1, 9999), activeDiscount);

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/controller/ActiveFullminusController.java
View File

@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 满减营销表(ActiveFullminus)表控制层
@ -81,6 +82,19 @@ public class ActiveFullminusController extends BaseController {
return getSuccessResult(this.activeFullminusService.add(activeFullminusDTO));
}
/**
* 修改数据
*
* @param map 实体对象
* @return 修改结果
*/
@PostMapping("/edit")
public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
return getSuccessResult(this.activeFullminusService.updateIsOnlone(id,isonline));
}
/**
* 修改数据
*

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/ActiveFullminusService.java
View File

@ -48,6 +48,14 @@ public interface ActiveFullminusService extends IService<ActiveFullminus> {
*/
Boolean updateOneById(ActiveFullminusDTO activeFullminusDTO);
/**
* 修改下线
* @param id
* @param isonline
* @return
*/
Boolean updateIsOnlone(Integer id,String isonline);
/**
* 查询所有数据(小程序端)
* @param activeFullminus

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeFullminus/service/impl/ActiveFullminusServiceImpl.java
View File

@ -237,6 +237,18 @@ public class ActiveFullminusServiceImpl extends ServiceImpl<ActiveFullminusMappe
return update;
}
@Override
public Boolean updateIsOnlone(Integer id, String isonline) {
int row = 0;
ActiveFullminus activeFullminus = baseMapper.selectById(id);
if (ObjectUtil.isNotEmpty(activeFullminus)){
activeFullminus.setStatus("1");
activeFullminus.setIsonline(isonline);
row = baseMapper.updateById(activeFullminus);
}
return row == 1;
}
/**
* 查询所有数据(小程序端)
* @param activeFullminus

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/controller/ActiveNewlywedsController.java
View File

@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 新人有礼活动(ActiveNewlyweds)表控制层
@ -91,6 +92,19 @@ public class ActiveNewlywedsController extends BaseController {
return getSuccessResult(this.activeNewlywedsService.updateOneById(activeNewlywedsDTO));
}
/**
* 修改数据
*
* @param map 实体对象
* @return 修改结果
*/
@PostMapping("/edit")
public ResponseObject updateIsOnline(@RequestBody Map<String,String> map) {
Integer id = Integer.valueOf(map.get("id"));
String isonline = map.get("isonline");
return getSuccessResult(this.activeNewlywedsService.updateIsonline(id,isonline));
}
/**
* 删除数据
*

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/ActiveNewlywedsService.java
View File

@ -51,6 +51,14 @@ public interface ActiveNewlywedsService extends IService<ActiveNewlyweds> {
*/
Boolean updateOneById(ActiveNewlywedsDTO activeNewlywedsDTO);
/**
* 修改下线
* @param id
* @param isonline
* @return
*/
Boolean updateIsonline(Integer id,String isonline);
/**
* 查询单条数据(小程序端)
* @return

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeNewlyweds/service/impl/ActiveNewlywedsServiceImpl.java
View File

@ -479,6 +479,18 @@ public class ActiveNewlywedsServiceImpl extends ServiceImpl<ActiveNewlywedsMappe
return update;
}
@Override
public Boolean updateIsonline(Integer id, String isonline) {
int row = 0;
ActiveNewlyweds activeNewlyweds = baseMapper.selectById(id);
if (ObjectUtil.isNotEmpty(activeNewlyweds)){
activeNewlyweds.setStatus("2");
activeNewlyweds.setIsonline(isonline);
row = baseMapper.updateById(activeNewlyweds);
}
return row == 1;
}
@Override
public List<ActiveNewlywedsAppletVO> selectApplet(ActiveConsumption activeConsumption) {
ArrayList<ActiveNewlywedsAppletVO> arrayList = new ArrayList<>();

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

@ -1,10 +1,9 @@
# \u57FA\u672C\u914D\u7F6E
server.port=8008
server.port=8080
env.profile=dev
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
env.properties.path=D:/code/oilSystem/fuintBackend/configure/
env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E
spring.datasource.type=com.zaxxer.hikari.HikariDataSource

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

@ -102,10 +102,10 @@
<view class="station-title" style="display: flex;justify-content: space-between;">
{{store.name}}{{store.description ? "("+store.description+")" : ""}}
<view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
<!-- <view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
<view style="font-size: 12px;">切换位置 <uni-icons type="right" color="#304fff"
size="14"></uni-icons> </view>
</view>
</view> -->
</view><!--顺通石化加油站(工业南路站)-->
<view style="display: flex;">
<view class="bule-icon" v-if="welfare.length!=0" v-for="(item,index) in welfare" :key="index">