Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

 cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java

@@ -196,7 +196,7 @@

        royaltyInfo.setRoyaltyDetailInfos(royaltyDetailInfos);
        model.setRoyaltyInfo(royaltyInfo);
System.out.println("=================="+royaltyInfo);
        System.err.println("=================="+royaltyInfo);


        //
@@ -403,6 +403,10 @@
            if("SUCCESS".equals(result_code)){
                String type = map1.get("trade_type");
                String prepay_id = map1.get("prepay_id");




                switch (type){
                    case "JSAPI":
                        //重新进行签名后返回给前端