From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java |   40 +++++++++++++++++++++++++---------------
 1 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
index a4c3ce0..bb24587 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/ShopApi.java
@@ -1,13 +1,18 @@
 package com.doumee.api.web;
 
+import com.doumee.config.Jwt.JwtTokenUtil;
 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.business.model.Member;
 import com.doumee.dao.business.model.Shop;
 import com.doumee.dao.business.model.WithdrawRecord;
+import com.doumee.dao.web.dto.IntegralRecordDTO;
 import com.doumee.dao.web.dto.ShopLoginDTO;
 import com.doumee.dao.web.dto.shop.*;
 import com.doumee.dao.web.request.MyCustomerRequest;
@@ -25,6 +30,7 @@
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -46,11 +52,11 @@
      * @param shopId
      * @return
      */
-    @ApiOperation(value = "鑾峰彇搴楅摵闂ㄩ潰淇℃伅", notes = "灏忕▼搴忕")
-    @GetMapping("/shopFaceDetailDTO")
-    public ApiResponse<ShopFaceDetailDTO> getShopFaceDetailDTO(@RequestParam Integer shopId){
-        return ApiResponse.success(shopService.getShopFaceDetailDTO(shopId,getMemberId()));
-    }
+//    @ApiOperation(value = "鑾峰彇搴楅摵闂ㄩ潰淇℃伅", notes = "灏忕▼搴忕")
+//    @GetMapping("/shopFaceDetailDTO")
+//    public ApiResponse<ShopFaceDetailDTO> getShopFaceDetailDTO(@RequestParam Integer shopId){
+//        return ApiResponse.success(shopService.getShopFaceDetailDTO(shopId,getMemberId()));
+//    }
 
     /**
      * 鎺ㄨ崘鍟嗛摵鍒楄〃
@@ -127,18 +133,12 @@
 
     @ApiOperation("缁忛攢鍟� - 璐﹀彿瀵嗙爜鐧诲綍")
     @PostMapping("/shopPasswordLogin")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
     public ApiResponse<AccountResponse> shopPasswordLogin(@RequestBody ShopLoginDTO dto) {
         return ApiResponse.success(shopService.shopPasswordLogin(dto));
     }
 
     @ApiOperation("缁忛攢鍟� - 闈欓粯鐧诲綍")
     @PostMapping("/shopOpenidLogin")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
     public ApiResponse<AccountResponse> shopOpenidLogin(@RequestBody ShopLoginDTO dto) {
         return ApiResponse.success(shopService.shopOpenidLogin(dto));
     }
@@ -156,24 +156,34 @@
 
     @LoginShopRequired
     @ApiOperation("缁忛攢鍟� - 鎴戠殑瀹㈡埛淇℃伅")
-    @GetMapping("/myCustomer")
+    @PostMapping("/myCustomer")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
-    public ApiResponse<List<MyCustomerResponse>> myCustomer(MyCustomerRequest request) {
+    public ApiResponse<PageData<Member>> myCustomer(@RequestBody PageWrap<MyCustomerRequest> request) {
         return ApiResponse.success(shopService.myCustomer(request,getShopId()));
     }
 
     @LoginShopRequired
     @ApiOperation("缁忛攢鍟� - 閿�鍞槑缁�")
-    @GetMapping("/saleReport")
+    @PostMapping("/saleReport")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
-    public ApiResponse<SaleReportResponse> saleReport(SaleReportRequest request) {
+    public ApiResponse<SaleReportResponse> saleReport(@RequestBody SaleReportRequest request) {
         return ApiResponse.success(shopService.saleReport(request,getShopId()));
     }
 
+    @LoginShopRequired
+    @ApiOperation("缁忛攢鍟� - 閫�鍑虹櫥褰�")
+    @GetMapping("/logOut")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse logOut(HttpServletRequest request) {
+        shopService.logOut(request.getHeader(JwtTokenUtil.HEADER_KEY),getShopId());
+        return ApiResponse.success("鎿嶄綔鎴愬姛");
+    }
 
 
 

--
Gitblit v1.9.3