From e00e10418b01eb0ee442b2dc4029925fba7ae33b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 20 十一月 2025 09:16:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
buyer-api/src/main/java/cn/lili/controller/lmk/ActionRecordBuyerController.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/ActionRecordBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/ActionRecordBuyerController.java
index 377ad4f..8929dfa 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/ActionRecordBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/ActionRecordBuyerController.java
@@ -1,20 +1,15 @@
package cn.lili.controller.lmk;
-import cn.lili.group.Update;
+import cn.lili.base.Result;
import cn.lili.group.Add;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.constraints.NotEmpty;
+import cn.lili.modules.lmk.domain.form.ActionRecordForm;
+import cn.lili.modules.lmk.domain.form.ShareActionForm;
+import cn.lili.modules.lmk.service.ActionRecordService;
+import cn.lili.modules.lmk.service.ShareActionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import cn.lili.modules.lmk.service.ActionRecordService;
-import cn.lili.base.Result;
-import cn.lili.modules.lmk.domain.form.ActionRecordForm;
-import cn.lili.modules.lmk.domain.query.ActionRecordQuery;
import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
@@ -31,12 +26,23 @@
public class ActionRecordBuyerController {
private final ActionRecordService actionRecordService;
+ private final ShareActionService shareActionService;
@PostMapping
@ApiOperation(value = "娣诲姞", notes = "娣诲姞")
public Result add(@RequestBody @Validated(Add.class) ActionRecordForm form) {
return actionRecordService.add(form);
}
+ @PostMapping("/share")
+ @ApiOperation(value = "娣诲姞鍒嗕韩", notes = "娣诲姞鍒嗕韩")
+ public Result shareAdd(@RequestBody @Validated(Add.class) ShareActionForm form) {
+ return shareActionService.add(form);
+ }
+ @GetMapping("/sessionId")
+ @ApiOperation(value = "鑾峰彇浼氳瘽id", notes = "鑾峰彇浼氳瘽id")
+ public Result grantSessionId() {
+ return actionRecordService.grantSessionId();
+ }
}
--
Gitblit v1.8.0