From 6ffb8faa85fb35f7c461efb46c4a68d7d626326b Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 01 十二月 2022 17:26:51 +0800
Subject: [PATCH] #feat 1111
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
index b24ecbd..cf39a99 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java
@@ -360,10 +360,10 @@
ComShopFlowerOrderGoodsVO orderGoodsVO = new ComShopFlowerOrderGoodsVO();
BeanUtils.copyProperties(orderGoods, orderGoodsVO);
// 根据商品规格id查询商品规格
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
- if (goodsAttrDO != null) {
- orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
- }
+// ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
+// if (goodsAttrDO != null) {
+ orderGoodsVO.setGoodsAttr(orderGoods.getGoodsAttrName());
+// }
orderGoodsVO.setNum(orderGoods.getAmount());
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
@@ -461,7 +461,7 @@
orderGoodsVO.setGoodsPic(orderGoods.getGoodsAttrPic());
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
// 查询商品信息判断商品状态
- ComShopFlowerGoodsDO goodsDO = comShopFlowerGoodsDAO.selectById(orderGoods.getGoodsId());
+ /* ComShopFlowerGoodsDO goodsDO = comShopFlowerGoodsDAO.selectById(orderGoods.getGoodsId());
if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)
|| goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.status.recovery)) {
orderGoodsVO.setGoodsStatus(ComShopFlowerOrderGoodsVO.goodsStatus.ysc);
@@ -469,13 +469,11 @@
orderGoodsVO.setGoodsStatus(ComShopFlowerOrderGoodsVO.goodsStatus.yxj);
} else if (goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
orderGoodsVO.setGoodsStatus(ComShopFlowerOrderGoodsVO.goodsStatus.csz);
- }
+ }*/
// 根据商品规格id查询商品规格
- ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
- if (goodsAttrDO != null) {
- orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
- }
+// ComShopFlowerGoodsAttrDO goodsAttrDO = comShopFlowerGoodsAttrDAO.selectById(orderGoods.getGoodsAttrId());
+ orderGoodsVO.setGoodsAttr(orderGoods.getGoodsAttrName());
orderGoodsVOS.add(orderGoodsVO);
sbr.append(orderGoods.getGoodsName()).append(" ");
});
@@ -495,7 +493,7 @@
}
// 操作日志
- List<ComShopFlowerOrderOperateDO> listOperLog =
+/* List<ComShopFlowerOrderOperateDO> listOperLog =
comShopFlowerOrderOperateDAO.selectList(new LambdaQueryWrapper<ComShopFlowerOrderOperateDO>()
.eq(ComShopFlowerOrderOperateDO::getOrderNo, shopOrderDO.getOrderNo()));
List<ComShopFlowerOrderOperateVO> listOperLogVO = new ArrayList<>(listOperLog.size());
@@ -504,7 +502,7 @@
BeanUtils.copyProperties(logDO, copyVO);
listOperLogVO.add(copyVO);
});
- orderVO.setLogs(listOperLogVO);
+ orderVO.setLogs(listOperLogVO);*/
Long pointId = shopOrderDO.getPointId();
if (null != pointId) {
ConvenientElevatingPointDO convenientElevatingPointDO = convenientElevatingPointDAO.selectById(pointId);
--
Gitblit v1.7.1