From fa6528a77821c3fb7a46c2a8b63a2adb6da4fc10 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 15:04:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
index d241c01..23db668 100644
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
@@ -10,10 +10,12 @@
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderPackage;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
import cn.lili.modules.order.order.entity.dto.OrderSearchXcxParams;
+import cn.lili.modules.order.order.entity.enums.ModifyAddressEnums;
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
@@ -30,10 +32,12 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
@@ -46,6 +50,7 @@
* @author Chopper
* @since 2020/11/16 10:08 涓嬪崍
*/
+@Slf4j
@RestController
@Api(tags = "涔板绔�,璁㈠崟鎺ュ彛")
@RequestMapping("/buyer/order/order")
@@ -70,14 +75,8 @@
public ResultMessage<IPage<OrderSimpleVO>> queryMineOrder(OrderSearchParams orderSearchParams) {
AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
orderSearchParams.setMemberId(currentUser.getId());
- IPage<OrderSimpleVO> t = orderService.queryByParams(orderSearchParams);
-
- if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
- for (OrderSimpleVO vo : t.getRecords()){
- vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
- vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
- }
- }
+ Boolean needHide = false;
+ IPage<OrderSimpleVO> t = orderService.queryByParams(orderSearchParams,needHide);
t.getRecords().forEach(orderSimpleVO -> {
String groupImages = orderSimpleVO.getGroupImages();
@@ -121,7 +120,37 @@
});
return ResultUtil.data(orderDetailVO);
}
-
+ @ApiOperation(value = "璁㈠崟鏄庣粏")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "orderSn", value = "璁㈠崟缂栧彿", required = true, paramType = "path")
+ })
+ @GetMapping(value = "/editAddress/{orderSn}")
+ public ResultMessage<OrderDetailVO> editAddress(@NotNull(message = "璁㈠崟缂栧彿涓嶈兘涓虹┖") @PathVariable("orderSn") String orderSn) {
+ OrderDetailVO orderDetailVO = orderService.queryEditAddressDetail(orderSn);
+ Order order = orderDetailVO.getOrder();
+ if (!OrderStatusEnum.UNDELIVERED.name().equals(order.getOrderStatus())) {
+ log.error("璁㈠崟鍙蜂负{}------------------->鐘舵�佸紓甯镐负{}",orderSn,order.getOrderStatus());
+ throw new ServiceException("璁㈠崟鐘舵�佸紓甯告棤娉曢鍙�");
+ }
+ String modifyAddressFlag = order.getModifyAddressFlag();
+ if (ModifyAddressEnums.USED.name().equals(modifyAddressFlag)) {
+ throw new ServiceException("璁㈠崟宸茶棰嗗彇");
+ }
+ orderDetailVO.getOrderItems().forEach(orderItem -> {
+ String image = orderItem.getImage();
+ if (StringUtils.isNotBlank(image)&&!image.contains("http")) {
+ orderItem.setImage(cosUtil.getPreviewUrl(image));
+ }
+ });
+ return ResultUtil.data(orderDetailVO);
+ }
+ @ApiOperation(value = "淇敼鏀惰揣浜轰俊鎭�")
+ @ApiImplicitParam(name = "orderSn", value = "璁㈠崟sn", required = true, dataType = "String", paramType = "path")
+ @PostMapping(value = "/update/editAddress/{orderSn}/consignee")
+ public ResultMessage<Object> consignee(@NotNull(message = "鍙傛暟闈炴硶") @PathVariable String orderSn,
+ @Valid @RequestBody MemberAddressDTO memberAddressDTO) {
+ return ResultUtil.data(orderService.updateAddressConsignee(orderSn, memberAddressDTO));
+ }
@PreventDuplicateSubmissions
@ApiOperation(value = "纭鏀惰揣")
@ApiImplicitParams({
--
Gitblit v1.8.0