Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 868c42a04909c8842c3bc7858cb64b5f368b8f99

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

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