1

zj

2025-08-13 3be328ff3f0194cab50f361a9abd3db856a76821

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

@@ -428,8 +428,8 @@
            if(null == type){
                return ServerResponse.createByErrorMsg("请选择支付通道！",request);
            }
            if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("1000")) < 0){
                return ServerResponse.createByErrorMsg("请重新输入，最低充值金额：1000", request);
            if(new BigDecimal(tradeAmoun).compareTo(new BigDecimal("5000")) < 0){
                return ServerResponse.createByErrorMsg("请重新输入，最低充值金额：5000", request);
            }

            payCreated.set(true);
@@ -464,23 +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);
    }

    /**
     * 代付回调通知
     */
    @PostMapping({"noticePayment.do"})
    public void noticePayment(TradeResultVO vo,HttpServletResponse response) throws IOException {
        iUserWithdrawService.noticePayment(vo,response);
    }

    /**
     * 代付2回调通知
     */
    @PostMapping({"noticePaymentTwo.do"})
    public void noticePaymentTwo(PaymentCallbackTwo vo,HttpServletResponse response) throws IOException {
        iUserWithdrawService.noticePaymentTwo(vo,response);
    }
}