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

张天森

2022-11-10 d99a56e37cf9109b46ee68d34a06594ef5615ed3

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

@@ -148,7 +148,7 @@
                }
                // 调用wx支付
                WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "签订租房合同", wxPayOrderVO.getOpenId(),
                        wxPayOrderVO.getOrderSn(), money);
                        wxPayOrderVO.getOrderSn(), money,null);
                return R.ok();
            } catch (Exception e) {
                log.error("调用微信支付异常,异常原因：" + e.getMessage());
@@ -162,7 +162,7 @@
                }
                // 调用wx支付
                WxPayUtils.getUnifiedorder(appid, mchId, payKey, notifyUrl, "定金支付", wxPayOrderVO.getOpenId(),
                        wxPayOrderVO.getOrderSn(), money);
                        wxPayOrderVO.getOrderSn(), money,null);
                return R.ok();
            } catch (Exception e) {
                log.error("调用微信支付异常,异常原因：" + e.getMessage());