From d89d4a28653657528dc0718f1aa55e1c84ad1e6f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 四月 2022 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lyq_battery_shop' into lyq_battery_shop
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 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 ef4a697..6f60bfa 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
@@ -2,6 +2,13 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.common.EditComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.dtos.common.EvaluateEasyDto;
+import com.panzhihua.common.model.dtos.common.PageComActEasyPhotoHandlerDto;
+import com.panzhihua.common.model.vos.common.ComActEasyPhotoHandlerVo;
+import com.panzhihua.common.model.vos.community.easyPhoto.BannerVO;
+import com.panzhihua.common.service.community.ComActEasyPhotoEvaluateFeign;
+import com.panzhihua.common.service.community.ComActEasyPhotoHandlerFeign;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -48,6 +55,8 @@
private UserService userService;
@Resource
private CheckService checkService;
+ @Resource
+ private ComActEasyPhotoEvaluateFeign easyPhotoEvaluateFeign;
@ApiOperation(value = "分页展示社区随手拍", response = ComActEasyPhotoVO.class)
@PostMapping("pageeasyphoto")
@@ -78,6 +87,34 @@
comActEasyPhotoVO.setSponsorId(userId);
comActEasyPhotoVO.setStatus(1);
return communityService.addEasyPhoto(comActEasyPhotoVO);
+ }
+
+ /**
+ * description queryByPage 分页查询
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 分页查询返回参数
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @ApiOperation(value = "查询处理列表",response = ComActEasyPhotoHandlerVo.class)
+ @PostMapping("/handleList")
+ public R handleList(@RequestBody PageComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
+ comActEasyPhotoHandler.setUserId(this.getUserId());
+ return this.communityService.queryEasyPhotoHandler(comActEasyPhotoHandler);
+ }
+ /**
+ * description edit 编辑数据
+ *
+ * @param comActEasyPhotoHandler 请求参数
+ * @return 编辑结果
+ * @author lyq
+ * @date 2022-03-01 13:45:10
+ */
+ @ApiOperation(value = "提交反馈")
+ @PostMapping("/editEasyPhotoHandler")
+ public R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler) {
+ return this.communityService.editEasyPhotoHandler(comActEasyPhotoHandler);
}
@ApiOperation(value = "查询随手拍是否有活动", response = ComActEasyPhotoActivityVO.class)
@@ -155,7 +192,7 @@
}
comActMicroWishVO.setIsApplets(1);
comActMicroWishVO.setIsPageMyWish(null);
- return communityService.pageMicroWish(comActMicroWishVO);
+ return communityService.pageMicroWishApplets(comActMicroWishVO);
}
@ApiOperation("发布微心愿")
@@ -209,8 +246,8 @@
@ApiOperation(value = "首页广告banner", response = ComOpsAdvVO.class)
@GetMapping("listadvertisement/noToken")
- public R listAdvertisement() {
- return communityService.listAdvertisement();
+ public R listAdvertisement(@RequestParam(value = "type",required = false,defaultValue = "1") Integer type) {
+ return communityService.listAdvertisement(type);
}
@ApiOperation(value = "分页通知列表", response = SysUserNoticeVO.class)
@@ -343,7 +380,7 @@
return R.ok(Constants.IS_SHOP_OPEN);
}
- @ApiOperation(value = "获取最新活动和用户最新收益", response = ComActEasyPhotoRewardVO.class)
+ @ApiOperation(value = "获取最新活动和用户最新收益", response = BannerVO.class)
@GetMapping("getUserReward")
public R getUserReward(@RequestParam("communityId") Long communityId) {
Long userId = 0L;
@@ -376,6 +413,13 @@
@ApiOperation(value = "随手拍分类列表", response = ComActEasyPhotoClassifyVO.class)
@GetMapping("easyphoto/classify/list")
public R easyPhotoClassifyList() {
- return communityService.listPhotoClassify();
+ return communityService.listPhotoClassify(this.getAreaCode());
+ }
+
+ @ApiOperation(value = "随手拍评价")
+ @PostMapping("easyphoto/whistle/evaluate")
+ public R evaluateEasyPhotoWhistle(@RequestBody EvaluateEasyDto whistleDto) {
+ whistleDto.setUserId(this.getUserId());
+ return easyPhotoEvaluateFeign.evaluateEasyApplets(whistleDto);
}
}
--
Gitblit v1.7.1