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

jiaosong

2023-10-25 cc3bbf14c5fde619c23e5502c8583889e94deacc

 server/web/src/main/java/com/doumee/api/web/PaymentCallback.java

@@ -47,7 +47,7 @@
            if ("SUCCESS".equals(result.getReturnCode())) {
                // 支付成功
                switch (result.getAttach()) {
                    //家长支付订单
                    //支付订单回调
                    case "createGoodsOrder": {
                        goodsorderService.payNotify(outTradeNo,paymentNo);
                        break;
@@ -56,8 +56,7 @@
            } else {
                // 支付失败
                switch (result.getAttach()) {
                    //家长支付订单
                    case "createOrder": {
                    case "createGoodsOrder": {

                        break;
                    }