Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 09c68ce0ddbaebde08d0d370b5bb4ab0b1532a73

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerRefundOrderServiceImpl.java

@@ -105,6 +105,7 @@
                    orderGoodsVOS.add(orderGoodsVO);
                    sbr.append(orderGoods.getGoodsName()).append(" ");
                });
                comShopFlowerRefundOrderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
            }
            comShopFlowerRefundOrderVO.setOrderGoodsVOList(orderGoodsVOS);
            comShopFlowerRefundOrderVO.setGoodsName(sbr.toString());
@@ -261,6 +262,7 @@
                if (goodsAttrDO != null) {
                    orderGoodsVO.setGoodsAttr(goodsAttrDO.getGoodsAttrName());
                }
                comShopFlowerRefundOrderVO.setGoodsAttrName(orderGoodsDOList.get(0).getGoodsAttrName());
                orderGoodsVOS.add(orderGoodsVO);
                sbr.append(orderGoods.getGoodsName()).append(" ");
            });