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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/PaymentCompetitionServiceImpl.java

@@ -258,10 +258,10 @@
                        // 微信商户号
                        String s2 =storeClient.getmerchantNumberByOperatorId(competition.getOperatorId());
                        ResultUtil resultUtil = payMoneyUtil.fenzhangRefund(paymentCompetition.getFenzhangNo(), paymentCompetition.getFenzhangAmount(), s2, randomCode, randomCode1);
                        if (!resultUtil.getCode().equals(500)){
                            System.err.println("分账回退失败 原因是:"+resultUtil.getMsg());
                        if (!resultUtil.getCode().equals(200)){
                            System.err.println("分账回退失败 原因是:"+resultUtil.getData().toString());
                        }else{
                            paymentCompetition.setFenzhangRefundNo(resultUtil.getMsg());
                            paymentCompetition.setFenzhangRefundNo(resultUtil.getData().toString());
                            paymentCompetitionMapper.updateById(paymentCompetition);
                        }