From abf4b17f33b749269bd37d14b8dc0e55aff9b1d1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 06 十一月 2025 18:40:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
index 4db1d14..fad330c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
@@ -1,9 +1,24 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.BasePage;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.model.TMerchant;
+import com.ruoyi.system.query.TMerchantQuery;
+import com.ruoyi.system.service.TMerchantService;
+import com.ruoyi.system.service.TMerchantTypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
/**
* <p>
@@ -13,9 +28,93 @@
* @author xiaochen
* @since 2025-11-06
*/
+@Api(tags = "商户信息管理")
@RestController
@RequestMapping("/t-merchant")
public class TMerchantController {
+ private final TMerchantTypeService merchantTypeService;
+ private final TMerchantService merchantService;
+ private final TokenService tokenService;
+ @Autowired
+ public TMerchantController(TMerchantTypeService merchantTypeService, TMerchantService merchantService, TokenService tokenService) {
+ this.merchantTypeService = merchantTypeService;
+ this.merchantService = merchantService;
+ this.tokenService = tokenService;
+ }
+
+ /**
+ * 获取商户信息管理管理列表
+ */
+ @ApiOperation(value = "获取商户信息管理分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TMerchant>> pageList(@RequestBody TMerchantQuery query) {
+ return R.ok(merchantService.pageList(query));
+ }
+
+ /**
+ * 获取商户信息管理管理列表
+ */
+ @ApiOperation(value = "获取商户信息管理列表")
+ @PostMapping(value = "/list")
+ public R<List<TMerchant>> list() {
+ return R.ok(merchantService.list(Wrappers.lambdaQuery(TMerchant.class).orderByDesc(TMerchant::getCreateTime)));
+ }
+
+ /**
+ * 添加商户信息管理管理
+ */
+ @Log(title = "商户信息管理信息-新增商户信息管理", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加商户信息管理")
+ @PostMapping(value = "/add")
+ public R<Boolean> add(@Validated @RequestBody TMerchant dto) {
+ if (merchantService.isExit(dto)) {
+ return R.fail("商户名称已存在");
+ }
+ return R.ok(merchantService.save(dto));
+ }
+
+ /**
+ * 修改商户信息管理
+ */
+ @Log(title = "商户信息管理信息-修改商户信息管理", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改商户信息管理")
+ @PostMapping(value = "/update")
+ public R<Boolean> update(@Validated @RequestBody TMerchant dto) {
+ if (merchantService.isExit(dto)) {
+ return R.fail("商户名称已存在");
+ }
+ return R.ok(merchantService.updateById(dto));
+ }
+
+ /**
+ * 查看商户信息管理详情
+ */
+ @ApiOperation(value = "查看商户信息管理详情")
+ @GetMapping(value = "/getDetailById")
+ public R<TMerchant> getDetailById(@RequestParam String id) {
+ return R.ok(merchantService.getById(id));
+ }
+
+ /**
+ * 删除商户信息管理
+ */
+ @Log(title = "商户信息管理信息-删除商户信息管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除商户信息管理")
+ @DeleteMapping(value = "/deleteById")
+ public R<Boolean> deleteById(@RequestParam String id) {
+ return R.ok(merchantService.removeById(id));
+ }
+
+ /**
+ * 批量删除商户信息管理
+ */
+ @Log(title = "商户信息管理信息-删除商户信息管理", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除商户信息管理")
+ @DeleteMapping(value = "/deleteByIds")
+ public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+ return R.ok(merchantService.removeByIds(ids));
+ }
+
}
--
Gitblit v1.7.1