From e4c6969ef4c20fb4cea85e152f81274e5baa8730 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 20 十月 2023 10:06:55 +0800
Subject: [PATCH] 修改商家服务参数接口
---
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java | 1 -
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java | 6 +++---
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
index fa801e4..312d5f2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/JinhuiConvenientMerchantVO.java
@@ -64,7 +64,6 @@
@ApiModelProperty("营业状态")
private Integer businessStatus;
-
@ApiModelProperty("商家绑定账户")
private String account;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
index e161a4f..57826e1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java
@@ -764,7 +764,7 @@
}
@ApiOperation(value = "便民服务商家入驻")
- @PostMapping("/jinhuiMerchant/addData")
+ @PostMapping("/merchant/addData")
public R merchantAddData(@RequestBody JinhuiConvenientMerchantVO item)
{
item.setAuditType("1");
@@ -772,7 +772,7 @@
}
@ApiOperation(value = "便民服务商家编辑")
- @PostMapping("/jinhuiMerchant/editData")
+ @PostMapping("/merchant/editData")
public R merchantEditData(@RequestBody JinhuiConvenientMerchantVO item)
{
return jinhuiCommunityService.merchantEditData(item);
@@ -780,7 +780,7 @@
@ApiOperation(value = "便民服务商家审核")
- @GetMapping("/jinhuiMerchant/audit")
+ @GetMapping("/merchant/audit")
public R merchantAudit(@RequestParam("auditType") String auditType,
@RequestParam("merchantId") String merchantId,
@RequestParam(value = "auditOpinion", required = false) String auditOpinion)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java
index 521455a..0115211 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java
@@ -42,7 +42,7 @@
* @param item
* @return
*/
- IPage<JinhuiConvenientMerchantVO> pageMerchant(@Param("page") Page page,
+ IPage<JinhuiConvenientMerchant> pageMerchant(@Param("page") Page page,
@Param("item") JinhuiPageConvenientMerchantDTO item);
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
index 3bfc0fc..56f37df 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java
@@ -44,7 +44,7 @@
Page page = new Page<>();
page.setSize(pageConvenientMerchantDTO.getPageSize());
page.setCurrent(pageConvenientMerchantDTO.getPageNum());
- IPage<JinhuiConvenientMerchantVO> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO);
+ IPage<JinhuiConvenientMerchant> iPage = this.baseMapper.pageMerchant(page, pageConvenientMerchantDTO);
return R.ok(iPage);
}
--
Gitblit v1.7.1