From 4e8be752d24ae22362455c16f75d3bcbccb23359 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 15:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 67d1868..82ce97c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
@@ -369,6 +369,7 @@
//查询订单下商品信息
List<ComShopOrderGoodsDO> orderGoodsDOList = comShopOrderGoodsDAO.selectList(new QueryWrapper<ComShopOrderGoodsDO>()
.eq("order_no",shopOrderDO.getOrderNo()));
+ StringBuilder sbr = new StringBuilder("");
if(!orderGoodsDOList.isEmpty()){
orderGoodsDOList.forEach(orderGoods -> {
ComShopOrderGoodsVO orderGoodsVO = new ComShopOrderGoodsVO();
@@ -377,9 +378,11 @@
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
orderGoodsVOS.add(orderGoodsVO);
+ sbr.append(orderGoods.getGoodsName() + " " );
});
}
orderVO.setOrderGoodsVOList(orderGoodsVOS);
+ orderVO.setGoodsName(sbr.toString());
ComShopUserAddressVO userAddressVO = new ComShopUserAddressVO();
//查询用户收货地址
@@ -389,6 +392,15 @@
orderVO.setUserAddressVO(userAddressVO);
}
+ //操作日志
+ List<ComShopOrderOperateDO> listOperLog = comShopOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopOrderOperateDO>().eq(ComShopOrderOperateDO::getOrderNo, shopOrderDO.getOrderNo()));
+ List<ComShopOrderOperateVO> listOperLogVO = new ArrayList<>(listOperLog.size());
+ listOperLog.forEach(logDO ->{
+ ComShopOrderOperateVO copyVO = new ComShopOrderOperateVO();
+ BeanUtils.copyProperties(logDO,copyVO);
+ listOperLogVO.add(copyVO);
+ });
+ orderVO.setLogs(listOperLogVO);
return R.ok(orderVO);
}
--
Gitblit v1.7.1