From cdbed525ab8395e916b2874ff9e7d59742f320b1 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 17:45:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java | 19 ++++++++++++++++++-
framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java | 3 +++
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java | 23 -----------------------
manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java | 15 +++++++++++++++
4 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
index d10e66f..2908a5d 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java
@@ -1,6 +1,7 @@
package cn.lili.modules.order.order.entity.vo;
+import cn.lili.modules.lmk.domain.entity.UserCheckTemplate;
import cn.lili.modules.order.order.entity.dos.Order;
import cn.lili.modules.order.order.entity.dos.OrderItem;
import cn.lili.modules.order.order.entity.dos.Receipt;
@@ -77,6 +78,8 @@
@ApiModelProperty(value = "浠锋牸璇︽儏")
private String priceDetail;
+ private List<UserCheckTemplate> userCheckTemplates;
+
public OrderDetailVO(Order order, List<OrderItem> orderItems, List<OrderLog> orderLogs,Receipt receipt) {
this.order = order;
this.orderItems = orderItems;
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
index ff75521..891cf17 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java
@@ -37,9 +37,6 @@
@Service
@RequiredArgsConstructor
public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem> implements OrderItemService {
- private final GoodsCustomizeTemplateService goodsCustomizeTemplateService;
- private final GoodsSkuService skuService;
- private final COSUtil cosUtil;
@Override
public void updateCommentStatus(String orderItemSn, CommentStatusEnum commentStatusEnum) {
@@ -101,26 +98,6 @@
//鏌ヨ姣忎釜 skuId瀵瑰簲鐨勫晢鍝� 鏄惁鏄畾鍒跺晢鍝� 锛屾槸鍒欐煡璇㈠嚭妯℃澘淇℃伅
List<OrderItem> list = this.list(lambdaQueryWrapper);
- for (OrderItem orderItem : list) {
- GoodsSku goodsSku = new LambdaQueryChainWrapper<>(skuService.getBaseMapper())
- .eq(GoodsSku::getId, orderItem.getSkuId())
- .eq(GoodsSku::getDeleteFlag, Boolean.FALSE)
- .one();
- if (goodsSku != null && CustomizeFlagEnum.CUSTOMIZE.name().equals(goodsSku.getCustomizeFlag())) {
- if (goodsSku.getCustomizeTemplateId() != null){
- GoodsCustomizeTemplateVO goodsCustomizeTemplateVO = goodsCustomizeTemplateService.detailById(goodsSku.getCustomizeTemplateId());
- goodsCustomizeTemplateVO.getListImages().forEach(item ->{
- if (StringUtils.isNotBlank(item.getImgUrl()) && !item.getImgUrl().contains("http")){
- item.setImgUrl(cosUtil.getPreviewUrl(item.getImgUrl()));
- }
- });
-
- orderItem.setGoodsCustomizeTemplateVO(goodsCustomizeTemplateVO);
-
- }
- }
-
- }
return list;
}
diff --git a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
index 10d215a..653f5c3 100644
--- a/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/order/OrderManagerController.java
@@ -9,8 +9,10 @@
import cn.lili.common.enums.ResultUtil;
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.domain.vo.OrderCountVO;
import cn.lili.modules.lmk.domain.vo.SelectVO;
+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.dto.OrderExportDTO;
@@ -67,6 +69,8 @@
@Autowired
private COSUtil cosUtil;
+ @Autowired
+ private UserCheckTemplateService userCheckTemplateService;
@ApiModelProperty(value = "搴楅摵涓嬫媺")
@GetMapping("/storeSelect")
@@ -126,6 +130,17 @@
}
});
+
+ List<UserCheckTemplate> list = new LambdaQueryChainWrapper<>(userCheckTemplateService.getBaseMapper())
+ .eq(UserCheckTemplate::getOrderSn, orderSn)
+ .eq(UserCheckTemplate::getDeleteFlag, Boolean.FALSE)
+ .list();
+ for (UserCheckTemplate userCheckTemplate : list) {
+ if (StringUtils.isNotBlank(userCheckTemplate.getContent()) && userCheckTemplate.getContent().startsWith("image")){
+ userCheckTemplate.setContent(cosUtil.getPreviewUrl(userCheckTemplate.getContent()));
+ }
+ }
+ orderDetailVO.setUserCheckTemplates(list);
return ResultUtil.data(orderDetailVO);
}
diff --git a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
index 0e51bde..f7922d8 100644
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
@@ -10,6 +10,8 @@
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.service.UserCheckTemplateService;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
import cn.lili.modules.member.service.StoreLogisticsService;
import cn.lili.modules.order.order.entity.dto.OrderSearchParams;
@@ -22,6 +24,7 @@
import cn.lili.modules.system.service.LogisticsService;
import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -50,7 +53,6 @@
@RequestMapping("/store/order/order")
@Api(tags = "搴楅摵绔�,璁㈠崟鎺ュ彛")
public class OrderStoreController {
-
/**
* 璁㈠崟
*/
@@ -77,6 +79,9 @@
private OrderPackageService orderPackageService;
@Autowired
+ private UserCheckTemplateService userCheckTemplateService;
+
+ @Autowired
private COSUtil cosUtil;
@ApiOperation(value = "鏌ヨ璁㈠崟鍒楄〃")
@GetMapping
@@ -100,6 +105,18 @@
orderItem.setImage(cosUtil.getPreviewUrl(image));
}
});
+ //鏌ヨ鐢ㄦ埛濉啓璁㈠崟淇℃伅
+
+ List<UserCheckTemplate> list = new LambdaQueryChainWrapper<>(userCheckTemplateService.getBaseMapper())
+ .eq(UserCheckTemplate::getOrderSn, orderSn)
+ .eq(UserCheckTemplate::getDeleteFlag, Boolean.FALSE)
+ .list();
+ for (UserCheckTemplate userCheckTemplate : list) {
+ if (StringUtils.isNotBlank(userCheckTemplate.getContent()) && userCheckTemplate.getContent().startsWith("image")){
+ userCheckTemplate.setContent(cosUtil.getPreviewUrl(userCheckTemplate.getContent()));
+ }
+ }
+ orderDetailVO.setUserCheckTemplates(list);
return ResultUtil.data(orderDetailVO);
}
--
Gitblit v1.8.0