26 changed files with 1538 additions and 518 deletions
Split View
Diff Options
-
+53 -0CatmDogd-Mall-Front-test/src/api/model/AppletTaskUser.js
-
+9 -0CatmDogd-Mall-Front-test/src/api/ums/member.js
-
+430 -0CatmDogd-Mall-Front-test/src/views/marketing/AppletTask/index.vue
-
+218 -195CatmDogd-Mall-Front-test/src/views/marketing/AppletTaskUser/index.vue
-
+32 -15CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
-
+132 -25ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallTaskController.java
-
+39 -3ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTaskController.java
-
+92 -0ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTaskUserController.java
-
+28 -25ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletTask.java
-
+99 -0ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletTaskUser.java
-
+3 -56ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletTaskMapper.java
-
+13 -0ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletTaskUserMapper.java
-
+3 -1ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletTaskService.java
-
+62 -0ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletTaskUserService.java
-
+49 -7ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletTaskServiceImpl.java
-
+164 -0ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletTaskUserServiceImpl.java
-
+0 -185ruoyi-catdog/src/main/resources/mapper/model/AppletTaskMapper.xml
-
+19 -0ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CouponController.java
-
+14 -0ruoyi-mall/src/main/java/com/cyl/h5/service/H5CouponService.java
-
+10 -2ruoyi-mall/src/main/java/com/cyl/manager/marketing/domain/WechatStock.java
-
+1 -2ruoyi-mall/src/main/java/com/cyl/manager/marketing/mapper/WechatStockMapper.java
-
+2 -0ruoyi-mall/src/main/java/com/cyl/manager/marketing/service/IWechatStockService.java
-
+13 -0ruoyi-mall/src/main/java/com/cyl/manager/marketing/service/impl/WechatMemberCouponServiceImpl.java
-
+17 -0ruoyi-mall/src/main/java/com/cyl/manager/marketing/service/impl/WechatStockServiceImpl.java
-
+24 -1ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java
-
+12 -1ruoyi-mall/src/main/resources/mapper/marketing/WechatStockMapper.xml
+ 53
- 0
CatmDogd-Mall-Front-test/src/api/model/AppletTaskUser.js
View File
| @ -0,0 +1,53 @@ | |||
| import request from '@/utils/request' | |||
| // 查询任务中心列表 | |||
| export function listAppletTaskUser(query) { | |||
| return request({ | |||
| url: '/model/AppletTaskUser/list', | |||
| method: 'get', | |||
| params: query | |||
| }) | |||
| } | |||
| // 查询任务中心详细 | |||
| export function getAppletTaskUser(id) { | |||
| return request({ | |||
| url: '/model/AppletTaskUser/' + id, | |||
| method: 'get' | |||
| }) | |||
| } | |||
| // 新增任务中心 | |||
| export function addAppletTaskUser(data) { | |||
| return request({ | |||
| url: '/model/AppletTaskUser', | |||
| method: 'post', | |||
| data: data | |||
| }) | |||
| } | |||
| // 修改任务中心 | |||
| export function updateAppletTaskUser(data) { | |||
| return request({ | |||
| url: '/model/AppletTaskUser', | |||
| method: 'put', | |||
| data: data | |||
| }) | |||
| } | |||
| // 删除任务中心 | |||
| export function delAppletTaskUser(id) { | |||
| return request({ | |||
| url: '/model/AppletTaskUser/' + id, | |||
| method: 'delete' | |||
| }) | |||
| } | |||
| // 导出任务中心 | |||
| export function exportAppletTaskUser(query) { | |||
| return request({ | |||
| url: '/model/AppletTaskUser/export', | |||
| method: 'get', | |||
| params: query | |||
| }) | |||
| } | |||
+ 9
- 0
CatmDogd-Mall-Front-test/src/api/ums/member.js
View File
+ 430
- 0
CatmDogd-Mall-Front-test/src/views/marketing/AppletTask/index.vue
View File
| @ -0,0 +1,430 @@ | |||
| <template> | |||
| <div class="app-container"> | |||
| <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" | |||
| size="medium" class="ry_form"> | |||
| <el-form-item label="任务ID" prop="id"> | |||
| <el-input v-model="queryParams.id" placeholder="请输入任务ID" clearable size="small" | |||
| @keyup.enter.native="handleQuery" /> | |||
| </el-form-item> | |||
| <el-form-item label="类型" prop="type"> | |||
| <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small" filterable> | |||
| <el-option label="优惠券" value="0" /> | |||
| <el-option label="现金" value="1" /> | |||
| </el-select> | |||
| </el-form-item> | |||
| <!-- <el-form-item label="类型名称" prop="taskName"> | |||
| <el-input v-model="queryParams.taskName" placeholder="请输入类型名称" clearable size="small" | |||
| @keyup.enter.native="handleQuery" /> | |||
| </el-form-item> --> | |||
| <el-form-item label="标题" prop="title"> | |||
| <el-input v-model="queryParams.title" placeholder="请输入标题" clearable size="small" | |||
| @keyup.enter.native="handleQuery" /> | |||
| </el-form-item> | |||
| <!-- <template v-if="showMoreCondition"> --> | |||
| <el-form-item label="主题" prop="theme"> | |||
| <el-input v-model="queryParams.theme" placeholder="请输入主题" clearable size="small" | |||
| @keyup.enter.native="handleQuery" /> | |||
| </el-form-item> | |||
| <el-form-item label="结算优惠券" prop="taskCoupon"> | |||
| <el-select v-model="queryParams.taskCoupon" placeholder="请选择结算优惠券" clearable size="small" filterable> | |||
| <el-option | |||
| v-for="coupon in couponList" | |||
| :key="coupon.id" | |||
| :label="coupon.stockName" | |||
| :value="coupon.stockName"> | |||
| </el-option> | |||
| </el-select> | |||
| </el-form-item> | |||
| <el-form-item label="开始时间" prop="startTime"> | |||
| <el-date-picker clearable size="small" v-model="queryParams.startTime" type="datetime" | |||
| value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"> | |||
| </el-date-picker> | |||
| </el-form-item> | |||
| <el-form-item label="截至时间" prop="endTime"> | |||
| <el-date-picker clearable size="small" v-model="queryParams.endTime" type="datetime" | |||
| value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择截至时间"> | |||
| </el-date-picker> | |||
| </el-form-item> | |||
| <!-- </template> --> | |||
| <el-form-item class="flex_one tr"> | |||
| <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> | |||
| <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> | |||
| <!-- <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" size="mini" | |||
| @click="showMoreCondition = !showMoreCondition">{{ showMoreCondition ? '收起条件' : '展开条件' }}</el-button> --> | |||
| </el-form-item> | |||
| </el-form> | |||
| <el-row :gutter="10" class="mb8"> | |||
| <el-col :span="1.5"> | |||
| <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" | |||
| v-hasPermi="['model:appletTask:add']">新增</el-button> | |||
| </el-col> | |||
| <el-col :span="1.5"> | |||
| <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" | |||
| v-hasPermi="['model:appletTask:edit']">修改</el-button> | |||
| </el-col> | |||
| <el-col :span="1.5"> | |||
| <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" | |||
| @click="handleDelete" v-hasPermi="['model:appletTask:remove']">删除</el-button> | |||
| </el-col> | |||
| <el-col :span="1.5"> | |||
| <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" | |||
| @click="handleExport" v-hasPermi="['model:appletTask:export']">导出</el-button> | |||
| </el-col> | |||
| <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> | |||
| </el-row> | |||
| <el-table v-loading="loading" :data="appletTaskList" @selection-change="handleSelectionChange"> | |||
| <el-table-column type="selection" width="55" align="center" /> | |||
| <el-table-column label="任务ID" align="center" prop="id" width="80" /> | |||
| <el-table-column label="标题" align="center" prop="title" /> | |||
| <el-table-column label="主题" align="center" prop="theme" /> | |||
| <el-table-column label="类型" align="center" prop="type"> | |||
| <template slot-scope="scope"> | |||
| <span>{{ scope.row.type == '0' ? '优惠券' : '现金' }}</span> | |||
| </template> | |||
| </el-table-column> | |||
| <el-table-column label="结算优惠券" align="center" prop="taskCouponTitle" /> | |||
| <!-- <el-table-column label="类型名称" align="center" prop="taskName" />--> | |||
| <!-- <el-table-column label="小图" align="center" prop="taskIcon" v-if="columns[3].visible"/>--> | |||
| <el-table-column label="小图" align="center" prop="taskIcon"> | |||
| <template slot-scope="{ row }"> | |||
| <el-image v-if="row.taskIcon" :src="row.taskIcon" :preview-src-list="[row.taskIcon]" | |||
| class="small-img circle-img" /> | |||
| </template> | |||
| </el-table-column> | |||
| <el-table-column label="报酬" align="center" prop="taskMoney" /> | |||
| <!-- <el-table-column label="图片" align="center" prop="image" v-if="columns[5].visible"/>--> | |||
| <el-table-column label="图片" align="center" prop="image"> | |||
| <template slot-scope="{ row }"> | |||
| <el-image v-if="row.image" :src="row.image" :preview-src-list="[row.image]" | |||
| class="small-img circle-img" /> | |||
| </template> | |||
| </el-table-column> | |||
| <el-table-column label="开始时间" align="center" prop="startTime" width="180"> | |||
| <template slot-scope="scope"> | |||
| <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> | |||
| </template> | |||
| </el-table-column> | |||
| <el-table-column label="截至时间" align="center" prop="endTime" width="180"> | |||
| <template slot-scope="scope"> | |||
| <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> | |||
| </template> | |||
| </el-table-column> | |||
| <el-table-column label="最大领取数量" align="center" prop="maxGetNum" /> | |||
| <el-table-column label="已领取数量" align="center" prop="giveNum" /> | |||
| <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> | |||
| <template slot-scope="scope"> | |||
| <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" | |||
| v-hasPermi="['model:appletTask:edit']">修改</el-button> | |||
| <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" | |||
| v-hasPermi="['model:appletTask:remove']">删除</el-button> | |||
| </template> | |||
| </el-table-column> | |||
| </el-table> | |||
| <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" | |||
| @pagination="getList" /> | |||
| <!-- 添加或修改中心对话框 --> | |||
| <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body> | |||
| <el-form ref="form" :model="form" :rules="rules" label-width="108px"> | |||
| <el-form-item label="标题" prop="title"> | |||
| <el-input v-model="form.title" placeholder="请输入标题" /> | |||
| </el-form-item> | |||
| <el-form-item label="主题" prop="theme"> | |||
| <el-input v-model="form.theme" placeholder="请输入主题" /> | |||
| </el-form-item> | |||
| <el-form-item label="类型" prop="type"> | |||
| <el-select v-model="form.type" placeholder="请选择类型" filterable> | |||
| <el-option label="优惠券" value="0"></el-option> | |||
| <el-option label="现金" value="1"></el-option> | |||
| </el-select> | |||
| </el-form-item> | |||
| <!-- <el-form-item label="类型名称" prop="taskName">--> | |||
| <!-- <el-input v-model="form.taskName" placeholder="请输入类型名称" />--> | |||
| <!-- </el-form-item>--> | |||
| <el-form-item label="图标"> | |||
| <oss-image-upload v-model="form.taskIcon" :limit="1"></oss-image-upload> | |||
| </el-form-item> | |||
| <el-form-item label="报酬" prop="taskMoney"> | |||
| <el-input v-model="form.taskMoney" placeholder="请输入报酬" /> | |||
| </el-form-item> | |||
| <el-form-item label="图片"> | |||
| <oss-image-upload v-model="form.image" :limit="1"></oss-image-upload> | |||
| </el-form-item> | |||
| <el-form-item label="结算优惠券" prop="taskCoupon"> | |||
| <el-select v-model="form.taskCoupon" placeholder="请选择结算优惠券" clearable filterable> | |||
| <el-option | |||
| v-for="coupon in couponList" | |||
| :key="coupon.id" | |||
| :label="coupon.stockName" | |||
| :value="coupon.id"> | |||
| </el-option> | |||
| </el-select> | |||
| </el-form-item> | |||
| <el-form-item label="开始时间" prop="startTime"> | |||
| <el-date-picker clearable size="small" v-model="form.startTime" type="datetime" | |||
| value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"> | |||
| </el-date-picker> | |||
| </el-form-item> | |||
| <el-form-item label="截至时间" prop="endTime"> | |||
| <el-date-picker clearable size="small" v-model="form.endTime" type="datetime" | |||
| value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择截至时间"> | |||
| </el-date-picker> | |||
| </el-form-item> | |||
| <el-form-item label="最大领取数量" prop="maxGetNum"> | |||
| <el-input v-model="form.maxGetNum" placeholder="请输入最大领取数量" type="number" /> | |||
| </el-form-item> | |||
| </el-form> | |||
| <div slot="footer" class="dialog-footer"> | |||
| <el-button type="primary" @click="submitForm">确 定</el-button> | |||
| <el-button @click="cancel">取 消</el-button> | |||
| </div> | |||
| </el-dialog> | |||
| </div> | |||
| </template> | |||
| <script> | |||
| import { listAppletTask, getAppletTask, delAppletTask, addAppletTask, updateAppletTask, exportAppletTask } from "@/api/model/AppletTask"; | |||
| import { listWechatStock } from "@/api/marketing/wechatStock"; | |||
| export default { | |||
| name: "AppletTask", | |||
| dicts: [], | |||
| data() { | |||
| return { | |||
| // 遮罩层 | |||
| loading: true, | |||
| // 导出遮罩层 | |||
| exportLoading: false, | |||
| // 选中数组 | |||
| ids: [], | |||
| // 非单个禁用 | |||
| single: true, | |||
| // 非多个禁用 | |||
| multiple: true, | |||
| // 显示搜索条件 | |||
| showSearch: true, | |||
| // 总条数 | |||
| total: 0, | |||
| // 中心表格数据 | |||
| appletTaskList: [], | |||
| // 优惠券列表 | |||
| couponList: [], | |||
| // 弹出层标题 | |||
| title: "", | |||
| // 是否显示弹出层 | |||
| open: false, | |||
| // 查询参数 | |||
| queryParams: { | |||
| pageNum: 1, | |||
| pageSize: 10, | |||
| id: null, | |||
| type: null, | |||
| taskName: null, | |||
| taskIcon: null, | |||
| taskMoney: null, | |||
| taskCoupon: null, | |||
| image: null, | |||
| title: null, | |||
| theme: null, | |||
| startTime: null, | |||
| endTime: null, | |||
| maxGetNum: null, | |||
| giveNum: null, | |||
| }, | |||
| // 表单参数 | |||
| form: {}, | |||
| // 表单校验 | |||
| rules: { | |||
| type: [ | |||
| { required: true, message: "类型不能为空", trigger: "change" } | |||
| ], | |||
| taskName: [ | |||
| { required: true, message: "类型名称不能为空", trigger: "blur" } | |||
| ], | |||
| taskIcon: [ | |||
| { required: true, message: "小图不能为空", trigger: "blur" } | |||
| ], | |||
| taskMoney: [ | |||
| // { required: true, message: "报酬不能为空", trigger: "blur" } | |||
| ], | |||
| image: [ | |||
| { required: true, message: "图片不能为空", trigger: "blur" } | |||
| ], | |||
| title: [ | |||
| { required: true, message: "标题不能为空", trigger: "blur" } | |||
| ], | |||
| theme: [ | |||
| { required: true, message: "主题不能为空", trigger: "blur" } | |||
| ], | |||
| startTime: [ | |||
| { required: true, message: "开始时间不能为空", trigger: "blur" } | |||
| ], | |||
| endTime: [ | |||
| { required: true, message: "截至时间不能为空", trigger: "blur" } | |||
| ], | |||
| maxGetNum: [ | |||
| { required: true, message: "最大领取数量不能为空", trigger: "blur" } | |||
| ], | |||
| }, | |||
| columns: [ | |||
| { key: 1, label: "类型", visible: true }, | |||
| { key: 2, label: "结算优惠券", visible: true }, | |||
| { key: 3, label: "类型名称", visible: true }, | |||
| { key: 4, label: "小图", visible: false }, | |||
| { key: 5, label: "报酬", visible: true }, | |||
| { key: 6, label: "图片", visible: false }, | |||
| { key: 7, label: "标题", visible: true }, | |||
| { key: 8, label: "主题", visible: true }, | |||
| { key: 9, label: "开始时间", visible: true }, | |||
| { key: 10, label: "截至时间", visible: true }, | |||
| { key: 11, label: "最大领取数量", visible: true }, | |||
| { key: 12, label: "已领取数量", visible: true }, | |||
| ], | |||
| showMoreCondition: false | |||
| }; | |||
| }, | |||
| created() { | |||
| this.getList(); | |||
| this.getCouponList(); | |||
| }, | |||
| methods: { | |||
| /** 查询中心列表 */ | |||
| getList() { | |||
| this.loading = true; | |||
| listAppletTask(this.queryParams).then(response => { | |||
| this.appletTaskList = response.rows; | |||
| this.total = response.total; | |||
| this.loading = false; | |||
| }); | |||
| }, | |||
| /** 获取优惠券列表 */ | |||
| getCouponList() { | |||
| listWechatStock({ pageNum: 1, pageSize: 999999999 }).then(response => { | |||
| response.rows.forEach(item => { | |||
| item.id = item.id + ""; | |||
| }) | |||
| this.couponList = response.rows || []; | |||
| }); | |||
| }, | |||
| // 取消按钮 | |||
| cancel() { | |||
| this.open = false; | |||
| this.reset(); | |||
| }, | |||
| // 表单重置 | |||
| reset() { | |||
| this.form = { | |||
| id: null, | |||
| type: null, | |||
| taskName: null, | |||
| taskIcon: null, | |||
| taskMoney: null, | |||
| taskCoupon: null, | |||
| image: null, | |||
| title: null, | |||
| theme: null, | |||
| startTime: null, | |||
| endTime: null, | |||
| maxGetNum: null, | |||
| giveNum: null, | |||
| createTime: null, | |||
| createBy: null, | |||
| updateTime: null, | |||
| updateBy: null, | |||
| delFlag: null | |||
| }; | |||
| this.resetForm("form"); | |||
| }, | |||
| /** 搜索按钮操作 */ | |||
| handleQuery() { | |||
| this.queryParams.pageNum = 1; | |||
| this.getList(); | |||
| }, | |||
| /** 重置按钮操作 */ | |||
| resetQuery() { | |||
| this.resetForm("queryForm"); | |||
| this.queryParams.id = null; | |||
| this.handleQuery(); | |||
| }, | |||
| // 多选框选中数据 | |||
| handleSelectionChange(selection) { | |||
| this.ids = selection.map(item => item.id) | |||
| this.single = selection.length !== 1 | |||
| this.multiple = !selection.length | |||
| }, | |||
| /** 新增按钮操作 */ | |||
| handleAdd() { | |||
| this.reset(); | |||
| this.open = true; | |||
| this.title = "添加中心"; | |||
| }, | |||
| /** 修改按钮操作 */ | |||
| handleUpdate(row) { | |||
| this.reset(); | |||
| const id = row.id || this.ids | |||
| getAppletTask(id).then(response => { | |||
| this.form = response.data; | |||
| this.open = true; | |||
| this.title = "修改中心"; | |||
| }); | |||
| }, | |||
| /** 提交按钮 */ | |||
| submitForm() { | |||
| this.$refs["form"].validate(valid => { | |||
| if (valid) { | |||
| if (this.form.id != null) { | |||
| updateAppletTask(this.form).then(response => { | |||
| this.$modal.msgSuccess("修改成功"); | |||
| this.open = false; | |||
| this.getList(); | |||
| }); | |||
| } else { | |||
| addAppletTask(this.form).then(response => { | |||
| this.$modal.msgSuccess("新增成功"); | |||
| this.open = false; | |||
| this.getList(); | |||
| }); | |||
| } | |||
| } | |||
| }); | |||
| }, | |||
| /** 删除按钮操作 */ | |||
| handleDelete(row) { | |||
| const ids = row.id || this.ids; | |||
| this.$modal.confirm('是否确认删除中心编号为"' + ids + '"的数据项？').then(function () { | |||
| return delAppletTask(ids); | |||
| }).then(() => { | |||
| this.getList(); | |||
| this.$modal.msgSuccess("删除成功"); | |||
| }).catch(() => { }); | |||
| }, | |||
| /** 导出按钮操作 */ | |||
| handleExport() { | |||
| const queryParams = this.queryParams; | |||
| this.$modal.confirm('是否确认导出所有中心数据项？').then(() => { | |||
| this.exportLoading = true; | |||
| return exportAppletTask(queryParams); | |||
| }).then(response => { | |||
| this.download(response.msg); | |||
| this.exportLoading = false; | |||
| }).catch(() => { }); | |||
| } | |||
| } | |||
| }; | |||
| </script> | |||
CatmDogd-Mall-Front-test/src/views/model/AppletTask/index.vue → CatmDogd-Mall-Front-test/src/views/marketing/AppletTaskUser/index.vue
View File
+ 32
- 15
CatmDogd-Mall-Front-test/src/views/marketing/wechatStock/index.vue
View File
+ 132
- 25
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallTaskController.java
View File
| @ -1,77 +1,184 @@ | |||
| package com.ruoyi.applet.contoller; | |||
| import com.baomidou.mybatisplus.core.toolkit.StringUtils; | |||
| import com.cyl.h5.config.SecurityUtil; | |||
| import com.cyl.manager.marketing.service.IWechatStockService; | |||
| import com.cyl.manager.ums.domain.Member; | |||
| import com.ruoyi.common.core.controller.BaseController; | |||
| import com.ruoyi.common.core.domain.AjaxResult; | |||
| import com.ruoyi.common.core.page.TableDataInfo; | |||
| import com.ruoyi.model.domain.AppletTask; | |||
| import com.ruoyi.model.domain.AppletTaskUser; | |||
| import com.ruoyi.model.service.IAppletTaskService; | |||
| import com.ruoyi.model.service.IAppletTaskUserService; | |||
| import io.swagger.annotations.Api; | |||
| import io.swagger.annotations.ApiOperation; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| import org.springframework.beans.BeanUtils; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.web.bind.annotation.*; | |||
| import java.time.LocalDateTime; | |||
| import java.util.Arrays; | |||
| import java.util.List; | |||
| import java.util.stream.Collectors; | |||
| @Slf4j | |||
| @Api(description = "下单小程序端 - 任务中心相关接口") | |||
| @RestController | |||
| @RequestMapping("/applet/mall/task") | |||
| @RequestMapping("/h5/mall/task") | |||
| public class ApiMallTaskController extends BaseController { | |||
| @Autowired | |||
| private IAppletTaskService appletTaskService; | |||
| // 任务中心列表 | |||
| @ApiOperation("mall端-任务中心列表") | |||
| @Autowired | |||
| private IAppletTaskUserService appletTaskUserService; | |||
| @Autowired | |||
| private IWechatStockService wechatStockService; | |||
| // 任务中心待领取列表 | |||
| @ApiOperation("mall端-任务中心待领取列表") | |||
| @GetMapping("/list") | |||
| public TableDataInfo list(AppletTask appletTask) { | |||
| Member member = SecurityUtil.getLocalMember(); | |||
| List<Long> notIds = appletTaskUserService.lambdaQuery() | |||
| .eq(AppletTaskUser::getMemberId, member.getId()) | |||
| .select(AppletTaskUser::getTaskId) | |||
| .list().stream().map(n -> n.getTaskId()) | |||
| .collect(Collectors.toList()); | |||
| startPage(); | |||
| List<AppletTask> list = appletTaskService.selectAppletTaskList(appletTask); | |||
| List<AppletTask> list = appletTaskService.lambdaQuery() | |||
| .notIn(notIds.size() > 0, AppletTask::getId, notIds) | |||
| .list(); | |||
| for (AppletTask task : list) { | |||
| if (StringUtils.isNotBlank(task.getTaskCoupon())){ | |||
| List<String> ids = Arrays.asList(task.getTaskCoupon().split(",")); | |||
| task.setTaskCouponTitle(wechatStockService.getStockTitleByIds(ids)); | |||
| } | |||
| } | |||
| // for (AppletTask task : list) { | |||
| // task.setStatus(appletTaskUserService.lambdaQuery() | |||
| // .eq(AppletTaskUser::getMemberId, member.getId()) | |||
| // .eq(AppletTaskUser::getTaskId, task.getId()) | |||
| // .count() > 0); | |||
| // } | |||
| return getDataTable(list); | |||
| } | |||
| // 任务中心已领取列表 | |||
| @ApiOperation("mall端-任务中心已领取列表") | |||
| @GetMapping("/listByUser") | |||
| public TableDataInfo listByUser(AppletTaskUser appletTask) { | |||
| startPage(); | |||
| Member member = SecurityUtil.getLocalMember(); | |||
| appletTask.setMemberId(member.getId()); | |||
| List<AppletTaskUser> list = appletTaskUserService.selectAppletTaskList(appletTask); | |||
| for (AppletTaskUser task : list) { | |||
| if (StringUtils.isNotBlank(task.getTaskCoupon())){ | |||
| List<String> ids = Arrays.asList(task.getTaskCoupon().split(",")); | |||
| task.setTaskCouponTitle(wechatStockService.getStockTitleByIds(ids)); | |||
| } | |||
| } | |||
| return getDataTable(list); | |||
| } | |||
| //根据标识查询任务详情 | |||
| @ApiOperation("mall端-根据标识查询任务详情") | |||
| //根据标识查询待领取任务详情 | |||
| @ApiOperation("mall端-根据标识查询待领取任务详情") | |||
| @GetMapping("/taskDetail/{id}") | |||
| public AjaxResult taskDetail(AppletTask appletTask){ | |||
| Member member = SecurityUtil.getLocalMember(); | |||
| AppletTask task = appletTaskService.selectAppletTaskById(appletTask.getId()); | |||
| // task.setStatus(appletTaskUserService.lambdaQuery() | |||
| // .eq(AppletTaskUser::getMemberId, member.getId()) | |||
| // .eq(AppletTaskUser::getTaskId, task.getId()) | |||
| // .count() > 0); | |||
| return AjaxResult.success("任务详情",task); | |||
| } | |||
| //根据标识查询已领取任务详情 | |||
| @ApiOperation("mall端-根据标识查询已领取任务详情") | |||
| @GetMapping("/taskUserDetail/{id}") | |||
| public AjaxResult taskUserDetail(AppletTaskUser appletTask){ | |||
| AppletTaskUser task = appletTaskUserService.selectAppletTaskById(appletTask.getId()); | |||
| if (StringUtils.isNotBlank(task.getTaskCoupon())){ | |||
| List<String> ids = Arrays.asList(task.getTaskCoupon().split(",")); | |||
| task.setTaskCouponTitle(wechatStockService.getStockTitleByIds(ids)); | |||
| } | |||
| return AjaxResult.success("任务详情",task); | |||
| } | |||
| //接受任务 | |||
| @ApiOperation("mall端-接受任务") | |||
| @GetMapping("/acceptTask") | |||
| public AjaxResult acceptTask(@RequestBody AppletTask appletTask){ | |||
| appletTask.setStatus(1); | |||
| int i = appletTaskService.updateAppletTask(appletTask); | |||
| if (i>0){ | |||
| return AjaxResult.success("接受成功"); | |||
| } | |||
| return AjaxResult.error("接受失败"); | |||
| } | |||
| public AjaxResult acceptTask(AppletTask appletTask){ | |||
| //提交任务信息 | |||
| @ApiOperation("mall端-提交任务信息") | |||
| @PostMapping("/submitTask") | |||
| public AjaxResult submitTask(@RequestBody AppletTask appletTask){ | |||
| appletTask.setTaskState(1); | |||
| int i = appletTaskService.updateAppletTask(appletTask); | |||
| if (i>0){ | |||
| return AjaxResult.success("提交成功"); | |||
| } | |||
| return AjaxResult.error("提交失败"); | |||
| } | |||
| Member member = SecurityUtil.getLocalMember(); | |||
| AppletTask task = appletTaskService.selectAppletTaskById(appletTask.getId()); | |||
| AppletTaskUser taskUser = new AppletTaskUser(); | |||
| BeanUtils.copyProperties(task, taskUser); | |||
| taskUser.setMemberId(member.getId()); | |||
| taskUser.setId(null); | |||
| taskUser.setTaskId(task.getId()); | |||
| appletTaskUserService.save(taskUser); | |||
| task.setGiveNum(task.getGiveNum() + 1); | |||
| appletTaskService.updateById(task); | |||
| return AjaxResult.success("接受成功"); | |||
| } | |||
| //提交任务信息 | |||
| @ApiOperation("mall端-提交任务信息") | |||
| @PostMapping("/submitTask") | |||
| public AjaxResult submitTask(@RequestBody AppletTaskUser appletTask){ | |||
| appletTaskUserService.lambdaUpdate() | |||
| .eq(AppletTaskUser::getId, appletTask.getId()) | |||
| .set(AppletTaskUser::getProveTxt, appletTask.getProveTxt()) | |||
| .set(AppletTaskUser::getProveImage, appletTask.getProveImage()) | |||
| .set(AppletTaskUser::getStatus, 1) | |||
| .set(AppletTaskUser::getSubmitTime, LocalDateTime.now()) | |||
| .update(); | |||
| return AjaxResult.success("提交成功"); | |||
| } | |||
| } | |||
+ 39
- 3
ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTaskController.java
View File
+ 92
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTaskUserController.java
View File
| @ -0,0 +1,92 @@ | |||
| package com.ruoyi.model.controller; | |||
| import com.ruoyi.common.annotation.Log; | |||
| import com.ruoyi.common.core.controller.BaseController; | |||
| import com.ruoyi.common.core.domain.AjaxResult; | |||
| import com.ruoyi.common.core.page.TableDataInfo; | |||
| import com.ruoyi.common.enums.BusinessType; | |||
| import com.ruoyi.common.utils.poi.ExcelUtil; | |||
| import com.ruoyi.model.domain.AppletTask; | |||
| import com.ruoyi.model.domain.AppletTaskUser; | |||
| import com.ruoyi.model.service.IAppletTaskService; | |||
| import com.ruoyi.model.service.IAppletTaskUserService; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.security.access.prepost.PreAuthorize; | |||
| import org.springframework.web.bind.annotation.*; | |||
| import java.util.List; | |||
| /** | |||
| * 任务中心Controller | |||
| * | |||
| * @author daixiande | |||
| * @date 2025-04-24 | |||
| */ | |||
| @RestController | |||
| @RequestMapping("/model/AppletTaskUser") | |||
| public class AppletTaskUserController extends BaseController { | |||
| @Autowired | |||
| private IAppletTaskUserService appletTaskUserService; | |||
| /** | |||
| * 查询任务中心列表 | |||
| */ | |||
| @PreAuthorize("@ss.hasPermi('model:AppletTaskUser:list')") | |||
| @GetMapping("/list") | |||
| public TableDataInfo list(AppletTaskUser appletTask) { | |||
| startPage(); | |||
| List<AppletTaskUser> list = appletTaskUserService.selectAppletTaskList(appletTask); | |||
| return getDataTable(list); | |||
| } | |||
| /** | |||
| * 导出任务中心列表 | |||
| */ | |||
| @PreAuthorize("@ss.hasPermi('model:AppletTaskUser:export')") | |||
| @Log(title = "任务中心", businessType = BusinessType.EXPORT) | |||
| @GetMapping("/export") | |||
| public AjaxResult export(AppletTaskUser appletTask) { | |||
| List<AppletTaskUser> list = appletTaskUserService.selectAppletTaskList(appletTask); | |||
| ExcelUtil<AppletTaskUser> util = new ExcelUtil<AppletTaskUser>(AppletTaskUser.class); | |||
| return util.exportExcel(list, "任务中心数据"); | |||
| } | |||
| /** | |||
| * 获取任务中心详细信息 | |||
| */ | |||
| @PreAuthorize("@ss.hasPermi('model:AppletTaskUser:query')") | |||
| @GetMapping(value = "/{id}") | |||
| public AjaxResult getInfo(@PathVariable("id") Long id) { | |||
| return AjaxResult.success(appletTaskUserService.selectAppletTaskById(id)); | |||
| } | |||
| /** | |||
| * 新增任务中心 | |||
| */ | |||
| @PreAuthorize("@ss.hasPermi('model:AppletTaskUser:add')") | |||
| @Log(title = "任务中心", businessType = BusinessType.INSERT) | |||
| @PostMapping | |||
| public AjaxResult add(@RequestBody AppletTaskUser appletTask) { | |||
| return toAjax(appletTaskUserService.insertAppletTask(appletTask)); | |||
| } | |||
| /** | |||
| * 修改任务中心 | |||
| */ | |||
| @PreAuthorize("@ss.hasPermi('model:AppletTaskUser:edit')") | |||
| @Log(title = "任务中心", businessType = BusinessType.UPDATE) | |||
| @PutMapping | |||
| public AjaxResult edit(@RequestBody AppletTaskUser appletTask) { | |||
| return toAjax(appletTaskUserService.updateAppletTask(appletTask)); | |||
| } | |||
| /** | |||
| * 删除任务中心 | |||
| */ | |||
| @PreAuthorize("@ss.hasPermi('model:AppletTaskUser:remove')") | |||
| @Log(title = "任务中心", businessType = BusinessType.DELETE) | |||
| @DeleteMapping("/{ids}") | |||
| public AjaxResult remove(@PathVariable Long[] ids) { | |||
| return toAjax(appletTaskUserService.deleteAppletTaskByIds(ids)); | |||
| } | |||
| } | |||
+ 28
- 25
ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletTask.java
View File
+ 99
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletTaskUser.java
View File
| @ -0,0 +1,99 @@ | |||
| package com.ruoyi.model.domain; | |||
| import com.baomidou.mybatisplus.annotation.TableField; | |||
| import com.fasterxml.jackson.annotation.JsonFormat; | |||
| import com.ruoyi.common.annotation.Excel; | |||
| import com.ruoyi.common.core.domain.BaseAudit; | |||
| import lombok.Data; | |||
| import java.math.BigDecimal; | |||
| import java.time.LocalDateTime; | |||
| /** | |||
| * 任务中心对象 applet_task | |||
| * | |||
| * @author daixiande | |||
| */ | |||
| @Data | |||
| public class AppletTaskUser extends BaseAudit { | |||
| private static final long serialVersionUID = 1L; | |||
| /** 标识 */ | |||
| private Long id; | |||
| /** 所属任务 */ | |||
| private Long taskId; | |||
| /** 下单用户标识 */ | |||
| @Excel(name = "下单用户标识") | |||
| private Long memberId; | |||
| /** 任务类型名称 */ | |||
| @Excel(name = "任务类型名称") | |||
| private String taskName; | |||
| /** 任务小图 */ | |||
| @Excel(name = "任务小图") | |||
| private String taskIcon; | |||
| /** 任务报酬 */ | |||
| @Excel(name = "任务报酬") | |||
| private BigDecimal taskMoney; | |||
| /** 任务结算的优惠劵 */ | |||
| @Excel(name = "任务结算的优惠劵") | |||
| private String taskCoupon; | |||
| /** 任务类型 任务类型，0优惠劵1现金 */ | |||
| @Excel(name = "任务类型") | |||
| private String type; | |||
| /** 图片 */ | |||
| @Excel(name = "图片") | |||
| private String image; | |||
| /** 标题 */ | |||
| @Excel(name = "标题") | |||
| private String title; | |||
| /** 主题 */ | |||
| @Excel(name = "主题") | |||
| private String theme; | |||
| /** 任务开始时间 */ | |||
| @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||
| @Excel(name = "任务开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | |||
| private LocalDateTime startTime; | |||
| /** 任务截至时间 */ | |||
| @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||
| @Excel(name = "任务截至时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | |||
| private LocalDateTime endTime; | |||
| /** 提交审核时间 */ | |||
| @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||
| @Excel(name = "提交审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | |||
| private LocalDateTime submitTime; | |||
| /** 证明截图 */ | |||
| @Excel(name = "证明截图") | |||
| private String proveImage; | |||
| /** 证明说明 */ | |||
| @Excel(name = "证明说明") | |||
| private String proveTxt; | |||
| /** 驳回说明 */ | |||
| @Excel(name = "驳回说明") | |||
| private String rejectTxt; | |||
| /** 审核流程状态 */ | |||
| @Excel(name = "审核流程状态 0待提交 1待审核 2已通过 3已拒绝") | |||
| private Integer status; | |||
| /** 优惠劵名称 */ | |||
| @TableField(exist = false) | |||
| private String taskCouponTitle; | |||
| } | |||
+ 3
- 56
ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletTaskMapper.java
View File
+ 13
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletTaskUserMapper.java
View File
| @ -0,0 +1,13 @@ | |||
| package com.ruoyi.model.mapper; | |||
| import com.baomidou.mybatisplus.core.mapper.BaseMapper; | |||
| import com.ruoyi.model.domain.AppletTask; | |||
| import com.ruoyi.model.domain.AppletTaskUser; | |||
| /** | |||
| * 任务中心Mapper接口 | |||
| * | |||
| * @author daixiande | |||
| */ | |||
| public interface AppletTaskUserMapper extends BaseMapper<AppletTaskUser> { | |||
| } | |||
+ 3
- 1
ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletTaskService.java
View File
+ 62
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletTaskUserService.java
View File
| @ -0,0 +1,62 @@ | |||
| package com.ruoyi.model.service; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| import com.ruoyi.model.domain.AppletTask; | |||
| import com.ruoyi.model.domain.AppletTaskUser; | |||
| import java.util.List; | |||
| /** | |||
| * 任务中心Service接口 | |||
| * | |||
| * @author daixiande | |||
| */ | |||
| public interface IAppletTaskUserService extends IService<AppletTaskUser> { | |||
| /** | |||
| * 查询任务中心 | |||
| * | |||
| * @param id 任务中心主键 | |||
| * @return 任务中心 | |||
| */ | |||
| AppletTaskUser selectAppletTaskById(Long id); | |||
| /** | |||
| * 查询任务中心列表 | |||
| * | |||
| * @param appletTask 任务中心 | |||
| * @return 任务中心集合 | |||
| */ | |||
| List<AppletTaskUser> selectAppletTaskList(AppletTaskUser appletTask); | |||
| /** | |||
| * 新增任务中心 | |||
| * | |||
| * @param appletTask 任务中心 | |||
| * @return 结果 | |||
| */ | |||
| int insertAppletTask(AppletTaskUser appletTask); | |||
| /** | |||
| * 修改任务中心 | |||
| * | |||
| * @param appletTask 任务中心 | |||
| * @return 结果 | |||
| */ | |||
| int updateAppletTask(AppletTaskUser appletTask); | |||
| /** | |||
| * 批量删除任务中心 | |||
| * | |||
| * @param ids 需要删除的任务中心主键集合 | |||
| * @return 结果 | |||
| */ | |||
| int deleteAppletTaskByIds(Long[] ids); | |||
| /** | |||
| * 删除任务中心信息 | |||
| * | |||
| * @param id 任务中心主键 | |||
| * @return 结果 | |||
| */ | |||
| int deleteAppletTaskById(Long id); | |||
| } | |||
+ 49
- 7
ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletTaskServiceImpl.java
View File
+ 164
- 0
ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletTaskUserServiceImpl.java
View File
| @ -0,0 +1,164 @@ | |||
| package com.ruoyi.model.service.impl; | |||
| import com.baomidou.mybatisplus.core.toolkit.StringUtils; | |||
| import com.baomidou.mybatisplus.core.toolkit.Wrappers; | |||
| import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||
| import com.cyl.h5.config.SecurityUtil; | |||
| import com.cyl.h5.service.H5CouponService; | |||
| import com.cyl.manager.marketing.pojo.SendCouponRequest; | |||
| import com.cyl.manager.marketing.service.IWechatStockService; | |||
| import com.cyl.manager.ums.domain.Member; | |||
| import com.cyl.manager.ums.service.MemberService; | |||
| import com.ruoyi.common.core.domain.AjaxResult; | |||
| import com.ruoyi.common.exception.ServiceException; | |||
| import com.ruoyi.common.utils.DateUtils; | |||
| import com.ruoyi.model.domain.AppletTask; | |||
| import com.ruoyi.model.domain.AppletTaskUser; | |||
| import com.ruoyi.model.mapper.AppletTaskMapper; | |||
| import com.ruoyi.model.mapper.AppletTaskUserMapper; | |||
| import com.ruoyi.model.service.IAppletTaskService; | |||
| import com.ruoyi.model.service.IAppletTaskUserService; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.stereotype.Service; | |||
| import java.time.LocalDateTime; | |||
| import java.util.Arrays; | |||
| import java.util.List; | |||
| /** | |||
| * 任务中心Service业务层处理 | |||
| * | |||
| * @author daixiande | |||
| */ | |||
| @Service | |||
| public class AppletTaskUserServiceImpl extends ServiceImpl<AppletTaskUserMapper, AppletTaskUser> implements IAppletTaskUserService { | |||
| @Autowired | |||
| private IWechatStockService wechatStockService; | |||
| @Autowired | |||
| private H5CouponService h5CouponService; | |||
| @Autowired | |||
| private MemberService memberService; | |||
| /** | |||
| * 查询任务中心 | |||
| * | |||
| * @param id 任务中心主键 | |||
| * @return 任务中心 | |||
| */ | |||
| @Override | |||
| public AppletTaskUser selectAppletTaskById(Long id) { | |||
| AppletTaskUser task = getById(id); | |||
| if (StringUtils.isNotBlank(task.getTaskCoupon())){ | |||
| List<String> ids = Arrays.asList(task.getTaskCoupon().split(",")); | |||
| task.setTaskCouponTitle(wechatStockService.getStockTitleByIds(ids)); | |||
| } | |||
| return task; | |||
| } | |||
| /** | |||
| * 查询任务中心列表 | |||
| * | |||
| * @param appletTask 任务中心 | |||
| * @return 任务中心 | |||
| */ | |||
| @Override | |||
| public List<AppletTaskUser> selectAppletTaskList(AppletTaskUser appletTask) { | |||
| List<AppletTaskUser> appletTasks = baseMapper.selectList(Wrappers.<AppletTaskUser>lambdaQuery() | |||
| .eq(appletTask.getId() != null, AppletTaskUser::getId, appletTask.getId()) | |||
| .eq(appletTask.getTaskId() != null, AppletTaskUser::getTaskId, appletTask.getTaskId()) | |||
| .eq(appletTask.getMemberId() != null, AppletTaskUser::getMemberId, appletTask.getMemberId()) | |||
| .like(appletTask.getTaskName() != null, AppletTaskUser::getTaskName, appletTask.getTaskName()) | |||
| .eq(appletTask.getType() != null, AppletTaskUser::getType, appletTask.getType()) | |||
| .like(appletTask.getTitle() != null, AppletTaskUser::getTitle, appletTask.getTitle()) | |||
| .like(appletTask.getTheme() != null, AppletTaskUser::getTheme, appletTask.getTheme()) | |||
| .ge(appletTask.getStartTime() != null, AppletTaskUser::getStartTime, appletTask.getStartTime()) | |||
| .le(appletTask.getEndTime() != null, AppletTaskUser::getEndTime, appletTask.getEndTime()) | |||
| .eq(appletTask.getStatus() != null, AppletTaskUser::getStatus, appletTask.getStatus()) | |||
| .orderByDesc(AppletTaskUser::getCreateTime)); | |||
| for (AppletTaskUser task : appletTasks) { | |||
| if (StringUtils.isNotBlank(task.getTaskCoupon())){ | |||
| List<String> ids = Arrays.asList(task.getTaskCoupon().split(",")); | |||
| task.setTaskCouponTitle(wechatStockService.getStockTitleByIds(ids)); | |||
| } | |||
| } | |||
| return appletTasks; | |||
| } | |||
| /** | |||
| * 新增任务中心 | |||
| * | |||
| * @param appletTask 任务中心 | |||
| * @return 结果 | |||
| */ | |||
| @Override | |||
| public int insertAppletTask(AppletTaskUser appletTask) { | |||
| appletTask.setCreateTime(LocalDateTime.now()); | |||
| return baseMapper.insert(appletTask); | |||
| } | |||
| /** | |||
| * 修改任务中心 | |||
| * | |||
| * @param appletTask 任务中心 | |||
| * @return 结果 | |||
| */ | |||
| @Override | |||
| public int updateAppletTask(AppletTaskUser appletTask) { | |||
| appletTask.setUpdateTime(DateUtils.getNowDate()); | |||
| if (appletTask.getStatus() == 2 && | |||
| "0".equals(appletTask.getType()) && | |||
| StringUtils.isNotBlank(appletTask.getTaskCoupon())){ | |||
| Member member = memberService.selectById(appletTask.getMemberId()); | |||
| if (member == null){ | |||
| throw new ServiceException("会员不存在"); | |||
| } | |||
| String phone = memberService.getPhoneDecrypted(member.getPhoneEncrypted()); | |||
| Arrays.stream(appletTask.getTaskCoupon().split(",")).map(Long::valueOf).forEach(c -> { | |||
| SendCouponRequest sendCouponRequest = new SendCouponRequest(); | |||
| sendCouponRequest.setPhone(phone); | |||
| sendCouponRequest.setStockId(c); | |||
| h5CouponService.sendCoupon(sendCouponRequest); | |||
| }); | |||
| } | |||
| return baseMapper.updateById(appletTask); | |||
| } | |||
| /** | |||
| * 批量删除任务中心 | |||
| * | |||
| * @param ids 需要删除的任务中心主键 | |||
| * @return 结果 | |||
| */ | |||
| @Override | |||
| public int deleteAppletTaskByIds(Long[] ids) { | |||
| return baseMapper.deleteBatchIds(Arrays.asList(ids)); | |||
| } | |||
| /** | |||
| * 删除任务中心信息 | |||
| * | |||
| * @param id 任务中心主键 | |||
| * @return 结果 | |||
| */ | |||
| @Override | |||
| public int deleteAppletTaskById(Long id) { | |||
| return baseMapper.deleteById(id); | |||
| } | |||
| } | |||
+ 0
- 185
ruoyi-catdog/src/main/resources/mapper/model/AppletTaskMapper.xml
View File
| @ -1,185 +0,0 @@ | |||
| <?xml version="1.0" encoding="UTF-8" ?> | |||
| <!DOCTYPE mapper | |||
| PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |||
| "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |||
| <mapper namespace="com.ruoyi.model.mapper.AppletTaskMapper"> | |||
| <resultMap type="AppletTask" id="AppletTaskResult"> | |||
| <result property="id" column="id"/> | |||
| <result property="status" column="status"/> | |||
| <result property="memberId" column="member_id"/> | |||
| <result property="taskName" column="task_name"/> | |||
| <result property="taskIcon" column="task_icon"/> | |||
| <result property="taskMoney" column="task_money"/> | |||
| <result property="image" column="image"/> | |||
| <result property="title" column="title"/> | |||
| <result property="theme" column="theme"/> | |||
| <result property="taskEndTime" column="task_end_time"/> | |||
| <result property="taskState" column="task_state"/> | |||
| <result property="examineState" column="examine_state"/> | |||
| <result property="examineText" column="examine_text"/> | |||
| <result property="examineImage" column="examine_image"/> | |||
| <result property="createTime" column="create_time"/> | |||
| <result property="createBy" column="create_by"/> | |||
| <result property="updateTime" column="update_time"/> | |||
| <result property="updateBy" column="update_by"/> | |||
| <result property="delFlag" column="del_flag"/> | |||
| </resultMap> | |||
| <sql id="selectAppletTaskVo"> | |||
| select id, status, member_id, task_name, task_icon, task_money, image, title, theme, task_end_time, task_state, examine_state, examine_text, examine_image, create_time, create_by, update_time, update_by, del_flag from applet_task | |||
| </sql> | |||
| <select id="selectList" parameterType="AppletTask" resultMap="AppletTaskResult"> | |||
| <include refid="selectAppletTaskVo"/> | |||
| <where> | |||
| <if test="status != null "> and status = #{status}</if> | |||
| <if test="memberId != null "> and member_id = #{memberId}</if> | |||
| <if test="taskName != null and taskName != ''"> and task_name like concat('%', #{taskName}, '%')</if> | |||
| <if test="taskIcon != null and taskIcon != ''"> and task_icon = #{taskIcon}</if> | |||
| <if test="taskMoney != null "> and task_money = #{taskMoney}</if> | |||
| <if test="image != null and image != ''"> and image = #{image}</if> | |||
| <if test="title != null and title != ''"> and title = #{title}</if> | |||
| <if test="theme != null and theme != ''"> and theme = #{theme}</if> | |||
| <if test="taskEndTime != null "> and task_end_time = #{taskEndTime}</if> | |||
| <if test="taskState != null "> and task_state = #{taskState}</if> | |||
| <if test="examineState != null "> and examine_state = #{examineState}</if> | |||
| <if test="examineText != null and examineText != ''"> and examine_text = #{examineText}</if> | |||
| <if test="examineImage != null and examineImage != ''"> and examine_image = #{examineImage}</if> | |||
| </where> | |||
| </select> | |||
| <select id="selectById" parameterType="Long" resultMap="AppletTaskResult"> | |||
| <include refid="selectAppletTaskVo"/> | |||
| where id = #{id} | |||
| </select> | |||
| <insert id="insert" parameterType="AppletTask"> | |||
| insert into applet_task | |||
| <trim prefix="(" suffix=")" suffixOverrides=","> | |||
| <if test="id != null">id,</if> | |||
| <if test="status != null">status,</if> | |||
| <if test="memberId != null">member_id,</if> | |||
| <if test="taskName != null">task_name,</if> | |||
| <if test="taskIcon != null">task_icon,</if> | |||
| <if test="taskMoney != null">task_money,</if> | |||
| <if test="image != null">image,</if> | |||
| <if test="title != null">title,</if> | |||
| <if test="theme != null">theme,</if> | |||
| <if test="taskEndTime != null">task_end_time,</if> | |||
| <if test="taskState != null">task_state,</if> | |||
| <if test="examineState != null">examine_state,</if> | |||
| <if test="examineText != null">examine_text,</if> | |||
| <if test="examineImage != null">examine_image,</if> | |||
| <if test="createTime != null">create_time,</if> | |||
| <if test="createBy != null">create_by,</if> | |||
| <if test="updateTime != null">update_time,</if> | |||
| <if test="updateBy != null">update_by,</if> | |||
| <if test="delFlag != null">del_flag,</if> | |||
| </trim> | |||
| <trim prefix="values (" suffix=")" suffixOverrides=","> | |||
| <if test="id != null">#{id},</if> | |||
| <if test="status != null">#{status},</if> | |||
| <if test="memberId != null">#{memberId},</if> | |||
| <if test="taskName != null">#{taskName},</if> | |||
| <if test="taskIcon != null">#{taskIcon},</if> | |||
| <if test="taskMoney != null">#{taskMoney},</if> | |||
| <if test="image != null">#{image},</if> | |||
| <if test="title != null">#{title},</if> | |||
| <if test="theme != null">#{theme},</if> | |||
| <if test="taskEndTime != null">#{taskEndTime},</if> | |||
| <if test="taskState != null">#{taskState},</if> | |||
| <if test="examineState != null">#{examineState},</if> | |||
| <if test="examineText != null">#{examineText},</if> | |||
| <if test="examineImage != null">#{examineImage},</if> | |||
| <if test="createTime != null">#{createTime},</if> | |||
| <if test="createBy != null">#{createBy},</if> | |||
| <if test="updateTime != null">#{updateTime},</if> | |||
| <if test="updateBy != null">#{updateBy},</if> | |||
| <if test="delFlag != null">#{delFlag},</if> | |||
| </trim> | |||
| </insert> | |||
| <update id="update" parameterType="AppletTask"> | |||
| update applet_task | |||
| <trim prefix="SET" suffixOverrides=","> | |||
| <if test="status != null">status = #{status},</if> | |||
| <if test="memberId != null">member_id = #{memberId},</if> | |||
| <if test="taskName != null">task_name = #{taskName},</if> | |||
| <if test="taskIcon != null">task_icon = #{taskIcon},</if> | |||
| <if test="taskMoney != null">task_money = #{taskMoney},</if> | |||
| <if test="image != null">image = #{image},</if> | |||
| <if test="title != null">title = #{title},</if> | |||
| <if test="theme != null">theme = #{theme},</if> | |||
| <if test="taskEndTime != null">task_end_time = #{taskEndTime},</if> | |||
| <if test="taskState != null">task_state = #{taskState},</if> | |||
| <if test="examineState != null">examine_state = #{examineState},</if> | |||
| <if test="examineText != null">examine_text = #{examineText},</if> | |||
| <if test="examineImage != null">examine_image = #{examineImage},</if> | |||
| <if test="createTime != null">create_time = #{createTime},</if> | |||
| <if test="createBy != null">create_by = #{createBy},</if> | |||
| <if test="updateTime != null">update_time = #{updateTime},</if> | |||
| <if test="updateBy != null">update_by = #{updateBy},</if> | |||
| <if test="delFlag != null">del_flag = #{delFlag},</if> | |||
| </trim> | |||
| where id = #{id} | |||
| </update> | |||
| <delete id="deleteById" parameterType="Long"> | |||
| delete from applet_task where id = #{id} | |||
| </delete> | |||
| <delete id="deleteByIds" parameterType="String"> | |||
| delete from applet_task where id in | |||
| <foreach item="id" collection="array" open="(" separator="," close=")"> | |||
| #{id} | |||
| </foreach> | |||
| </delete> | |||
| <insert id="insertOrUpdate" parameterType="AppletTask" useGeneratedKeys="true" keyProperty="id"> | |||
| insert into applet_task | |||
| <trim prefix="(" suffix=")" suffixOverrides=","> | |||
| <if test="id != null"> | |||
| id, | |||
| </if> | |||
| status, member_id, task_name, task_icon, task_money, image, title, theme, task_end_time, task_state, examine_state, examine_text, examine_image, create_time, create_by, update_time, update_by, del_flag, | |||
| </trim> | |||
| values | |||
| <trim prefix="(" suffix=")" suffixOverrides=","> | |||
| <if test="id != null"> | |||
| #{id, jdbcType=BIGINT}, | |||
| </if> | |||
| #{status, jdbcType=INTEGER},#{memberId, jdbcType=BIGINT},#{taskName, jdbcType=VARCHAR},#{taskIcon, jdbcType=VARCHAR},#{taskMoney, jdbcType=DECIMAL},#{image, jdbcType=VARCHAR},#{title, jdbcType=VARCHAR},#{theme, jdbcType=VARCHAR},#{taskEndTime, jdbcType=DATE},#{taskState, jdbcType=INTEGER},#{examineState, jdbcType=INTEGER},#{examineText, jdbcType=VARCHAR},#{examineImage, jdbcType=VARCHAR},#{createTime, jdbcType=DATE},#{createBy, jdbcType=BIGINT},#{updateTime, jdbcType=DATE},#{updateBy, jdbcType=BIGINT},#{delFlag, jdbcType=BIGINT}, | |||
| </trim> | |||
| on duplicate key update | |||
| <trim suffixOverrides=","> | |||
| <if test="id != null"> | |||
| id = #{id,jdbcType=BIGINT}, | |||
| </if> | |||
| status = #{status, jdbcType=INTEGER}, | |||
| member_id = #{memberId, jdbcType=BIGINT}, | |||
| task_name = #{taskName, jdbcType=VARCHAR}, | |||
| task_icon = #{taskIcon, jdbcType=VARCHAR}, | |||
| task_money = #{taskMoney, jdbcType=DECIMAL}, | |||
| image = #{image, jdbcType=VARCHAR}, | |||
| title = #{title, jdbcType=VARCHAR}, | |||
| theme = #{theme, jdbcType=VARCHAR}, | |||
| task_end_time = #{taskEndTime, jdbcType=DATE}, | |||
| task_state = #{taskState, jdbcType=INTEGER}, | |||
| examine_state = #{examineState, jdbcType=INTEGER}, | |||
| examine_text = #{examineText, jdbcType=VARCHAR}, | |||
| examine_image = #{examineImage, jdbcType=VARCHAR}, | |||
| create_time = #{createTime, jdbcType=DATE}, | |||
| create_by = #{createBy, jdbcType=BIGINT}, | |||
| update_time = #{updateTime, jdbcType=DATE}, | |||
| update_by = #{updateBy, jdbcType=BIGINT}, | |||
| del_flag = #{delFlag, jdbcType=BIGINT}, | |||
| </trim> | |||
| </insert> | |||
| </mapper> | |||