From 09c68ce0ddbaebde08d0d370b5bb4ab0b1532a73 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 28 十一月 2022 15:03:02 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerOrderServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 1afacce..8c6ec90 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
@@ -243,6 +243,7 @@
ComShopFlowerOrderGoodsDO orderGoodsDO = new ComShopFlowerOrderGoodsDO();
orderGoodsDO.setGoodsId(goodsDO.getId());
orderGoodsDO.setGoodsName(goodsDO.getName());
+
orderGoodsDO.setStoreId(storeId);
orderGoodsDO.setUserId(userId);
orderGoodsDO.setAmount(createGoodsDTO.getNum());
@@ -258,6 +259,7 @@
if (goodsAttrDO.getStock() < createGoodsDTO.getNum()) {
return R.fail("该规格库存不足，无法下单");
}
+ orderGoodsDO.setGoodsAttrName(goodsAttrDO.getGoodsAttrName());
orderGoodsDO.setGoodsAttrId(goodsAttrDO.getId());
orderGoodsDO.setGoodsAttrPrice(createGoodsDTO.getPrice());
orderGoodsDO.setPrice(goodsAttrDO.getPrice());
@@ -357,6 +359,7 @@
orderGoodsVO.setPrice(orderGoods.getGoodsAttrPrice());
orderGoodsVOS.add(orderGoodsVO);
});
+ orderVo.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
}
orderVo.setOrderGoodsVOList(orderGoodsVOS);
@@ -931,6 +934,7 @@
ConvenientElevatingPointVO convenientElevatingPointVO = new ConvenientElevatingPointVO();
BeanUtils.copyProperties(convenientElevatingPointDO, convenientElevatingPointVO);
orderVo.setConvenientElevatingPointVO(convenientElevatingPointVO);
+
}
});
}
--
Gitblit v1.7.1