From 94c7d336abbe25c3878aec052444bc7f9b4ac10f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 24 九月 2021 18:27:39 +0800
Subject: [PATCH] 修改便民服务问题
---
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java | 6 ++++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java | 12 +++++++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
index abd4bdc..6bee3cc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ExportMerchantVO.java
@@ -59,8 +59,16 @@
this.businessStatus = businessStatus ? "在营" : "已关闭";
}
+ public void setBusinessStatus(String businessStatus) {
+ this.businessStatus = businessStatus;
+ }
+
public void setAccountStatus(Integer accountStatus) {
this.accountStatus = accountStatus.intValue() == 1 ? "启用" : "禁用";
+ }
+
+ public void setAccountStatus(String accountStatus) {
+ this.accountStatus = accountStatus;
}
public void setBusinessTimeTime(String businessTime) {
@@ -68,8 +76,10 @@
this.businessTime = businessTime.replace("EVERY_DAY", "每天：");
} else if (businessTime.contains("WEEKDAY")) {
this.businessTime = businessTime.replace("WEEKDAY", "周一至周五：");
- } else {
+ } else if (businessTime.contains("WEEKEND")) {
this.businessTime = businessTime.replace("WEEKEND", "周末：");
+ } else {
+ this.businessTime = businessTime;
}
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
index 0317838..82301fc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityConvenientApi.java
@@ -257,6 +257,12 @@
return communityService.pageMerchant(pageConvenientMerchantDTO);
}
+ @ApiOperation(value = "查询便民服务商家详情", response = ConvenientMerchantVO.class)
+ @GetMapping("/merchant/get")
+ public R getMerchant(@RequestParam("merchantId") Long merchantId) {
+ return communityService.getMerchant(merchantId);
+ }
+
@ApiOperation(value = "所有服务分类", response = ConvenientServiceCategoryVO.class)
@GetMapping("/service-category/all")
public R getAllServiceCategories() {
--
Gitblit v1.7.1