From 091292a96571b2ec07e29083d560aac4c54c898b Mon Sep 17 00:00:00 2001 From: CYF <1590648573@qq.com> Date: Fri, 28 Mar 2025 14:49:19 +0800 Subject: [PATCH] CYF --- .../src/api/model/AppletConfig.js | 8 +- .../src/api/model/AppletOrder.js | 8 +- .../src/views/model/AppletConfig/index.vue | 44 +++- .../src/views/model/AppletIncrease/index.vue | 270 --------------------- .../src/views/model/AppletOrder/index.vue | 34 +-- .../model/controller/AppletConfigController.java | 14 +- .../model/controller/AppletOrderController.java | 13 +- .../model/controller/AppletTrainController.java | 104 -------- .../java/com/ruoyi/model/domain/AppletConfig.java | 32 ++- .../java/com/ruoyi/model/domain/AppletOrder.java | 13 + .../com/ruoyi/model/mapper/AppletConfigMapper.java | 14 +- .../com/ruoyi/model/mapper/AppletOrderMapper.java | 13 +- .../ruoyi/model/service/IAppletConfigService.java | 14 +- .../ruoyi/model/service/IAppletOrderService.java | 13 +- .../service/impl/AppletConfigServiceImpl.java | 23 +- .../model/service/impl/AppletOrderServiceImpl.java | 19 +- .../resources/mapper/model/AppletConfigMapper.xml | 44 +++- .../resources/mapper/model/AppletOrderMapper.xml | 24 +- 18 files changed, 210 insertions(+), 494 deletions(-) delete mode 100644 CatmDogd-Mall-Front-test/src/views/model/AppletIncrease/index.vue delete mode 100644 ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTrainController.java diff --git a/CatmDogd-Mall-Front-test/src/api/model/AppletConfig.js b/CatmDogd-Mall-Front-test/src/api/model/AppletConfig.js index eda10d3..1d4d571 100644 --- a/CatmDogd-Mall-Front-test/src/api/model/AppletConfig.js +++ b/CatmDogd-Mall-Front-test/src/api/model/AppletConfig.js @@ -10,9 +10,9 @@ export function listAppletConfig(query) { } // 查询配置信息详细 -export function getAppletConfig(paramCode) { +export function getAppletConfig(id) { return request({ - url: '/model/AppletConfig/' + paramCode, + url: '/model/AppletConfig/' + id, method: 'get' }) } @@ -36,9 +36,9 @@ export function updateAppletConfig(data) { } // 删除配置信息 -export function delAppletConfig(paramCode) { +export function delAppletConfig(id) { return request({ - url: '/model/AppletConfig/' + paramCode, + url: '/model/AppletConfig/' + id, method: 'delete' }) } diff --git a/CatmDogd-Mall-Front-test/src/api/model/AppletOrder.js b/CatmDogd-Mall-Front-test/src/api/model/AppletOrder.js index daec9bd..afeef75 100644 --- a/CatmDogd-Mall-Front-test/src/api/model/AppletOrder.js +++ b/CatmDogd-Mall-Front-test/src/api/model/AppletOrder.js @@ -10,9 +10,9 @@ export function listAppletOrder(query) { } // 查询订单信息详细 -export function getAppletOrder(createTime) { +export function getAppletOrder(id) { return request({ - url: '/model/AppletOrder/' + createTime, + url: '/model/AppletOrder/' + id, method: 'get' }) } @@ -36,9 +36,9 @@ export function updateAppletOrder(data) { } // 删除订单信息 -export function delAppletOrder(createTime) { +export function delAppletOrder(id) { return request({ - url: '/model/AppletOrder/' + createTime, + url: '/model/AppletOrder/' + id, method: 'delete' }) } diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue index e6ce6a8..9df0f48 100644 --- a/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue +++ b/CatmDogd-Mall-Front-test/src/views/model/AppletConfig/index.vue @@ -83,6 +83,7 @@ + @@ -106,7 +107,7 @@ - + + + +
确 定 @@ -183,12 +187,16 @@ export default { form: {}, // 表单校验 rules: { + delFlag: [ + { required: true, message: "删除标识不能为空", trigger: "blur" } + ], + }, columns: [ - { key: 0, label: "参数编码", visible: true }, - { key: 1, label: "参数值-普通文本", visible: true }, - { key: 2, label: "参数值-图片", visible: false }, - { key: 3, label: "参数值-富文本", visible: true }, + { key: 1, label: "参数编码", visible: true }, + { key: 2, label: "参数值-普通文本", visible: true }, + { key: 3, label: "参数值-图片", visible: false }, + { key: 4, label: "参数值-富文本", visible: true }, ], }; }, @@ -213,6 +221,8 @@ export default { // 表单重置 reset() { this.form = { + id: null, + paramCode: null, paramValueText: null, @@ -221,6 +231,16 @@ export default { paramValueArea: null, + delFlag: null, + + createBy: null, + + createTime: null, + + updateBy: null, + + updateTime: null, + }; this.resetForm("form"); }, @@ -236,7 +256,7 @@ export default { }, // 多选框选中数据 handleSelectionChange(selection) { - this.ids = selection.map(item => item.paramCode) + this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -249,8 +269,8 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); - const paramCode = row.paramCode || this.ids - getAppletConfig(paramCode).then(response => { + const id = row.id || this.ids + getAppletConfig(id).then(response => { this.form = response.data; this.open = true; this.title = "修改配置信息"; @@ -260,7 +280,7 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - if (this.form.paramCode != null) { + if (this.form.id != null) { updateAppletConfig(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -278,9 +298,9 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const paramCodes = row.paramCode || this.ids; - this.$modal.confirm('是否确认删除配置信息编号为"' + paramCodes + '"的数据项？').then(function() { - return delAppletConfig(paramCodes); + const ids = row.id || this.ids; + this.$modal.confirm('是否确认删除配置信息编号为"' + ids + '"的数据项？').then(function() { + return delAppletConfig(ids); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletIncrease/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletIncrease/index.vue deleted file mode 100644 index bd9c1fc..0000000 --- a/CatmDogd-Mall-Front-test/src/views/model/AppletIncrease/index.vue +++ /dev/null @@ -1,270 +0,0 @@ - - - diff --git a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue index 75ffb0f..be76925 100644 --- a/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue +++ b/CatmDogd-Mall-Front-test/src/views/model/AppletOrder/index.vue @@ -7,6 +7,7 @@ size="small" v-model="queryParams.payTime" type="datetime" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择支付时间"> @@ -106,6 +107,7 @@ + - + item.createTime) + this.ids = selection.map(item => item.id) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -337,8 +341,8 @@ export default { /** 修改按钮操作 */ handleUpdate(row) { this.reset(); - const createTime = row.createTime || this.ids - getAppletOrder(createTime).then(response => { + const id = row.id || this.ids + getAppletOrder(id).then(response => { this.form = response.data; this.open = true; this.title = "修改订单信息"; @@ -348,7 +352,7 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - if (this.form.createTime != null) { + if (this.form.id != null) { updateAppletOrder(this.form).then(response => { this.$modal.msgSuccess("修改成功"); this.open = false; @@ -366,9 +370,9 @@ export default { }, /** 删除按钮操作 */ handleDelete(row) { - const createTimes = row.createTime || this.ids; - this.$modal.confirm('是否确认删除订单信息编号为"' + createTimes + '"的数据项？').then(function() { - return delAppletOrder(createTimes); + const ids = row.id || this.ids; + this.$modal.confirm('是否确认删除订单信息编号为"' + ids + '"的数据项？').then(function() { + return delAppletOrder(ids); }).then(() => { this.getList(); this.$modal.msgSuccess("删除成功"); diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletConfigController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletConfigController.java index ded3e41..e07bf96 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletConfigController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletConfigController.java @@ -26,7 +26,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 配置信息Controller * * @author ruoyi - * @date 2025-03-27 + * @date 2025-03-28 */ @RestController @RequestMapping("/model/AppletConfig") @@ -63,10 +63,10 @@ public class AppletConfigController extends BaseController * 获取配置信息详细信息 */ @PreAuthorize("@ss.hasPermi('model:AppletConfig:query')") - @GetMapping(value = "/{paramCode}") - public AjaxResult getInfo(@PathVariable("paramCode") String paramCode) + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(appletConfigService.selectAppletConfigByParamCode(paramCode)); + return success(appletConfigService.selectAppletConfigById(id)); } /** @@ -96,9 +96,9 @@ public class AppletConfigController extends BaseController */ @PreAuthorize("@ss.hasPermi('model:AppletConfig:remove')") @Log(title = "配置信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{paramCodes}") - public AjaxResult remove(@PathVariable String[] paramCodes) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(appletConfigService.deleteAppletConfigByParamCodes(paramCodes)); + return toAjax(appletConfigService.deleteAppletConfigByIds(ids)); } } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java index f6476d4..95d4eee 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletOrderController.java @@ -1,7 +1,6 @@ package com.ruoyi.model.controller; import java.io.IOException; -import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; @@ -64,10 +63,10 @@ public class AppletOrderController extends BaseController * 获取订单信息详细信息 */ @PreAuthorize("@ss.hasPermi('model:AppletOrder:query')") - @GetMapping(value = "/{createTime}") - public AjaxResult getInfo(@PathVariable("createTime") Date createTime) + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(appletOrderService.selectAppletOrderByCreateTime(createTime)); + return success(appletOrderService.selectAppletOrderById(id)); } /** @@ -97,9 +96,9 @@ public class AppletOrderController extends BaseController */ @PreAuthorize("@ss.hasPermi('model:AppletOrder:remove')") @Log(title = "订单信息", businessType = BusinessType.DELETE) - @DeleteMapping("/{createTimes}") - public AjaxResult remove(@PathVariable Date[] createTimes) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(appletOrderService.deleteAppletOrderByCreateTimes(createTimes)); + return toAjax(appletOrderService.deleteAppletOrderByIds(ids)); } } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTrainController.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTrainController.java deleted file mode 100644 index a1f5be2..0000000 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletTrainController.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.ruoyi.model.controller; - -import java.io.IOException; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.model.domain.AppletTrain; -import com.ruoyi.model.service.IAppletTrainService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; - -/** - * 服务培训Controller - * - * @author ruoyi - * @date 2025-03-28 - */ -@RestController -@RequestMapping("/model/AppletTrain") -public class AppletTrainController extends BaseController -{ - @Autowired - private IAppletTrainService appletTrainService; - - /** - * 查询服务培训列表 - */ - @PreAuthorize("@ss.hasPermi('model:AppletTrain:list')") - @GetMapping("/list") - public TableDataInfo list(AppletTrain appletTrain) - { - startPage(); - List list = appletTrainService.selectAppletTrainList(appletTrain); - return getDataTable(list); - } - - /** - * 导出服务培训列表 - */ - @PreAuthorize("@ss.hasPermi('model:AppletTrain:export')") - @Log(title = "服务培训", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, AppletTrain appletTrain) throws IOException { - List list = appletTrainService.selectAppletTrainList(appletTrain); - ExcelUtil util = new ExcelUtil(AppletTrain.class); - util.exportExcel(response, list, "服务培训数据"); - } - - /** - * 获取服务培训详细信息 - */ - @PreAuthorize("@ss.hasPermi('model:AppletTrain:query')") - @GetMapping(value = "/{title}") - public AjaxResult getInfo(@PathVariable("title") String title) - { - return success(appletTrainService.selectAppletTrainByTitle(title)); - } - - /** - * 新增服务培训 - */ - @PreAuthorize("@ss.hasPermi('model:AppletTrain:add')") - @Log(title = "服务培训", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody AppletTrain appletTrain) - { - return toAjax(appletTrainService.insertAppletTrain(appletTrain)); - } - - /** - * 修改服务培训 - */ - @PreAuthorize("@ss.hasPermi('model:AppletTrain:edit')") - @Log(title = "服务培训", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody AppletTrain appletTrain) - { - return toAjax(appletTrainService.updateAppletTrain(appletTrain)); - } - - /** - * 删除服务培训 - */ - @PreAuthorize("@ss.hasPermi('model:AppletTrain:remove')") - @Log(title = "服务培训", businessType = BusinessType.DELETE) - @DeleteMapping("/{titles}") - public AjaxResult remove(@PathVariable String[] titles) - { - return toAjax(appletTrainService.deleteAppletTrainByTitles(titles)); - } -} diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java index 02bd23f..caf637e 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletConfig.java @@ -9,12 +9,15 @@ import com.ruoyi.common.core.domain.BaseEntity; * 配置信息对象 applet_config * * @author ruoyi - * @date 2025-03-27 + * @date 2025-03-28 */ public class AppletConfig extends BaseEntity { private static final long serialVersionUID = 1L; + /** 唯一标识 */ + private Long id; + /** 参数编码 */ @Excel(name = "参数编码") private String paramCode; @@ -31,6 +34,18 @@ public class AppletConfig extends BaseEntity @Excel(name = "参数值-富文本") private String paramValueArea; + /** 删除标识 */ + private Integer delFlag; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } public void setParamCode(String paramCode) { this.paramCode = paramCode; @@ -67,14 +82,29 @@ public class AppletConfig extends BaseEntity { return paramValueArea; } + public void setDelFlag(Integer delFlag) + { + this.delFlag = delFlag; + } + + public Integer getDelFlag() + { + return delFlag; + } @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) .append("paramCode", getParamCode()) .append("paramValueText", getParamValueText()) .append("paramValueImage", getParamValueImage()) .append("paramValueArea", getParamValueArea()) + .append("delFlag", getDelFlag()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) .toString(); } } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java index 08538bb..94df666 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletOrder.java @@ -18,6 +18,9 @@ public class AppletOrder extends BaseEntity { private static final long serialVersionUID = 1L; + /** 唯一标识 */ + private Long id; + /** 支付时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd") @@ -47,6 +50,15 @@ public class AppletOrder extends BaseEntity @Excel(name = "关联宠物ID") private Long petId; + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } public void setPayTime(Date payTime) { this.payTime = payTime; @@ -114,6 +126,7 @@ public class AppletOrder extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) .append("createTime", getCreateTime()) .append("createBy", getCreateBy()) .append("updateTime", getUpdateTime()) diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java index 1910ecc..649632d 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletConfigMapper.java @@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletConfig; * 配置信息Mapper接口 * * @author ruoyi - * @date 2025-03-27 + * @date 2025-03-28 */ public interface AppletConfigMapper { /** * 查询配置信息 * - * @param paramCode 配置信息主键 + * @param id 配置信息主键 * @return 配置信息 */ - public AppletConfig selectAppletConfigByParamCode(String paramCode); + public AppletConfig selectAppletConfigById(Long id); /** * 查询配置信息列表 @@ -46,16 +46,16 @@ public interface AppletConfigMapper /** * 删除配置信息 * - * @param paramCode 配置信息主键 + * @param id 配置信息主键 * @return 结果 */ - public int deleteAppletConfigByParamCode(String paramCode); + public int deleteAppletConfigById(Long id); /** * 批量删除配置信息 * - * @param paramCodes 需要删除的数据主键集合 + * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteAppletConfigByParamCodes(String[] paramCodes); + public int deleteAppletConfigByIds(Long[] ids); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java index af0afff..e20b736 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/mapper/AppletOrderMapper.java @@ -1,6 +1,5 @@ package com.ruoyi.model.mapper; -import java.util.Date; import java.util.List; import com.ruoyi.model.domain.AppletOrder; @@ -15,10 +14,10 @@ public interface AppletOrderMapper /** * 查询订单信息 * - * @param createTime 订单信息主键 + * @param id 订单信息主键 * @return 订单信息 */ - public AppletOrder selectAppletOrderByCreateTime(Date createTime); + public AppletOrder selectAppletOrderById(Long id); /** * 查询订单信息列表 @@ -47,16 +46,16 @@ public interface AppletOrderMapper /** * 删除订单信息 * - * @param createTime 订单信息主键 + * @param id 订单信息主键 * @return 结果 */ - public int deleteAppletOrderByCreateTime(Date createTime); + public int deleteAppletOrderById(Long id); /** * 批量删除订单信息 * - * @param createTimes 需要删除的数据主键集合 + * @param ids 需要删除的数据主键集合 * @return 结果 */ - public int deleteAppletOrderByCreateTimes(Date[] createTimes); + public int deleteAppletOrderByIds(Long[] ids); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java index 7f428c3..5aad828 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletConfigService.java @@ -7,17 +7,17 @@ import com.ruoyi.model.domain.AppletConfig; * 配置信息Service接口 * * @author ruoyi - * @date 2025-03-27 + * @date 2025-03-28 */ public interface IAppletConfigService { /** * 查询配置信息 * - * @param paramCode 配置信息主键 + * @param id 配置信息主键 * @return 配置信息 */ - public AppletConfig selectAppletConfigByParamCode(String paramCode); + public AppletConfig selectAppletConfigById(Long id); /** * 查询配置信息列表 @@ -46,16 +46,16 @@ public interface IAppletConfigService /** * 批量删除配置信息 * - * @param paramCodes 需要删除的配置信息主键集合 + * @param ids 需要删除的配置信息主键集合 * @return 结果 */ - public int deleteAppletConfigByParamCodes(String[] paramCodes); + public int deleteAppletConfigByIds(Long[] ids); /** * 删除配置信息信息 * - * @param paramCode 配置信息主键 + * @param id 配置信息主键 * @return 结果 */ - public int deleteAppletConfigByParamCode(String paramCode); + public int deleteAppletConfigById(Long id); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderService.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderService.java index aa0363c..7f454aa 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderService.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/IAppletOrderService.java @@ -1,6 +1,5 @@ package com.ruoyi.model.service; -import java.util.Date; import java.util.List; import com.ruoyi.model.domain.AppletOrder; @@ -15,10 +14,10 @@ public interface IAppletOrderService /** * 查询订单信息 * - * @param createTime 订单信息主键 + * @param id 订单信息主键 * @return 订单信息 */ - public AppletOrder selectAppletOrderByCreateTime(Date createTime); + public AppletOrder selectAppletOrderById(Long id); /** * 查询订单信息列表 @@ -47,16 +46,16 @@ public interface IAppletOrderService /** * 批量删除订单信息 * - * @param createTimes 需要删除的订单信息主键集合 + * @param ids 需要删除的订单信息主键集合 * @return 结果 */ - public int deleteAppletOrderByCreateTimes(Date[] createTimes); + public int deleteAppletOrderByIds(Long[] ids); /** * 删除订单信息信息 * - * @param createTime 订单信息主键 + * @param id 订单信息主键 * @return 结果 */ - public int deleteAppletOrderByCreateTime(Date createTime); + public int deleteAppletOrderById(Long id); } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java index 9587249..d412ea3 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletConfigServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.model.service.impl; import java.util.List; +import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.model.mapper.AppletConfigMapper; @@ -11,7 +12,7 @@ import com.ruoyi.model.service.IAppletConfigService; * 配置信息Service业务层处理 * * @author ruoyi - * @date 2025-03-27 + * @date 2025-03-28 */ @Service public class AppletConfigServiceImpl implements IAppletConfigService @@ -22,13 +23,13 @@ public class AppletConfigServiceImpl implements IAppletConfigService /** * 查询配置信息 * - * @param paramCode 配置信息主键 + * @param id 配置信息主键 * @return 配置信息 */ @Override - public AppletConfig selectAppletConfigByParamCode(String paramCode) + public AppletConfig selectAppletConfigById(Long id) { - return appletConfigMapper.selectAppletConfigByParamCode(paramCode); + return appletConfigMapper.selectAppletConfigById(id); } /** @@ -52,6 +53,7 @@ public class AppletConfigServiceImpl implements IAppletConfigService @Override public int insertAppletConfig(AppletConfig appletConfig) { + appletConfig.setCreateTime(DateUtils.getNowDate()); return appletConfigMapper.insertAppletConfig(appletConfig); } @@ -64,30 +66,31 @@ public class AppletConfigServiceImpl implements IAppletConfigService @Override public int updateAppletConfig(AppletConfig appletConfig) { + appletConfig.setUpdateTime(DateUtils.getNowDate()); return appletConfigMapper.updateAppletConfig(appletConfig); } /** * 批量删除配置信息 * - * @param paramCodes 需要删除的配置信息主键 + * @param ids 需要删除的配置信息主键 * @return 结果 */ @Override - public int deleteAppletConfigByParamCodes(String[] paramCodes) + public int deleteAppletConfigByIds(Long[] ids) { - return appletConfigMapper.deleteAppletConfigByParamCodes(paramCodes); + return appletConfigMapper.deleteAppletConfigByIds(ids); } /** * 删除配置信息信息 * - * @param paramCode 配置信息主键 + * @param id 配置信息主键 * @return 结果 */ @Override - public int deleteAppletConfigByParamCode(String paramCode) + public int deleteAppletConfigById(Long id) { - return appletConfigMapper.deleteAppletConfigByParamCode(paramCode); + return appletConfigMapper.deleteAppletConfigById(id); } } diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderServiceImpl.java b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderServiceImpl.java index 55dcc19..bfe19e0 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderServiceImpl.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.ruoyi.model.service.impl; -import java.util.Date; import java.util.List; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -24,13 +23,13 @@ public class AppletOrderServiceImpl implements IAppletOrderService /** * 查询订单信息 * - * @param createTime 订单信息主键 + * @param id 订单信息主键 * @return 订单信息 */ @Override - public AppletOrder selectAppletOrderByCreateTime(Date createTime) + public AppletOrder selectAppletOrderById(Long id) { - return appletOrderMapper.selectAppletOrderByCreateTime(createTime); + return appletOrderMapper.selectAppletOrderById(id); } /** @@ -74,24 +73,24 @@ public class AppletOrderServiceImpl implements IAppletOrderService /** * 批量删除订单信息 * - * @param createTimes 需要删除的订单信息主键 + * @param ids 需要删除的订单信息主键 * @return 结果 */ @Override - public int deleteAppletOrderByCreateTimes(Date[] createTimes) + public int deleteAppletOrderByIds(Long[] ids) { - return appletOrderMapper.deleteAppletOrderByCreateTimes(createTimes); + return appletOrderMapper.deleteAppletOrderByIds(ids); } /** * 删除订单信息信息 * - * @param createTime 订单信息主键 + * @param id 订单信息主键 * @return 结果 */ @Override - public int deleteAppletOrderByCreateTime(Date createTime) + public int deleteAppletOrderById(Long id) { - return appletOrderMapper.deleteAppletOrderByCreateTime(createTime); + return appletOrderMapper.deleteAppletOrderById(id); } } diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml index fe8d902..037c645 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletConfigMapper.xml @@ -5,14 +5,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + - select param_code, param_value_text, param_value_image, param_value_area from applet_config + select id, param_code, param_value_text, param_value_image, param_value_area, del_flag, create_by, create_time, update_by, update_time from applet_config - - where param_code = #{paramCode} + where id = #{id} - + insert into applet_config param_code, param_value_text, param_value_image, param_value_area, + del_flag, + create_by, + create_time, + update_by, + update_time, #{paramCode}, #{paramValueText}, #{paramValueImage}, #{paramValueArea}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, update applet_config + param_code = #{paramCode}, param_value_text = #{paramValueText}, param_value_image = #{paramValueImage}, param_value_area = #{paramValueArea}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, - where param_code = #{paramCode} + where id = #{id} - - delete from applet_config where param_code = #{paramCode} + + delete from applet_config where id = #{id} - - delete from applet_config where param_code in - - #{paramCode} + + delete from applet_config where id in + + #{id} \ No newline at end of file diff --git a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml index 71b2837..ce365c1 100644 --- a/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml +++ b/ruoyi-catdog/src/main/resources/mapper/model/AppletOrderMapper.xml @@ -5,6 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select create_time, create_by, update_time, update_by, pay_time, price, address, type, reason, user_id, pet_id from applet_order + select id, create_time, create_by, update_time, update_by, pay_time, price, address, type, reason, user_id, pet_id from applet_order - - where create_time = #{createTime} + where id = #{id} - + insert into applet_order create_time, @@ -73,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update applet_order + create_time = #{createTime}, create_by = #{createBy}, update_time = #{updateTime}, update_by = #{updateBy}, @@ -84,17 +86,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" user_id = #{userId}, pet_id = #{petId}, - where create_time = #{createTime} + where id = #{id} - - delete from applet_order where create_time = #{createTime} + + delete from applet_order where id = #{id} - - delete from applet_order where create_time in - - #{createTime} + + delete from applet_order where id in + + #{id} \ No newline at end of file