From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 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 1f21c32..8a3b421 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
@@ -24,7 +24,7 @@
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -51,7 +51,7 @@
@ApiImplicitParam(value = "对象id(addType=1:平台添加，addType=2:推广人添加，addType=3:门店添加)", name = "objectId", required = true, dataType = "int"),
})
@GetMapping("/list")
- public R<List<Share>> list(@RequestParam Integer objectId){
+ public R<List<Share>> list(@RequestParam Integer objectId) {
return R.ok(shareService.list(new LambdaQueryWrapper<Share>()
.eq(Share::getObjectId, objectId)));
}
@@ -59,12 +59,11 @@
@ApiOperation(value = "分享页列表", tags = {"小程序-推广中心"})
@GetMapping("/recommand/list")
- public R<List<Share>> recommandlist(){
+ public R<List<Share>> recommandlist() {
Long userid = tokenService.getLoginUserApplet().getUserid();
- return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType,2)
+ return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType, 2)
.eq(Share::getObjectId, userid)));
}
-
/**
@@ -72,11 +71,11 @@
*/
@ApiOperation(value = "分享添加", tags = {"小程序-个人中心-门店管理"})
@PostMapping
- public R<Void> add(@RequestBody Share share){
+ public R<Void> add(@RequestBody Share share) {
Long userid = tokenService.getLoginUserApplet().getUserid();
- if (share.getAddType()==1) {
+ if (share.getAddType() == 1) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
- }else if (share.getAddType()==2){
+ } else if (share.getAddType() == 2) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
share.setObjectId(userid.toString());
}
@@ -91,7 +90,7 @@
*/
@ApiOperation(value = "分享删除", tags = {"小程序-个人中心-门店管理"})
@DeleteMapping
- public R<Void> delete(@RequestBody Share share){
+ public R<Void> delete(@RequestBody Share share) {
shareService.removeById(share);
return R.ok();
}
@@ -101,7 +100,7 @@
*/
@ApiOperation(value = "分享编辑", tags = {"小程序-个人中心-门店管理"})
@PutMapping
- public R<Void> edit(@RequestBody Share share){
+ public R<Void> edit(@RequestBody Share share) {
share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
shareService.updateById(share);
return R.ok();
@@ -112,19 +111,20 @@
*/
@ApiOperation(value = "分享详情", tags = {"小程序-个人中心-门店管理"})
@GetMapping("/detail/{id}")
- public R<Share> detail(@PathVariable("id") Integer 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){
+ public R<Void> manage(@RequestBody Share share) {
LoginUser loginUser = SecurityUtils.getLoginUser();
Long userid = loginUser.getSysUser().getUserId();
share.setAddType(1);
- share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
- share.setObjectId(userid.toString());
+ share.setAppletShare(0);
+ share.setAuditStatus(ShareAuditStatus.SUCCESS.getCode());
+ share.setObjectId(userid.toString());
share.setDelFlag(0);
shareService.save(share);
return R.ok();
@@ -132,7 +132,7 @@
@ApiOperation(value = "广告管理-分享管理-编辑", tags = {"管理后台"})
@PostMapping("/manage/edit")
- public R<Void> manageedit(@RequestBody Share share){
+ public R<Void> manageedit(@RequestBody Share share) {
shareService.updateById(share);
return R.ok();
@@ -140,7 +140,7 @@
@ApiOperation(value = "广告管理-分享管理-删除", tags = {"管理后台"})
@GetMapping("/manage/delete")
- public R<Void> managedelete(@RequestParam Integer id){
+ public R<Void> managedelete(@RequestParam Integer id) {
shareService.removeById(id);
return R.ok();
@@ -148,17 +148,17 @@
@ApiOperation(value = "广告管理-分享管理-列表", tags = {"管理后台"})
@GetMapping("/manage/list")
- public R<Page<Share>> managelist(String name,Integer addType,@RequestParam Integer PageNum,Integer pageSize){
- Page<Share> page = shareService.lambdaQuery().eq(Share::getAuditStatus,1).like(name != null, Share::getName, name).eq(addType != null, Share::getAddType, addType).page(Page.of(pageSize, pageSize));
+ public R<Page<Share>> managelist(String name, Integer addType, @RequestParam Integer pageNum, Integer pageSize) {
+ 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);
}
@ApiOperation(value = "广告管理-分享管理-设为小程序分享", tags = {"管理后台"})
@GetMapping("/manage/set")
- public R<Void> set(@RequestParam Integer id){
+ public R<Void> set(@RequestParam Integer id) {
//将所有分享设为不是小程序分享
List<Share> list = shareService.lambdaQuery().list();
- if (!list.isEmpty()){
+ if (!list.isEmpty()) {
for (Share share : list) {
share.setAppletShare(0);
}
@@ -174,17 +174,17 @@
@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));
+ 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) {
+ if (record.getAddType() == 2) {
AppUser appUserById = appUserClient.getAppUserById(Long.valueOf(record.getObjectId()));
record.setAuthName(appUserById.getName());
record.setAuthPhone(appUserById.getPhone());
}
- if (record.getAddType()==3) {
+ if (record.getAddType() == 3) {
R<Shop> shopById = shopClient.getShopById(Integer.valueOf(record.getObjectId()));
- if (shopById.getData()!=null){
+ if (shopById.getData() != null) {
record.setAuthName(shopById.getData().getName());
}
}
@@ -194,22 +194,20 @@
@ApiOperation(value = "广告管理-分享管理-详情", tags = {"管理后台"})
@GetMapping("/manage/auth/detail")
- public R<Share> authmanagelist(Integer id){
+ 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){
+ 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