From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/web/src/main/java/com/doumee/api/web/ManagerApi.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/ManagerApi.java b/server/web/src/main/java/com/doumee/api/web/ManagerApi.java
index 614e00b..bf499b2 100644
--- a/server/web/src/main/java/com/doumee/api/web/ManagerApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/ManagerApi.java
@@ -10,6 +10,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.web.request.GoodsorderBackDTO;
+import com.doumee.dao.business.web.request.GoodsorderCanBanlanceDTO;
import com.doumee.dao.business.web.response.UserResponse;
import com.doumee.dao.system.dto.WebLoginDTO;
import com.doumee.dao.system.model.SystemUser;
@@ -30,6 +32,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* Created by IntelliJ IDEA.
@@ -54,6 +57,9 @@
private SystemLoginService systemLoginService;
@Autowired
private SystemUserService systemUserService;
+ /** 璁㈠崟閫�娆�/鍙��娆句俊鎭煡璇�(web 绔� JWT 鍦烘櫙) */
+ @Autowired
+ private GoodsorderService goodsorderService;
@LoginRequired
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鐧诲綍绠＄悊鍛樿处鍙�")
@@ -130,4 +136,33 @@
return ApiResponse.success(list);
}
+ @LoginRequired
+ @ApiOperation("鑾峰彇鍙��娆句俊鎭�")
+ @GetMapping("/getGoodsorderCanBanlanceDTO")
+ public ApiResponse<GoodsorderCanBanlanceDTO> getGoodsorderCanBanlanceDTO(@RequestParam String orderId) {
+ // 浠呮煡璇�,鏃犵櫥褰曚汉鍐欏叆;鏍￠獙绠＄悊鍛�
+ UserResponse user = this.getUserResponse();
+ if (user.getSysuser() == null) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ }
+ return ApiResponse.success(goodsorderService.getGoodsorderCanBanlanceDTO(orderId));
+ }
+
+ @PreventRepeat
+ @LoginRequired
+ @ApiOperation("閫�娆�")
+ @PostMapping("/backGoodsorder")
+ public ApiResponse backGoodsorder(@RequestBody GoodsorderBackDTO goodsorderBackDTO) {
+ // 閫�娆句负绠＄悊鍛樻搷浣�:鏍￠獙宸茬粦瀹氱郴缁熺鐞嗗憳,creator 鍙� sysuser.id(涓� platform Shiro 鍙ｅ緞涓�鑷�)
+ UserResponse user = this.getUserResponse();
+ if (user.getSysuser() == null) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED);
+ }
+ if (Objects.nonNull(goodsorderBackDTO) && Objects.isNull(goodsorderBackDTO.getBackType())) {
+ goodsorderBackDTO.setBackType(Constants.ONE);
+ }
+ goodsorderService.backGoodsorder(goodsorderBackDTO, user.getSysuser().getId());
+ return ApiResponse.success(null);
+ }
+
}
--
Gitblit v1.9.3