From cca9b37d15cefe705d03219e2be1f73d77ee7254 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 11 七月 2025 11:29:53 +0800
Subject: [PATCH] docker compose
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index dc4a066..74ee3e3 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -5,7 +5,6 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelReader;
@@ -205,6 +204,12 @@
UserContext.getCurrentUser().getUsername(), message));
item.getCheckedSkuList().forEach(
sku -> {
+// OrderItem e = new OrderItem(sku, item, tradeDTO);
+// String goodsId = e.getGoodsId();
+// Goods goods = goodsService.getById(goodsId);
+// item.getPriceDetailDTO().setPlatFormCommissionPoint(Double.valueOf(goods.getCommission().toString()));
+// e.setPriceDetailDTO(item.getPriceDetailDTO());
+// orderItems.add(e);
orderItems.add(new OrderItem(sku, item, tradeDTO));
currentOrderItems.add(new OrderItem(sku, item, tradeDTO));
}
@@ -237,6 +242,42 @@
queryWrapper.groupBy("o.id");
queryWrapper.orderByDesc("o.id");
IPage<OrderSimpleXcxVO> iPage = this.baseMapper.queryByXcxParams(PageUtil.initPage(orderSearchParams), queryWrapper);
+ Set<String> goodsIds = new HashSet<>();
+ for (OrderSimpleXcxVO orderSimpleVO : iPage.getRecords()) {
+ orderSimpleVO.setOrderItems(orderSimpleVO.initOrderItems());
+ String groupGoodsId = orderSimpleVO.getGroupGoodsId();
+ if (StringUtils.isNotBlank(groupGoodsId)) {
+ goodsIds.addAll(Arrays.asList(groupGoodsId.split(",")));
+ }
+ }
+ if (CollectionUtil.isNotEmpty(goodsIds)) {
+ List<Goods> list = goodsService.list(Wrappers.<Goods>lambdaQuery().in(Goods::getId, goodsIds));
+ Map<String, String> goodsVideos = list
+ .stream().collect(Collectors.toMap(Goods::getId, g->
+ StringUtils.isNotBlank(g.getGoodsVideo())?g.getGoodsVideo():""
+ ));
+ iPage.getRecords().forEach(orderSimpleVO -> {
+ orderSimpleVO.getOrderItems().forEach(orderItem -> {
+ String videoUrl = goodsVideos.get(orderItem.getGoodsId());
+ if (StringUtils.isNotBlank(videoUrl)&&!videoUrl.contains("http")) {
+ orderItem.setVideo(cosUtil.getPreviewUrl(videoUrl));
+ }
+ String image = orderItem.getImage();
+ if (StringUtils.isNotBlank(image)&&!image.contains("http")) {
+ orderItem.setImage(cosUtil.getPreviewUrl(image));
+ }
+ });
+ });
+ }
+ return iPage;
+ }
+
+ @Override
+ public IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams) {
+ QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
+ queryWrapper.groupBy("o.id");
+ queryWrapper.orderByDesc("o.id");
+ IPage<OrderSimpleXcxVO> iPage = this.baseMapper.querySupplierOrderParams(PageUtil.initPage(orderSearchParams), queryWrapper);
Set<String> goodsIds = new HashSet<>();
for (OrderSimpleXcxVO orderSimpleVO : iPage.getRecords()) {
orderSimpleVO.setOrderItems(orderSimpleVO.initOrderItems());
@@ -454,7 +495,25 @@
//璁板綍搴楅摵璁㈠崟鏀粯娴佹按
storeFlowService.payOrder(orderSn);
-
+ //todo 鐢熸垚璁㈠崟璁板綍琛�
+// //鑾峰彇瀛愯鍗曟暟鎹�
+// List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
+// List<String> goodsIds = orderItems.stream().map(OrderItem::getGoodsId).distinct().collect(Collectors.toList());
+//
+// Map<String, OrderItem> orderItem = orderItems.stream()
+// .collect(Collectors.toMap(OrderItem::getGoodsId, Function.identity()
+// ,(oldValue, newValue) -> oldValue));
+// //鏍规嵁璁㈠崟item椤瑰垱寤烘娊鎴愭祦姘磋鍗�
+// List<CommissionRecord> commissionRecords = new ArrayList<>();
+// CommissionRecord commissionRecord;
+// for (OrderItem item : orderItems) {
+// commissionRecord = new CommissionRecord();
+// commissionRecord.setSn(item.getSn());
+// BigDecimal commission = item.getCommission();
+// commissionRecord.setCommission(commission);
+// commissionRecord.setCommissionPrice();
+//
+// }
//鍙戦�佽鍗曞凡浠樻娑堟伅
OrderMessage orderMessage = new OrderMessage();
orderMessage.setOrderSn(order.getSn());
--
Gitblit v1.8.0