From 5b0689db42b735f4f16e5aecb7437484b3c7d97d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 十二月 2024 17:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java | 2 +-
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 22 ++++++++++++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java
index 75a5bd4..2fb7181 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Share.java
@@ -76,7 +76,7 @@
@ApiModelProperty(value = "对象id")
@TableField("object_id")
- private Integer objectId;
+ private String objectId;
}
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 db05155..783f4e0 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Share;
import com.ruoyi.other.enums.ShareAddType;
import com.ruoyi.other.enums.ShareAuditStatus;
@@ -31,6 +32,8 @@
public class ShareController extends BaseController {
@Resource
private ShareService shareService;
+ @Resource
+ private TokenService tokenService;
/**
* 分享列表
@@ -46,14 +49,29 @@
}
+ @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 = {"小程序-个人中心-门店管理-分享添加"})
@PostMapping
public R<Void> add(@RequestBody Share share){
- share.setAddType(ShareAddType.STORE.getCode());
- share.setAuditStatus(ShareAuditStatus.WAIT.getCode());
+ 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);
share.setAppletShare(1);
shareService.save(share);
--
Gitblit v1.7.1