puzhibing
2023-06-02 e0faebd41278c2e9389a26f39b2bfff63d68103d
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
@@ -317,8 +317,6 @@
        rechargeRecord.setPayStatus(1);
        rechargeRecord.setPayType(1);
        rechargeRecordService.insert(rechargeRecord);
//        ResultUtil weixinpay = payMoneyUtil.weixinpay("余额充值", "", out_trade_no, amount.toString(), "/base/appUser/rechargeBalanceCallback", "JSAPI", appUser.getOpenid());
//        return weixinpay;
        PaymentOrder paymentOrder = new PaymentOrder();
        paymentOrder.setBizOrderId(out_trade_no);
@@ -335,7 +333,7 @@
        paymentOrderGood.setGoodsName("账户充值");
        goodsDetail.add(paymentOrderGood);
        paymentOrder.setGoodsDetail(goodsDetail);
        paymentOrder.setFrontUrl("");
        paymentOrder.setFrontUrl(callbackPath + "/base/appUser/rechargeBalanceCallback");
        paymentOrder.setNotifyUrl(callbackPath + "/base/appUser/rechargeBalanceCallback");
        paymentOrder.setParameter1(out_trade_no);
@@ -349,6 +347,7 @@
        if("2".equals(status)){
            return ResultUtil.error("失败");
        }
        String merOrderId = jsonObject.getString("merOrderId");
        String payCode = jsonObject.getString("payCode");
        if(ToolUtil.isNotEmpty(payCode)){
            new Thread(new Runnable() {
@@ -365,7 +364,7 @@
                                return;
                            }
                            QueryOrder queryOrder = new QueryOrder();
                            queryOrder.setOriginalMerOrderId(out_trade_no);
                            queryOrder.setOriginalMerOrderId(merOrderId);
                            queryOrder.setQueryType("1");
                            TrhRequest<QueryOrder> request = new TrhRequest();
                            InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);