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

积分商城

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2023-11-03 17:59:55 +08:00
parent 5472e4253b
commit 46d6afad1d
5 changed files with 293 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

422
fuintAdmin/src/views/integral/gift/index.vue
View File

@ -43,11 +43,11 @@
<el-table ref="tables" <el-table ref="tables"
v-loading="loading" v-loading="loading"
:data="dataList" :data="dataList"
:default-sort="defaultSort"> :default-sort="defaultSort">
<el-table-column label="分类" align="center" prop="id" width="50px"/> <el-table-column label="分类" align="center" prop="categoryId" width="50px"/>
<el-table-column label="礼品信息" align="center"> <el-table-column label="礼品信息" align="center">
<el-table-column label="名称" align="center" prop="sort20"/> <el-table-column label="名称" align="center" prop="giftName"/>
<el-table-column label="封面图" align="center" prop="sort634"/> <el-table-column label="封面图" align="center" prop="coverImage"/>
</el-table-column> </el-table-column>
<el-table-column label="兑换信息" align="center"> <el-table-column label="兑换信息" align="center">
<el-table-column label="兑换方式" align="center" prop="sort65"/> <el-table-column label="兑换方式" align="center" prop="sort65"/>
@ -57,7 +57,7 @@
<el-table-column label="配送方式" align="center" prop="sort56"/> <el-table-column label="配送方式" align="center" prop="sort56"/>
<el-table-column label="快递费用" align="center" prop="sort55"/> <el-table-column label="快递费用" align="center" prop="sort55"/>
</el-table-column> </el-table-column>
<el-table-column label="礼品类型" align="center" prop="sort44" /> <el-table-column label="礼品类型" align="center" prop="giftType" />
<el-table-column label="礼品库存信息" align="center"> <el-table-column label="礼品库存信息" align="center">
<el-table-column label="总库存" align="center" prop="sort23"/> <el-table-column label="总库存" align="center" prop="sort23"/>
<el-table-column label="已用" align="center" prop="sort12"/> <el-table-column label="已用" align="center" prop="sort12"/>
@ -93,22 +93,29 @@
/> />
</el-card> </el-card>
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false"> <el-dialog :title="title" class="d-dialog" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="dataForm" :rules="rules" label-width="80px"> <el-form ref="form" :model="dataForm" :rules="rules" label-width="80px">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="15"> <el-col :span="15">
<el-form-item label="礼品名称" prop="categoryName"> <el-form-item label="礼品名称" prop="giftName">
<el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="30"/> <el-input v-model="dataForm.giftName" placeholder="请输入礼品名称" maxlength="30"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="9"> <el-col :span="9">
<el-form-item label="分类" prop="categoryName"> <el-form-item label="分类" prop="categoryId">
<el-input v-model="dataForm.categoryName" placeholder="分类名称" maxlength="30"/> <el-select v-model="dataForm.categoryId" placeholder="请选择礼品分类" style="width:100%">
<el-option
v-for="option in giftCategoryList"
:key="option.id"
:label="option.categoryName"
:value="option.id"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="11"> <el-col :span="6">
<el-form-item label="封面图" > <el-form-item label="封面图" >
<el-upload <el-upload
:action="uploadAction" :action="uploadAction"
@ -118,35 +125,49 @@
:auto-upload="true" :auto-upload="true"
:show-file-list="false" :show-file-list="false"
:headers="uploadHeader" :headers="uploadHeader"
:on-success="handleUploadSuccess"> :on-success="handleUploadSuccessCover">
<img <img
v-if="this.form.logo" v-if="this.dataForm.coverImage"
:src="imagePath + this.form.logo" :src="imagePath + this.dataForm.coverImage"
class="list-img" class="list-img"
/> />
<i class="el-icon-plus"></i> <i v-if="!this.dataForm.coverImage" class="el-icon-plus"></i>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="18">
<el-col :span="11">
<el-form-item label="礼品图片" > <el-form-item label="礼品图片" >
<el-upload <el-upload
:action="uploadAction" :action="uploadAction"
list-type="picture-card"
:file-list="dataForm.giftImages"
:headers="uploadHeader"
:auto-upload="true"
:on-preview="handlePictureCardPreview"
:on-success="handleUploadSuccessGift"
style="height: 100px;"
:on-remove="handleRemove">
<i class="el-icon-plus"></i>
</el-upload>
<el-dialog :visible.sync="dialogVisible">
<img width="100%" :src="dialogImageUrl" alt="">
</el-dialog>
<!-- <el-upload
:action="uploadAction"
list-type="picture-card" list-type="picture-card"
:class="{hide:hideUpload}" :class="{hide:hideUpload}"
:file-list="uploadFiles" :file-list="uploadFiles"
:auto-upload="true" :auto-upload="true"
:show-file-list="false" :show-file-list="false"
:headers="uploadHeader" :headers="uploadHeader"
:on-success="handleUploadSuccess"> :on-success="handleUploadSuccessGift">
<img <img
v-if="this.form.logo" v-if="this.dataForm.giftImages"
:src="imagePath + this.form.logo" :src="imagePath + this.dataForm.giftImages"
class="list-img" class="list-img"
/> />
<i class="el-icon-plus"></i> <i v-if="!this.dataForm.giftImages" class="el-icon-plus"></i>
</el-upload> </el-upload> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -154,56 +175,72 @@
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="礼品类型" prop="status"> <el-form-item label="礼品类型" prop="giftType">
<el-radio-group v-model="dataForm.status"> <el-radio-group v-model="dataForm.giftType" @change="changeGiftType">
<el-radio <el-radio
v-for="dict in dict.type.zhzt" v-for="dict in dict.type.lplx"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
@change="handleIsopenSelect" :value="dict.value"
:value="dict.value"/> @change="handleIsopenSelect,changeGiftType"
</el-radio-group> />
</el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="7.5"> <el-col :span="8">
<el-form-item label="优惠卷" prop="supplierName"> <el-form-item v-if="showList.coupon" label="优惠卷" prop="couponId">
<el-input v-model="dataForm.sort" placeholder="分类名称" maxlength="30"/> <el-select v-model="dataForm.couponId" placeholder="请选择" style="width: 202px;">
<el-option
v-for="dict in dict.type.lplx"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="showList.voucher" label="兑换券" prop="voucherId">
<el-select v-model="dataForm.voucherId" placeholder="请选择" style="width: 202px;">
<el-option
v-for="dict in dict.type.lplx"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7.5"> <el-col :span="7">
<el-form-item label="礼品数量" prop="supplierName"> <el-form-item label="礼品数量" prop="supplierName" style="width: 202px;">
<el-input v-model="dataForm.sort" placeholder="分类名称" maxlength="30"/> <el-input-number v-model="dataForm.giftQuantity" controls-position="right" :min="1" :max="10" label=""></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="7.5"> <el-col :span="8">
<el-form-item label="市场价格" prop="supplierName"> <el-form-item label="市场价格" prop="supplierName">
<el-input v-model="dataForm.sort" placeholder="分类名称" maxlength="30"/> <el-input v-model="dataForm.sort" placeholder="请输入市场价格" maxlength="30" style="width: 202px;">
<template slot="append">元</template></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7.5"> <el-col :span="7">
<el-form-item label="礼品库存" prop="supplierName"> <el-form-item label="礼品库存" prop="totalInventory">
<el-input v-model="dataForm.sort" placeholder="分类名称" maxlength="30"/> <el-input v-model="dataForm.totalInventory" placeholder="礼品库存" maxlength="30" style="width: 202px;"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="兑换方式" prop="status"> <el-form-item label="兑换方式" prop="status">
<el-radio-group v-model="dataForm.status"> <el-radio-group v-model="dataForm.exchangeMethod">
<el-radio <el-radio
v-for="dict in dict.type.zhzt" v-for="dict in dict.type.redemptionMethod"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
@change="handleIsopenSelect" @change="handleIsopenSelect"
@ -214,38 +251,74 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="7.5"> <el-col :span="8">
<el-form-item label="顿换积分" prop="supplierName"> <el-form-item label="兑换积分" prop="exchangePoints">
<el-input v-model="dataForm.sort" placeholder="分类名称" maxlength="30"/> <el-input v-model="dataForm.exchangePoints" placeholder="分类名称" maxlength="30" style="width: 202px;">
<template slot="append">积分</template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="7.5"> <el-col :span="7">
<el-form-item label="加钱比例" prop="supplierName"> <el-form-item label="加钱比例" prop="moneyRatio" >
<el-input v-model="dataForm.sort" placeholder="分类名称" maxlength="30"/> <el-input v-model="dataForm.moneyRatio" placeholder="分类名称" maxlength="30" style="width: 202px;">
<template slot="prepend">1积分=</template>
<template slot="append">元</template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="7.5"> <el-col :span="8">
<el-form-item label="兑换次数" prop="supplierName"> <el-form-item label="配送方式" prop="exchangeTimes">
<el-input v-model="dataForm.sort" placeholder="分类名称" maxlength="30"/> <el-checkbox v-for="item in dict.type.shippingMethod" :key="item.value" v-model="moneyRatio" :label="item.id">{{ item.label }}</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="快递运费" prop="status">
<el-radio-group v-model="dataForm.expressShippingFee">
<el-radio
v-for="dict in dict.type.expressShippingCosts"
:key="dict.value"
:label="dict.label"
@change="handleIsopenSelect"
:value="dict.value"/>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="运费金额" prop="status">
<el-input v-model="dataForm.exchangePoints" placeholder="分类名称" maxlength="30" style="width: 202px;">
<template slot="append">元</template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="24">
<el-col :span="8">
<el-form-item label="兑换次数" prop="exchangeTimes">
<el-input v-model="dataForm.exchangeTimes" placeholder="分类名称" maxlength="30" style="width: 202px;">
<template slot="append">个</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="10"> <el-col :span="10">
<el-form-item label="礼品排序" prop="contactPerson"> <el-form-item label="礼品排序" prop="sort" >
<el-input-number v-model="dataForm.sort" :min="1" :max="10" label=""></el-input-number> <el-input-number v-model="dataForm.sort" :min="1" :max="10" label="" style="width: 202px;"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col> <el-col>
<el-col :span="20"> <el-col :span="20">
@ -263,39 +336,34 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="23"> <el-col :span="23">
<el-form-item label="图文详情" prop="contactPerson"> <el-form-item label="图文详情" prop="detailedDescription">
<element-tiptap v-model="content" :extensions="extensions" :editor="editor" /> <!-- <element-tiptap v-model="content" :extensions="extensions" :editor="editor" /> -->
<editor></editor>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> --> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<!-- <el-button type="primary" @click="submitForm">确 定</el-button> --> <el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import {getGiftCategoryApi} from "@/api/integral/category";
import { editor } from '@/components/Editor/index'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
export default { export default {
name: "gift", name: "gift",
dicts: ['zhzt'], dicts: ['zhzt','lplx','redemptionMethod','expressShippingCosts','shippingMethod'],
data() { data() {
return { return {
@ -303,30 +371,41 @@ export default {
dataForm:{ dataForm:{
id: null, id: null,
giftName: '', // 礼品名称
categoryId:'', // 分类id
coverImage:'', // 封面图
giftImages: [], // 礼品图片
giftType:"优惠卷", // 礼品类型
couponId:'',// 优惠券
giftQuantity:'', // 礼品数量
totalInventory:'', // 库存
exchangeMethod:'积分', // 兑换方式
exchangePoints:'', // 兑换积分
exchangeTimes:'', // 兑换次数
moneyRatio:'', // 价钱比例
deliveryMethod:'', // 配送方式
detailedDescription:'', // 图文详情
categoryName: 1, categoryName: 1,
sort: null, sort: null,
status: null status: '启用'
}, },
// 上传地址 showList: {
uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload', // 优惠类型展示
uploadHeader: { 'Access-Token' : getToken() }, coupon: 'true',
// 隐藏上传 voucher: 'false',
hideUpload: false, goods: 'false',
// 上传文件列表 // 兑换方式展示
uploadFiles: [],
// 图片根目录 },
imagePath: "",
form:{logo:''},
imageUrl: '',
// 弹出框标题 // 弹出框标题
title:'', title:'',
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
disableInput: false, // 默认不禁用 disableInput: false, // 默认不禁用
// 是否显示弹出层 // 是否显示弹出层
open: true, open: false,
// 总条数 // 总条数
total: 0, total: 0,
// 查询参数 // 查询参数
@ -346,8 +425,25 @@ export default {
/** /**
* 表单 * 表单
*/ */
imageUrl: '', giftCategoryList: [], // 查询分类列表
// 上传地址
uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
uploadHeader: { 'Access-Token' : getToken() },
// 隐藏上传
hideUpload: false,
// 上传文件列表
uploadFiles: [
{name:"nihao",
url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
],
// 图片根目录
imagePath: process.env.VUE_APP_SERVER_URL,
dialogImageUrl: "",
dialogVisible: false
} }
}, },
@ -359,32 +455,35 @@ export default {
}, },
submitForm: function() { submitForm: function() {
console.log("dataForm",this.dataForm)
console.log("dialogImageUrl",this.dialogImageUrl)
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.dataForm.id == null) { if (this.dataForm.id == null) {
// 判断是否是新增还是修改 // 判断是否是新增还是修改
insertGiftCategoryApi(this.dataForm).then(res => { // insertGiftCategoryApi(this.dataForm).then(res => {
this.getList() // this.getList()
this.open = false // this.open = false
}) // })
} else { } else {
// 判断是否是新增还是修改 // // 判断是否是新增还是修改
updateGiftCategoryApi(this.dataForm).then(res => { // updateGiftCategoryApi(this.dataForm).then(res => {
this.getList() // this.getList()
this.open = false // this.open = false
}) // })
} }
}}) }})
}, },
handleIsopenSelect() {
this.$forceUpdate()
},
// 新增 // 新增
giftAdd() { giftAdd() {
this.dataForm = {} // this.dataForm = {}
this.dataForm.status = '启用' this.dataForm.status = '启用'
this.open = true this.open = true
this.title = '添加分类' this.title = '添加分类'
this.selectGiftCategory();
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
@ -415,35 +514,74 @@ export default {
* 表单 * 表单
*/ */
// 查询分类 // 查询分类
handleUpdate(row) { // handleUpdate(row) {
this.reset(); // this.reset();
const id = row.id || this.ids; // const id = row.id || this.ids;
getGoodsCateInfo(id).then(response => { // getGoodsCateInfo(id).then(response => {
this.form = response.data.cateInfo; // this.form = response.data.cateInfo;
this.uploadFiles = [{ url: response.data.imagePath + this.form.logo, status: 'finished'}] // this.uploadFiles = [{ url: response.data.imagePath + this.form.logo, status: 'finished'}]
this.open = true; // this.open = true;
this.title = "编辑商品分类"; // this.title = "编辑商品分类";
// });
// },
// 表单初始化
initializeForm() {
},
// 分类查询
selectGiftCategory() {
let queryParams = {pageSize : 1000}
getGiftCategoryApi(queryParams).then(response => {
this.giftCategoryList = response.data.records;
})
},
// 选择礼品类型
changeGiftType() {
// 点击之后处理
},
// 点击按钮处理
handleIsopenSelect() {
// this.$forceUpdate()
},
// 上传封面
handleUploadSuccessCover(file) {
this.dataForm.coverImage = file.data.fileName;
},
// 上传详情图
handleUploadSuccessGift(file) {
let newImage = {
name: file.data.original,
url: process.env.VUE_APP_SERVER_URL + file.data.fileName,
type: file.data.type
};
console.log("giftImages",this.dataForm.giftImages)
if (this.dataForm.giftImages == undefined) {
this.dataForm.giftImages = [];
}
this.dataForm.giftImages.push(newImage);
},
handleRemove(file, fileList) {
console.log("file.response.data.fileName",file);
this.dataForm.giftImages.forEach((image, index) => {
if (file.url === image.url) {
this.dataForm.giftImages.splice(index, 1);
}
}); });
console.log(file, fileList);
}, },
handlePictureCardPreview(file) {
handleUploadSuccess(file) { console.log(file);
this.form.logo = file.data.fileName; this.dialogImageUrl = file.url;
}, this.dialogVisible = true;
handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw);
},
beforeAvatarUpload(file) {
const isJPG = file.type;
const isLt2M = file.size / 1024 / 1024;
// if (!isJPG) {
// this.$message.error('上传头像图片只能是 JPG 格式!');
// }
// if (!isLt2M) {
// this.$message.error('上传头像图片大小不能超过 2MB!');
// }
return isJPG && isLt2M;
}, },
} }
@ -452,9 +590,23 @@ export default {
<style scoped> <style scoped>
.common-dialog >>> .el-upload--picture-card { .d-dialog >>> .el-upload--picture-card {
width: 60px; width: 100px;
height: 50px; height: 100px;
line-height: 60px; line-height: 100px;
}
.d-dialog >>> .avatar-uploader .el-upload {
width: 100px;
height: 100px;
}
.d-dialog >>> .el-upload-list--picture-card .el-upload-list__item {
width: 100px;
height: 100px;
}
.list-img{
width: 100px;
height: 100px;
} }
</style> </style>

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/MtInventoryController.java
View File

@ -1,6 +1,7 @@
package com.fuint.business.convenienceSore.controller; package com.fuint.business.convenienceSore.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.convenienceSore.dto.MtInventoryDto; import com.fuint.business.convenienceSore.dto.MtInventoryDto;
import com.fuint.business.convenienceSore.entity.MtInventory; import com.fuint.business.convenienceSore.entity.MtInventory;
@ -38,7 +39,7 @@ public class MtInventoryController extends BaseController {
public ResponseObject queryByPage(MtInventory mtInventory, public ResponseObject queryByPage(MtInventory mtInventory,
@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
com.baomidou.mybatisplus.extension.plugins.pagination.Page page =new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo,pageSize); Page page =new Page(pageNo,pageSize);
IPage<MtInventory> list = mtInventoryService.queryByPage(page,mtInventory); IPage<MtInventory> list = mtInventoryService.queryByPage(page,mtInventory);
return getSuccessResult(list); return getSuccessResult(list);
} }
@ -47,7 +48,7 @@ public class MtInventoryController extends BaseController {
public ResponseObject getListByPage(MtInventoryDto mtInventory, public ResponseObject getListByPage(MtInventoryDto mtInventory,
@RequestParam(value = "pageNo",defaultValue = "1") Integer page, @RequestParam(value = "pageNo",defaultValue = "1") Integer page,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){ @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
com.baomidou.mybatisplus.extension.plugins.pagination.Page pageNo =new com.baomidou.mybatisplus.extension.plugins.pagination.Page(page,pageSize); Page pageNo =new Page(page,pageSize);
IPage<MtInventoryVO> list = mtInventoryService.getListByPage(pageNo,mtInventory); IPage<MtInventoryVO> list = mtInventoryService.getListByPage(pageNo,mtInventory);
return getSuccessResult(list); return getSuccessResult(list);
} }

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/MtPurchaseServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.convenienceSore.service.impl; package com.fuint.business.convenienceSore.service.impl;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fuint.business.convenienceSore.dto.MtPurchaseDto; import com.fuint.business.convenienceSore.dto.MtPurchaseDto;
import com.fuint.business.convenienceSore.entity.*; import com.fuint.business.convenienceSore.entity.*;
@ -181,11 +182,9 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
return false; return false;
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean storage(Integer id) { public boolean storage(Integer id) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
String oilIntake = "进货入库"; String oilIntake = "进货入库";
int audit = iljStaffService.auditPrem(oilIntake); int audit = iljStaffService.auditPrem(oilIntake);
if (audit>0) { if (audit>0) {
@ -208,10 +207,8 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
stockService.insertStockTrack(stockTrack); stockService.insertStockTrack(stockTrack);
} }
} }
// 2.将数据填充到油罐里面 // 2.将数据填充到油罐里面
String status = "qrts"; String status = "qrts";
boolean edit = edit(id); boolean edit = edit(id);
int i = mtPurchaseDao.editStateById(id, status); int i = mtPurchaseDao.editStateById(id, status);
return true; return true;

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralGiftController.java
View File

@ -37,7 +37,7 @@ public class IntegralGiftController extends BaseController {
@GetMapping("queryByPage") @GetMapping("queryByPage")
public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@Param("integralGiftCategory") IntegralGift integralGift) { @Param("integralGift") IntegralGift integralGift) {
com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize); com.baomidou.mybatisplus.extension.plugins.pagination.Page page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page(pageNo, pageSize);
IPage<IntegralGiftVO> integralGiftCategoryIPage = this.integralGiftService.queryByPage(page, integralGift); IPage<IntegralGiftVO> integralGiftCategoryIPage = this.integralGiftService.queryByPage(page, integralGift);
return getSuccessResult(integralGiftCategoryIPage); return getSuccessResult(integralGiftCategoryIPage);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGift.java
View File

@ -118,7 +118,7 @@ public class IntegralGift implements Serializable {
/** /**
* 创建时间 * 创建时间
*/ */
private Date createTime; private Date createTime;
/** /**
* 更新时间 * 更新时间
*/ */