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; 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; }
@@ -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); }
@@ -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); }
