From c313a253b1fcdc75b6be5db575fc2b29fb407021 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 15 四月 2026 20:05:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/web/src/main/java/com/doumee/api/web/OrdersApi.java | 244 +++++++++++++-----------------------------------
1 files changed, 68 insertions(+), 176 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
index 4262967..fe1eea4 100644
--- a/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/OrdersApi.java
@@ -1,220 +1,112 @@
package com.doumee.api.web;
-import com.azure.core.annotation.Post;
import com.doumee.core.annotation.LoginRequired;
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.dao.business.model.IdentityInfo;
-import com.doumee.dao.business.model.Member;
-import com.doumee.dao.business.model.Orders;
-import com.doumee.dao.dto.*;
-import com.doumee.dao.vo.OrderReleaseVO;
-import com.doumee.service.business.IdentityInfoService;
-import com.doumee.service.business.MemberService;
+import com.doumee.dao.business.model.Areas;
+import com.doumee.dao.business.model.Banner;
+import com.doumee.dao.business.model.Category;
+import com.doumee.dao.dto.CalculateLocalPriceDTO;
+import com.doumee.dao.dto.CalculateRemotePriceDTO;
+import com.doumee.dao.vo.AccountResponse;
+import com.doumee.dao.vo.PriceCalculateVO;
+import com.doumee.service.business.AreasService;
+import com.doumee.service.business.BannerService;
+import com.doumee.service.business.CategoryService;
import com.doumee.service.business.OrdersService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.math.BigDecimal;
+import java.util.List;
/**
* Created by IntelliJ IDEA.
*
* @Author : Rk
- * @create 2025/7/10 9:29
+ * @create 2025/7/15 15:49
*/
-@Api(tags = "璁㈠崟涓氬姟")
+@Api(tags = "閰嶇疆绫绘帴鍙�")
@Trace(exclude = true)
@RestController
-@RequestMapping("/web/orders")
+@RequestMapping("/web/config")
@Slf4j
-public class OrdersApi extends ApiController{
-
+public class ConfigApi extends ApiController{
@Autowired
- private MemberService memberService;
+ private CategoryService categoryService;
+
+ @Autowired
+ private AreasService areasService;
+
+ @Autowired
+ private BannerService bannerService;
@Autowired
private OrdersService ordersService;
- @LoginRequired
- @ApiOperation(value = "鍙戝竷璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/release")
+ @ApiOperation(value = "鑾峰彇鍒嗙被鍒楄〃", notes = "灏忕▼搴忕")
+ @GetMapping("/getCategoryList")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "绫诲瀷:1=杞﹁締绫诲瀷;2=鐗╁搧鍒嗙被;3=鐗╁搧绛夌骇;4=鐗╁搧灏哄;", required = true)
})
- public ApiResponse<OrderReleaseVO> release(@RequestBody Orders orders) {
- orders.setMember(this.getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.create(orders));
+ public ApiResponse<List<Category>> getCategoryList(@RequestParam Integer type) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛",categoryService.getCategoryList(type));
+ }
+
+ @ApiOperation(value = "鑾峰彇寮�鏀惧煄甯傚垪琛�", notes = "杩斿洖宸插紑鏀惧煄甯傦紝鍚瀛楁瘝锛屾寜棣栧瓧姣嶆帓搴�")
+ @GetMapping("/getOpenCityList")
+ public ApiResponse<List<Areas>> getOpenCityList() {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", areasService.getOpenCityList());
+ }
+
+ @ApiOperation(value = "鑾峰彇杞挱鍥惧垪琛�", notes = "鏍规嵁浣嶇疆杩斿洖杞挱鍥撅紝鍚浘鐗囧叏璺緞")
+ @GetMapping("/getBannerList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "position", value = "浣嶇疆:0=浼氬憳绔椤佃疆鎾�;1=鍙告満APP寮曞椤�;", required = true)
+ })
+ public ApiResponse<List<Banner>> getBannerList(@RequestParam Integer position) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", bannerService.findListByPosition(position));
+ }
+
+ @ApiOperation(value = "鑾峰彇鍩庡競宸插紑閫氱墿鍝佸昂瀵�", notes = "鏍规嵁鍩庡競涓婚敭鏌ヨ宸插紑閫氱殑鐗╁搧灏哄(category type=4)")
+ @GetMapping("/getCitySizeList")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "cityId", value = "鍩庡競涓婚敭", required = true)
+ })
+ public ApiResponse<List<Category>> getCitySizeList(@RequestParam Integer cityId) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", categoryService.getCitySizeList(cityId));
}
@LoginRequired
- @ApiOperation(value = "淇敼璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/updateOrder")
+ @ApiOperation(value = "璁＄畻淇濅环璐圭敤", notes = "鏍规嵁鎶ヤ环閲戦璁＄畻淇濅环璐圭敤")
+ @GetMapping("/calculateInsuranceFee")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ @ApiImplicitParam(paramType = "query", dataType = "BigDecimal", name = "declaredValue", value = "鎶ヤ环閲戦", required = true),
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
})
- public ApiResponse updateOrder(@RequestBody Orders orders) {
- orders.setMember(this.getMemberResponse());
- ordersService.update(orders);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ public ApiResponse<BigDecimal> calculateInsuranceFee(@RequestParam BigDecimal declaredValue) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", ordersService.calculateInsuranceFee(declaredValue));
}
@LoginRequired
- @ApiOperation(value = "鎺ュ崟鏂圭‘璁よ鍗曡垂鐢� - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/confirmFee")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse confirmFee(@RequestBody ConfirmFeeOrderDTO orders) {
- orders.setMember(this.getMemberResponse());
- ordersService.confirmFee(orders);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
-
-// @LoginRequired
-// @ApiOperation(value = "淇敼璁㈠崟鏃ユ湡 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
-// @PostMapping("/updOrderData")
-// @ApiImplicitParams({
-// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-// })
-// public ApiResponse updOrderData(@RequestBody UpdOrderDataDTO updOrderDataDTO) {
-// updOrderDataDTO.setMember(this.getMemberResponse());
-// ordersService.updOrderData(updOrderDataDTO);
-// return ApiResponse.success("鎿嶄綔鎴愬姛");
-// }
-
- @LoginRequired
- @ApiOperation(value = "鎵嬪姩鎺ュ崟 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/accept")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse accept(@RequestParam Integer orderId) {
- ordersService.accept(orderId,this.getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
+ @ApiOperation(value = "璁＄畻灏卞湴瀛樺彇棰勪及璐圭敤", notes = "鏍规嵁鍩庡競銆佸ぉ鏁般�佺墿鍝佺被鍨嬪拰鏁伴噺璁＄畻灏卞湴瀛樺彇棰勪及璐圭敤")
+ @PostMapping("/calculateLocalPrice")
+ public ApiResponse<PriceCalculateVO> calculateLocalPrice(@RequestBody @Valid CalculateLocalPriceDTO dto) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", ordersService.calculateLocalPrice(dto));
}
@LoginRequired
- @ApiOperation(value = "寮�濮嬩綔涓� - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/begin")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse begin(@RequestParam Integer orderId) {
- ordersService.begin(orderId,this.getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
- @LoginRequired
- @ApiOperation(value = "鍙栨秷璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/cancelOrder")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse cancelOrder(@RequestParam Integer orderId) {
- ordersService.cancelOrder(orderId,this.getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
- @LoginRequired
- @ApiOperation(value = "鍙栨秷鍓嶆彁绀鸿 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @GetMapping("/cancelTips")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse cancelTips(@RequestParam Integer orderId) {
- ordersService.cancelTips(orderId,this.getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
-
-
- @LoginRequired
- @ApiOperation(value = "纭璁㈠崟淇敼 - 鎺ュ崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/confirmUpd")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse confirmUpd(@RequestBody ConfirmUpdOrderDTO confirmUpdOrderDTO) {
- confirmUpdOrderDTO.setMember(this.getMemberResponse());
- ordersService.confirmUpd(confirmUpdOrderDTO);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
- @LoginRequired
- @ApiOperation(value = "瀹屾垚璁㈠崟 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/doneOrder")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<OrderReleaseVO> doneOrder(@RequestBody DoneOrderDTO doneOrderDTO) {
- doneOrderDTO.setMember(getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.doneOrder(doneOrderDTO));
- }
-
- @LoginRequired
- @ApiOperation(value = "璁㈠崟閲嶆柊鏀粯 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/reusePay")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<OrderReleaseVO> reusePay(@RequestBody ReusePayDTO reusePayDTO) {
- reusePayDTO.setMember(getMemberResponse());
- return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.reusePay(reusePayDTO));
- }
-
-
- @LoginRequired
- @ApiOperation(value = "璁㈠崟璇勪环 - 鍙戝崟鏂�", notes = "灏忕▼搴忕")
- @PostMapping("/comment")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse comment(@RequestBody CommentDTO commentDTO) {
- commentDTO.setMember(this.getMemberResponse());
- ordersService.comment(commentDTO);
- return ApiResponse.success("鎿嶄綔鎴愬姛");
- }
-
-
-
- @LoginRequired
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
- pageWrap.getModel().setMember(this.getMemberResponse());
- return ApiResponse.success(ordersService.findPageForMini(pageWrap));
- }
-
- @LoginRequired
- @ApiOperation(value = "璁㈠崟璇︽儏", notes = "灏忕▼搴忕")
- @GetMapping("/getDetail")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<Orders> getDetail(@RequestParam Integer orderId) {
- return ApiResponse.success("鎿嶄綔鎴愬姛",ordersService.getDetail(orderId,this.getMemberResponse()));
- }
-
- @LoginRequired
- @ApiOperation("鑾峰彇棰勮閲戦锛堝垎锛�")
- @PostMapping("/getTotal")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
- public ApiResponse<Long> getTotal(@RequestBody Orders orders) {
- return ApiResponse.success(ordersService.getTotal(orders));
+ @ApiOperation(value = "璁＄畻寮傚湴瀛樺彇棰勪及璐圭敤", notes = "鏍规嵁璺濈銆佺墿鍝佺被鍨嬪拰鏁伴噺璁＄畻寮傚湴瀛樺彇棰勪及璐圭敤")
+ @PostMapping("/calculateRemotePrice")
+ public ApiResponse<PriceCalculateVO> calculateRemotePrice(@RequestBody @Valid CalculateRemotePriceDTO dto) {
+ return ApiResponse.success("鎿嶄綔鎴愬姛", ordersService.calculateRemotePrice(dto));
}
--
Gitblit v1.9.3