From d05e79f08a584bac02dc5994c5786863e47b2be4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 07 五月 2021 16:23:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index e71120a..08a711a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -1,6 +1,7 @@
package com.panzhihua.applets.api;
import com.panzhihua.applets.weixin.CheckService;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
@@ -248,7 +249,6 @@
comActMessageVO.setUserId(userId);
comActMessageVO.setUserName(loginUserInfo.getName());
comActMessageVO.setUserAccount(loginUserInfo.getAccount());
- comActMessageVO.setUserPhone(loginUserInfo.getPhone());
comActMessageVO.setIspublic(1);
comActMessageVO.setStatus(1);
return communityService.addMessage(comActMessageVO);
@@ -312,4 +312,17 @@
public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
return communityService.pageMessageByUser(comActMessageVO);
}
+
+ @ApiOperation(value = "留言详情",response =ComActMessageVO.class )
+ @GetMapping("detailmessage")
+ @ApiImplicitParam(name = "id",value = "随手拍主键")
+ public R detailMessage(@RequestParam("id") Long id){
+ return communityService.detailMessage(id);
+ }
+
+ @ApiOperation(value = "首页商城开关接口")
+ @GetMapping("isShop")
+ public R isShop(){
+ return R.ok(Constants.IS_SHOP_OPEN);
+ }
}
--
Gitblit v1.7.1