From ebb1dd6ce6b9aab0fcd920bc325abb5b342e5b40 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期二, 29 十一月 2022 15:58:12 +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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 7feafdc..17df91f 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
@@ -479,7 +479,10 @@
orderGoodsVOS.add(orderGoodsVO);
sbr.append(orderGoods.getGoodsName()).append(" ");
});
+ orderVO.setGoodsAttrPic(orderGoodsDOList.get(0).getGoodsAttrPic());
+ orderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
}
+
orderVO.setOrderGoodsVOList(orderGoodsVOS);
orderVO.setGoodsName(sbr.toString());
@@ -1007,8 +1010,8 @@
Map<String, Integer> retMap = new HashMap<>();
int amountTotal = 0;
for (int i = 0; i < statusStr.length; i++) {
- if (collect.containsKey(i)) {
- Integer amount = collect.get(i);
+ if (collect.containsKey(i+1)) {
+ Integer amount = collect.get(i+1);
amountTotal = amountTotal + amount;
retMap.put(statusStr[i], amount);
} else {
--
Gitblit v1.7.1