From 8bdb26708241c70a9998b1729a2c9881422f2d5d Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 16 十月 2025 15:35:39 +0800
Subject: [PATCH] 模板修改
---
buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 64 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..56d3fbd 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
@@ -9,11 +9,16 @@
import cn.lili.common.security.context.UserContext;
import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.ResultMessage;
+import cn.lili.modules.lmk.domain.entity.UserCheckTemplate;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.lmk.enums.general.TemplateContentTypeEnum;
+import cn.lili.modules.lmk.service.UserCheckTemplateService;
+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;
@@ -25,15 +30,19 @@
import cn.lili.modules.system.entity.vo.Traces;
import cn.lili.utils.COSUtil;
import cn.lili.utils.CommonUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.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 +55,7 @@
* @author Chopper
* @since 2020/11/16 10:08 涓嬪崍
*/
+@Slf4j
@RestController
@Api(tags = "涔板绔�,璁㈠崟鎺ュ彛")
@RequestMapping("/buyer/order/order")
@@ -65,19 +75,15 @@
@Autowired
private AdminUserService adminUserService;
+ @Autowired
+ private UserCheckTemplateService userCheckTemplateService;
@ApiOperation(value = "鏌ヨ浼氬憳璁㈠崟鍒楄〃")
@GetMapping
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();
@@ -104,6 +110,25 @@
orderSearchParams.setMemberId(currentUser.getId());
return ResultUtil.data(orderService.queryByXcxParams(orderSearchParams));
}
+ @ApiOperation(value = "鏍规嵁璁㈠崟鍙锋煡璇㈠畾鍒舵ā鏉垮～鍐欎俊鎭�")
+ @GetMapping("/customize/{sn}")
+ public ResultMessage<List<UserCheckTemplate>> customize(@PathVariable @NotBlank String sn) {
+ LambdaQueryWrapper<UserCheckTemplate> eq = Wrappers.<UserCheckTemplate>lambdaQuery().eq(UserCheckTemplate::getOrderSn, sn);
+ List<UserCheckTemplate> list = userCheckTemplateService.list(eq);
+ for (UserCheckTemplate userCheckTemplate : list) {
+ if (TemplateContentTypeEnum.IMAGE.name().equals(userCheckTemplate.getContentType())) {
+ String content = userCheckTemplate.getContent();
+ if (StringUtils.isNotBlank(content)&&!content.contains("http")) {
+ userCheckTemplate.setContent(cosUtil.getPreviewUrl(content));
+ }
+ }
+ String chooseImg = userCheckTemplate.getChooseImg();
+ if (StringUtils.isNotBlank(chooseImg)&&!chooseImg.contains("http")) {
+ userCheckTemplate.setChooseImg(cosUtil.getPreviewUrl(chooseImg));
+ }
+ }
+ return ResultUtil.data(list);
+ }
@ApiOperation(value = "璁㈠崟鏄庣粏")
@ApiImplicitParams({
@@ -121,7 +146,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