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/mall/OrderApi.java |   56 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
index 56be23e..81c55c8 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/OrderApi.java
@@ -8,6 +8,7 @@
 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.core.utils.kuaidi100.DeliveryDTO;
 import com.doumee.core.utils.kuaidi100.ExpressUtils;
 import com.doumee.core.wx.SendWxMessage;
@@ -177,17 +178,19 @@
         return ApiResponse.success("鏌ヨ鎴愬姛", goodsorderService.getGoodsOrderDetail(orderId));
     }
 
-    @LoginRequired
-    @ApiOperation("璁㈠崟鍒楄〃")
-    @PostMapping("/orderPage")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse<IPage<MemberOrderResponse>> orderPage(@RequestBody PageWrap<MemberOrderRequest> pageWrap) {
-        pageWrap.getModel().setMemberId(getMemberId());
-        IPage<MemberOrderResponse> page = goodsorderService.getGoodsOrderPage(pageWrap);
-        return ApiResponse.success("鏌ヨ鎴愬姛",page);
-    }
+//    @LoginRequired
+//    @ApiOperation("璁㈠崟鍒楄〃")
+//    @PostMapping("/orderPage")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+//    })
+//    public ApiResponse<IPage<MemberOrderResponse>> orderPage(@RequestBody PageWrap<MemberOrderRequest> pageWrap) {
+//        pageWrap.getModel().setMemberId(getMemberId());
+//        IPage<MemberOrderResponse> page = goodsorderService.getGoodsOrderPage(pageWrap);
+//        return ApiResponse.success("鏌ヨ鎴愬姛",page);
+//    }
+
+
 
     @LoginRequired
     @ApiOperation("淇敼璁㈠崟鏀惰揣鍦板潃")
@@ -235,16 +238,29 @@
     }
 
 
-    @LoginRequired
+    @LoginShopRequired
     @ApiOperation("璁㈠崟鏍搁攢")
     @PostMapping("/writeOffOrder")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
     })
     public ApiResponse writeOffOrder(@RequestBody DealOrderRequest dealOrderRequest) {
-        goodsorderService.orderWriteOff(dealOrderRequest.getExchangeCode(),getMemberId());
+        goodsorderService.orderWriteOff(dealOrderRequest.getOrderId(),getShopId());
         return ApiResponse.success("鎿嶄綔鎴愬姛");
     }
+
+
+    @LoginShopRequired
+    @ApiOperation("鏍规嵁鏍搁攢鐮佽幏鍙栬鍗曡鎯�")
+    @PostMapping("/getOrderDetailByCode")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse<MemberOrderResponse> getOrderDetailByCode(@RequestBody DealOrderRequest dealOrderRequest) {
+        return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.getGoodsOrderDetailByCode(dealOrderRequest.getExchangeCode()));
+    }
+
+
 
     @LoginRequired
     @ApiOperation("璁㈠崟鍒犻櫎")
@@ -305,11 +321,25 @@
     })
     public ApiResponse<PageData<Goodsorder>> shopOrderPage(@RequestBody PageWrap<ShopOrderRequest> pageWrap) {
         pageWrap.getModel().setShopId(getShopId());
+        pageWrap.getModel().setUserType(Constants.ONE);
         PageData<Goodsorder> page = goodsorderService.shopOrderPage(pageWrap);
         return ApiResponse.success("鏌ヨ鎴愬姛",page);
     }
 
 
+    @LoginRequired
+    @ApiOperation("璁㈠崟鍒楄〃")
+    @PostMapping("/orderPage")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+    })
+    public ApiResponse<PageData<Goodsorder>> orderPage(@RequestBody PageWrap<ShopOrderRequest> pageWrap) {
+        pageWrap.getModel().setShopId(getMemberId());
+        pageWrap.getModel().setUserType(Constants.ZERO);
+        PageData<Goodsorder> page = goodsorderService.shopOrderPage(pageWrap);
+        return ApiResponse.success("鏌ヨ鎴愬姛",page);
+    }
+
     @LoginShopRequired
     @ApiOperation("璁㈠崟璇︽儏 - 缁忛攢鍟�")
     @GetMapping("/shopOrderDetail")

--
Gitblit v1.9.3