1

zj

2025-07-23 b3d754191cd615048cf850734e89e823128ffbfc

1

 src/main/java/com/nq/controller/protol/UserController.java

@@ -464,7 +464,21 @@
     * 充值2异步接收地址
     */
    @PostMapping({"rechargeCallbackTwo.do"})
    public void rechargeCallbackTwo(TransactionStatusVo vo, HttpServletResponse response) throws IOException {
    public void rechargeCallbackTwo(@RequestParam("status") String status,
                                    @RequestParam("merchantid") String merchantid,
                                    @RequestParam("out_trade_no") String outTradeNo,
                                    @RequestParam("total_fee") String totalFee,
                                    @RequestParam("poundage") String poundage,
                                    @RequestParam("account_fee") String accountFee,
                                    @RequestParam("sign") String sign, HttpServletResponse response) throws IOException {
        TransactionStatusVo vo = new TransactionStatusVo();
        vo.setStatus(status);
        vo.setMerchantid(merchantid);
        vo.setOut_trade_no(outTradeNo);
        vo.setTotal_fee(totalFee);
        vo.setPoundage(poundage);
        vo.setAccount_fee(accountFee);
        vo.setSign(sign);
        payService.rechargeCallbackTwo(vo,response);
    }
}

 src/main/java/com/nq/service/impl/PayServiceImpl.java

@@ -915,18 +915,19 @@
                    .last("limit 1")
            );

            if(!vo.getStatus().equals("payin_ing")){
            if(vo.getStatus().equals("payin_ing")){
                log.error("充值2回调交易中："+vo.toString());
                return;
            }

            if(!vo.getStatus().equals("payin_fail")){
            }else if(vo.getStatus().equals("payin_fail")){
                paymentRecharge.setStatus(2);
                paymentRecharge.setAmount(new BigDecimal(vo.getAccount_fee()));
                paymentRecharge.setPayInfo(vo.toString());
                paymentRechargeService.updateById(paymentRecharge);
                log.error("充值回调失败："+vo.toString());
                return;
            }else if(!vo.getStatus().equals("payin_fail") && !vo.getStatus().equals("payin_ing") && !vo.getStatus().equals("payin_success")){
                log.error("充值回调失败----未知状态："+vo.toString());
                return;
            }

            if(ObjectUtils.isEmpty(paymentRecharge)){