From 580f4d3c2ca9eee53eee95a4de2f6610b790780a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 12 二月 2026 18:24:13 +0800
Subject: [PATCH] 小程序   接口开发

---
 server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java |   50 +++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java
index 3a55d80..03451f5 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/IntegralApi.java
@@ -2,10 +2,12 @@
 
 import com.doumee.api.web.ApiController;
 import com.doumee.config.annotation.LoginRequired;
+import com.doumee.config.annotation.LoginShopRequired;
 import com.doumee.core.annotation.trace.Trace;
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.dao.business.model.Integral;
 import com.doumee.dao.web.dto.IntegralRecordDTO;
 import com.doumee.dao.web.response.IntegralDataResponse;
@@ -15,10 +17,7 @@
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * Created by IntelliJ IDEA.
@@ -35,26 +34,63 @@
 
     @LoginRequired
     @ApiOperation("鑾峰彇鐢ㄦ埛鐨勭Н鍒嗚褰�")
+    @PostMapping("/findUserIntegralRecordPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse<PageData<Integral>> findUserIntegralRecordPage (@RequestBody PageWrap<IntegralRecordDTO> pageWrap) {
+        pageWrap.getModel().setMemberId(getMemberId());
+        pageWrap.getModel().setUserType(Constants.ZERO);
+        return ApiResponse.success(integralService.findIntegralRecordPage(pageWrap));
+    }
+
+    @LoginShopRequired
+    @ApiOperation("鑾峰彇缁忛攢鍟嗙殑绉垎璁板綍")
     @PostMapping("/findIntegralRecordPage")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
     public ApiResponse<PageData<Integral>> findIntegralRecordPage (@RequestBody PageWrap<IntegralRecordDTO> pageWrap) {
+        pageWrap.getModel().setMemberId(getShopId());
         return ApiResponse.success(integralService.findIntegralRecordPage(pageWrap));
     }
 
+
+
+
     @LoginRequired
-    @ApiOperation("鑾峰彇鐢ㄦ埛鍓╀綑绉垎涓庡緟鎯呭喌绉垎淇℃伅")
-    @PostMapping("/getIntegralData")
+    @ApiOperation("鐢ㄦ埛绉垎鎯呭喌")
+    @GetMapping("/getUserIntegralData")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
-    public ApiResponse<IntegralDataResponse> getIntegralData (@RequestBody IntegralRecordDTO dto) {
+    public ApiResponse<IntegralDataResponse> getUserIntegralData () {
+        IntegralRecordDTO dto = new IntegralRecordDTO();
+        dto.setMemberId(getMemberId());
+        dto.setUserType(Constants.ZERO);
         return ApiResponse.success(integralService.getIntegralData(dto));
     }
 
 
 
+    @LoginShopRequired
+    @ApiOperation("缁忛攢鍟嗙Н鍒嗕笌缁撶畻閲戦鎯呭喌")
+    @GetMapping("/getIntegralData")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+            @ApiImplicitParam(paramType = "query", dataType = "integer", name = "userType", value = "鏌ヨ绫诲瀷锛�1=缁忛攢鍟嗙Н鍒嗭紱2=缁忛攢鍟嗙粨绠楅噾棰濓紱", required = true),
+    })
+    public ApiResponse<IntegralDataResponse> getIntegralData (@RequestParam Integer userType) {
+        IntegralRecordDTO dto = new IntegralRecordDTO();
+        dto.setMemberId(getShopId());
+        dto.setUserType(userType);
+//        try {
+//            System.out.println(inviteRecordService.createShopMiniProgramCode(getShopId()));
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+        return ApiResponse.success(integralService.getIntegralData(dto));
+    }
 
 
 

--
Gitblit v1.9.3