Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-28 9109a60d73507e411020c32c8f66fb5ba6fef80c

 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());
@@ -138,7 +139,7 @@
                String refundNo = WXPayUtil.generateNonceStr();
                ComShopFlowerOrderDO comShopFlowerOrderDO = comShopFlowerOrderDAO.selectById(comShopFlowerRefundOrderDO.getOrderId());
                String refundStr = WxPayUtils.refund(appid, mchId, comShopFlowerOrderDO.getOrderNo(), comShopFlowerRefundOrderDO.getPayAmount(),
                        comShopFlowerRefundOrderDO.getRefundAmount(), refundNo, isTest);
                        comShopFlowerRefundOrderDO.getPayAmount(), refundNo, isTest);
                log.info("退款请求接口返回参数:{}" , refundStr);
                Map<String, String> mapResult  = WXPayUtil.xmlToMap(refundStr);
                if (CollUtil.isNotEmpty(mapResult)) {
@@ -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(" ");
            });