From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 154 insertions(+), 23 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index dbb7a06..8114a0d 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -2,22 +2,29 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.other.enums.ShareAddType;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.other.api.domain.Share;
+import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.feignClient.ShopClient;
+import com.ruoyi.other.enums.ShareAddType;
+import com.ruoyi.other.enums.ShareAuditStatus;
import com.ruoyi.other.service.ShareService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.system.api.model.LoginUser;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -29,60 +36,184 @@
public class ShareController extends BaseController {
@Resource
private ShareService shareService;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+ @Resource
+ private ShopClient shopClient;
/**
* 分享列表
*/
- @ApiOperation(value = "分享列表", tags = {"分享"})
+ @ApiOperation(value = "分享列表", tags = {"小程序-个人中心-门店管理"})
@ApiImplicitParams({
@ApiImplicitParam(value = "对象id(addType=1:平台添加，addType=2:推广人添加，addType=3:门店添加)", name = "objectId", required = true, dataType = "int"),
})
@GetMapping("/list")
- public AjaxResult list(@RequestParam Integer objectId){
- return AjaxResult.success(shareService.list(new LambdaQueryWrapper<Share>()
+ public R<List<Share>> list(@RequestParam Integer objectId) {
+ return R.ok(shareService.list(new LambdaQueryWrapper<Share>()
.eq(Share::getObjectId, objectId)));
+ }
+
+
+ @ApiOperation(value = "分享页列表", tags = {"小程序-推广中心"})
+ @GetMapping("/recommand/list")
+ public R<List<Share>> recommandlist() {
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType, 2)
+ .eq(Share::getObjectId, userid)));
}
/**
* 分享添加
*/
- @ApiOperation(value = "分享添加", tags = {"分享"})
+ @ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理"})
@PostMapping
- public AjaxResult add(@RequestBody Share share){
- share.setAddType(ShareAddType.STORE.getCode());
+ public R<Void> add(@RequestBody Share share) {
+ Long userid = tokenService.getLoginUserApplet().getUserid();
+ if (share.getAddType() == 1) {
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ } else if (share.getAddType() == 2) {
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ share.setObjectId(userid.toString());
+ }
share.setDelFlag(0);
- return toAjax(shareService.save(share));
+ share.setAppletShare(1);
+ shareService.save(share);
+ return R.ok();
}
/**
* 分享删除
*/
- @ApiOperation(value = "分享删除", tags = {"分享"})
+ @ApiOperation(value = "分享删除", tags = {"小程序-个人中心-门店管理"})
@DeleteMapping
- public AjaxResult delete(@RequestBody Share share){
- return toAjax(shareService.removeById(share));
+ public R<Void> delete(@RequestBody Share share) {
+ shareService.removeById(share);
+ return R.ok();
}
/**
* 分享编辑
*/
- @ApiOperation(value = "分享编辑", tags = {"分享"})
+ @ApiOperation(value = "分享编辑", tags = {"小程序-个人中心-门店管理"})
@PutMapping
- public AjaxResult edit(@RequestBody Share share){
- return toAjax(shareService.updateById(share));
+ public R<Void> edit(@RequestBody Share share) {
+ share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ shareService.updateById(share);
+ return R.ok();
}
/**
* 分享详情
*/
- @ApiOperation(value = "分享详情", tags = {"分享"})
+ @ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理"})
@GetMapping("/detail/{id}")
- public AjaxResult detail(@PathVariable("id") Integer id){
- return AjaxResult.success(shareService.getById(id));
+ public R<Share> detail(@PathVariable("id") Integer id) {
+ return R.ok(shareService.getById(id));
}
+ @ApiOperation(value = "广告管理-分享管理-添加", tags = {"管理后台"})
+ @PostMapping("/manage/add")
+ public R<Void> manage(@RequestBody Share share) {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userid = loginUser.getSysUser().getUserId();
+ share.setAddType(1);
+ share.setAppletShare(0);
+ share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+ share.setObjectId(userid.toString());
+ share.setDelFlag(0);
+ shareService.save(share);
+ return R.ok();
+ }
+
+ @ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
+ @PostMapping("/manage/edit")
+ public R<Void> manageedit(@RequestBody Share share) {
+
+ shareService.updateById(share);
+ return R.ok();
+ }
+
+ @ApiOperation(value = "广告管理-分享管理-删除", tags = {"管理后台"})
+ @GetMapping("/manage/delete")
+ public R<Void> managedelete(@RequestParam Integer id) {
+
+ shareService.removeById(id);
+ return R.ok();
+ }
+
+ @ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
+ @GetMapping("/manage/list")
+ public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
+ //判断当前登陆人是平台还是门店
+ if (tokenService.getLoginUser().getSysUser().getRoleType()==1) {
+ Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }else {
+ Page<Share> page = shareService.lambdaQuery().eq(Share::getAddType,3).eq(Share::getObjectId, tokenService.getLoginUser().getSysUser().getObjectId()).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }
+ }
+
+ @ApiOperation(value = "广告管理-分享管理-设为小程序分享", tags = {"管理后台"})
+ @GetMapping("/manage/set")
+ public R<Void> set(@RequestParam Integer id) {
+ //将所有分享设为不是小程序分享
+ List<Share> list = shareService.lambdaQuery().list();
+ if (!list.isEmpty()) {
+ for (Share share : list) {
+ share.setAppletShare(0);
+ }
+ shareService.updateBatchById(list);
+ }
+ //设置小程序分享
+ Share byId = shareService.getById(id);
+ byId.setAppletShare(1);
+ shareService.updateById(byId);
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "广告管理-分享管理-审核列表", tags = {"管理后台"})
+ @GetMapping("/manage/auth/list")
+ public R<Page<Share>> authmanagelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
+ Page<Share> page = shareService.lambdaQuery().ne(Share::getAuditStatus, 1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageNum, pageSize));
+ for (Share record : page.getRecords()) {
+ if (record.getAddType() == 2) {
+ AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
+ record.setAuthName(appUserById.getName());
+ record.setAuthPhone(appUserById.getPhone());
+ }
+ if (record.getAddType() == 3) {
+ R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
+ if (shopById.getData() != null) {
+ record.setAuthName(shopById.getData().getName());
+ }
+ }
+ }
+ return R.ok(page);
+ }
+
+ @ApiOperation(value = "广告管理-分享管理-详情", tags = {"管理后台"})
+ @GetMapping("/manage/auth/detail")
+ public R<Share> authmanagelist(Integer id) {
+ Share byId = shareService.getById(id);
+ return R.ok(byId);
+ }
+
+ @ApiOperation(value = "广告管理-分享管理-审核", tags = {"管理后台"})
+ @GetMapping("/manage/auth/check")
+ public R<Share> authmanagecheck(Integer id, @ApiParam("1=审核通过，2=审核失败") Integer auditStatus, @ApiParam("备注") String auditMsg) {
+ Share byId = shareService.getById(id);
+ byId.setAuditStatus(auditStatus);
+ byId.setAuditMsg(auditMsg);
+ shareService.updateById(byId);
+ return R.ok(byId);
+ }
}
--
Gitblit v1.7.1