zj
2025-09-19 c8fba69fa3c55036e45c177a744674dd1b0df927
Merge remote-tracking branch 'origin/2-10' into 2-10
2 files modified
10 ■■■■ changed files
src/main/java/com/nq/service/impl/PayServiceImpl.java 6 ●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java 4 ●●●● patch | view | raw | blame | history
src/main/java/com/nq/service/impl/PayServiceImpl.java
@@ -123,7 +123,7 @@
    private ServerResponse getPaymentZero(String tradeAmount, String uipReqRul, User user, HttpServletRequest request) throws Exception {
        //int
        String url = "https://gateway.king-pays.com/gateway/payment/init";//正式地址
        String url = "https://gateway.kings-pays.com/gateway/payment/init";//正式地址
        String merchantKey = "qqaC1DH/LeR9iPvm";//商户key 需替换
        String aesKey = "ge6vK40fHNZPFJ4p";//商户aesKey 需替换
        String aesIv = "6gJoHTEE1i2O3ovE";//商户aesIv 需替换
@@ -289,7 +289,7 @@
        // 订单时间  时间格式yyyy-MM-dd HH:mm:ss
        params.put("order_date", getOrderTime());
        //支付类型 请查阅商户后台通道编码
        params.put("pay_type", "151");
        params.put("pay_type", "101");
        //交易金额 以元为单位
        params.put("trade_amount", tradeAmount);
@@ -602,7 +602,7 @@
//        map.put("mch_id","222887002");
        map.put("notify_url","http://www.jumptalk.net:8091/api/pay/flyNotify2.do");
        map.put("mch_order_no",ordersn);
        map.put("pay_type","151");
        map.put("pay_type","101");
//        map.put("pay_type","105");
        map.put("trade_amount",payAmt);
        map.put("order_date",DateTimeUtil.getCurrentDate(STANDARD_FORMAT));
src/main/java/com/nq/service/impl/SiteInfoServiceImpl.java
@@ -105,7 +105,7 @@
                    if(!agentUser.getOnLineServices().isEmpty()){
//                        siteInfo.setOnlineService(agentUser.getOnLineServices());
                        if(agentUser.getId().equals(17)){
                            siteInfo.setOnlineService("https://t.me/DuroCaspital035");
                            siteInfo.setOnlineService("https://t.me/DCaspital6755");
                        }else if(agentUser.getId().equals(18)){
                            siteInfo.setOnlineService("https://t.me/DC_1352");
                        }else if(agentUser.getId().equals(19)){
@@ -129,7 +129,7 @@
                        }else if(agentUser.getId().equals(29)){
                            siteInfo.setOnlineService("https://t.me/Duro_Capital");
                        }else if(agentUser.getId().equals(30)){
                            siteInfo.setOnlineService("https://t.me/DL9855\t");
                            siteInfo.setOnlineService("https://t.me/DCService_1");
                        }
                    }