update

liujie

2025-11-26 24d320d2f7d9539d1c597683a2e8d05c0b108db9

update

 DriverJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/UserWithdrawalController.java

@@ -421,7 +421,7 @@
        // 司机进件信息
        UserWithdrawal userWithdrawal = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
                .eq("phone",driver.getPhone())
                .eq("applicationStatus","succeeded")
                .eq("type",1)
                .last("LIMIT 1"));

        System.out.println("司机电子账簿信息====："+userWithdrawal);

 UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/account/controller/ElectronicLedgerController.java

@@ -405,7 +405,7 @@

        UserInfo user = userInfoService.selectById(userInfoService.getUserIdFormRedis(request));
        UserWithdrawal driverWith = userWithdrawalService.selectOne(new EntityWrapper<UserWithdrawal>()
                .eq("phone", user.getPhone())
                .eq("phone", user.getPhone()).eq("type",1)
                .last("LIMIT 1"));
        if(driverWith==null){
            return  ResultUtil.error("请先进行进件操作");

 UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongPayUtil.java

@@ -55,17 +55,44 @@
        String req_seq_id = System.currentTimeMillis() + ToolUtil.getRandomNumber(10);
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
        String req_date = simpleDateFormat.format(new Date());
        String money ="0.01";
        money =  new BigDecimal(money).setScale(2, RoundingMode.HALF_UP).toString();
        String notifyUrl = "";
//
//        money = new BigDecimal(money).setScale(2, RoundingMode.HALF_UP).toString();
//        switch (callType) {
//            case 1:
//                // 订单支付
//                notifyUrl = callbackPath + "/base/DGCallBack";
//                break;
//            case 2:
//                // 支付小件物流差价支付回调
//                notifyUrl = callbackPath +"/base/DGPayOrderLogisticsSpread";
//                break;
//            case 3:
//                // 购买出行卡支付回调
//                notifyUrl = callbackPath+"/base/DGPayTaxiCardPaymentSpread";
//                break;
//            case 4:
//                // 感谢费支付回调
//                notifyUrl = callbackPath + "/base/DGPayThankYouFee";
//                break;
//            case 5:
//                // 取消订单
//                notifyUrl = callbackPath + "/base/DGCancelOrderTaxi";
//                break;
//            case 6:
//                // 充值
//                notifyUrl = callbackPath + "/base/DGCancelUserBalance";
//                break;
//        }
        String a = "{\n" +
                "    \"req_seq_id\": \"" + req_seq_id + "\",\n" +
                "    \"req_date\": \"" + req_date + "\",\n" +
                "    \"huifu_id\": \"6666000182995771\",\n" +
                "    \"trade_type\": \"A_NATIVE\",\n" +
                "    \"trans_amt\": \""+money+"\",\n" +
                "    \"goods_desc\": \"test\",\n" +
                "    \"trade_type\": \"T_MINIAPP\",\n" +
                "    \"trans_amt\": \"" + 0.01 + "\",\n" +
                "    \"goods_desc\": \"" + "goodsDesc" + "\",\n" +
                "    \"remark\": \"嘉易行\",\n" +
                "    \"notify_url\": \""+"http://221.182.45.100:8006/base/DGCallBackZfb"+"\",\n" +
                "    \"notify_url\": \""+notifyUrl+"\",\n" +
                "  }";
        // 去掉换行、空格等格式字符
        a = a.replaceAll("\\s", "");
@@ -82,11 +109,11 @@
                "    \"req_seq_id\": \"" + req_seq_id + "\",\n" +
                "    \"req_date\": \"" + req_date + "\",\n" +
                "    \"huifu_id\": \"6666000182995771\",\n" +
                "    \"trade_type\": \"A_NATIVE\",\n" +
                "    \"trans_amt\": \""+money+"\",\n" +
                "    \"goods_desc\": \"test\",\n" +
                "    \"trade_type\": \"T_MINIAPP\",\n" +
                "    \"trans_amt\": \"" + 0.01 + "\",\n" +
                "    \"goods_desc\": \"" + "goodsDesc" + "\",\n" +
                "    \"remark\": \"嘉易行\",\n" +
                "    \"notify_url\": \""+"http://221.182.45.100:8006/base/DGCallBackZfb"+"\",\n" +
                "    \"notify_url\": \""+notifyUrl+"\",\n" +
                "  }\n" +
                "}\n";
        System.out.println(p);
@@ -94,9 +121,53 @@

        HttpResponse execute = post.execute();
        System.out.println(execute.body());
        String body = execute.body();
        JSONObject jsonObject = JSONObject.parseObject(body);
        System.out.println(jsonObject);

//        HttpRequest post = HttpUtil.createPost("https://api.huifu.com/v4/trade/payment/create");
//        String req_seq_id = System.currentTimeMillis() + ToolUtil.getRandomNumber(10);
//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
//        String req_date = simpleDateFormat.format(new Date());
//        String money ="0.01";
//        money =  new BigDecimal(money).setScale(2, RoundingMode.HALF_UP).toString();
//        String a = "{\n" +
//                "    \"req_seq_id\": \"" + req_seq_id + "\",\n" +
//                "    \"req_date\": \"" + req_date + "\",\n" +
//                "    \"huifu_id\": \"6666000182995771\",\n" +
//                "    \"trade_type\": \"T_MINIAPP\",\n" +
//                "    \"trans_amt\": \""+money+"\",\n" +
//                "    \"goods_desc\": \"test\",\n" +
//                "    \"remark\": \"嘉易行\",\n" +
//                "    \"notify_url\": \""+"http://221.182.45.100:8006/base/DGCallBackZfb"+"\",\n" +
//                "  }";
//        // 去掉换行、空格等格式字符
//        a = a.replaceAll("\\s", "");
//
//
//        a = JSON.toJSONString(JSONObject.parseObject(a, TreeMap.class));
//        String sign = sign(a, "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCR6W3ynQJL7f2C8vFYMcQkcirpkif9ZhLq1374jIlV87nv0T9uIm6DoW8LyNEl9w2Yc5qoBv70tt/oVpemA6IZY6NXzE2USNi/sv2qUTtapcIRYxe4acCfY8K+x+p7W2e6wUWIpl9qgZA+UnFmHQ0HT6Ywzq2jJL92JdIs147Ud1aVi3aX8LYItj0z3ZKwZQkaJawZSWQk2+EdPfN059L2qFkPtnT7JIthAdUTJYZA13K4tzw6mXp/DbgwVmLhrlmwl/ccSv2Q0ABfEk7jIxF1nZmCmSy3HrEw9xWyrg1BC+DgXBdyF0OEtpNfv+UW080syUVBNN0irHVuDP81BaAjAgMBAAECggEAGlBZprZQErdxz6rWgYxADj6UpJjaI2XEJZwFZveZUOnqb2hyIv+MpKp5Z0upBErApey7SHAyjJlqWfE72hGvqxp/+7Z5izNz+2ZhPtT1ekyIajBPt89CkLwiA9vz2plKZLC0RIeUj5WcGNEvaDX3AomHtCehwtk+uiTp+XJKbOBtkkQszcdCGY1DVoQ0ppFoINnM9VLbEzaFaG7VS3eFkU4cf2CwcrnJB1RncyPFK+bGFvjkLM/eQbsh8YxkBqaGz/8UM1Na1SEidqdyUF71ltqnI0u8pLe0V+5jugVW+3lPL/p1C3i7mAbQOs4yqRWlFaGVTzOawoQUOPVwDpzeeQKBgQDs1P7F4wURqX1qZR0hSTqOigg48ychaOF66new3SuWk2CVBy8Q8b7odGSPyxJSGZvFLoznPYuSaXCtQ935WWfjB7Z5JpSWCi9BmJnkh41k/KvgMqAEGkZP6ul/zFnDWj94VwXEBz3TuRk574vK2coWoxjM6h1dlJjRBVVTs8dnrQKBgQCduKCjPDUuOHbcNn3VsaHEZX1XyiXN5gds08o61PjiHM42wYXxfUt59nBJmg2yAVRIrKYHfswJcxb5XUTDI5ZhCBnIPrdrQzj7FNadm/7mKDvSsvZdpfTiHY341XnvCq7OcNNj8g5fVsWF769strepQReSug7xgX7ojPvVcAZhDwKBgD57KwP2Er5IIuhQ6NCBS0uTqvurWqV70BDnjtBAaWF+XDq0/HvR63XUTzuIbbrvOqNY1p+jIxFrc+iiQQupxLimrkNkJEs5QKJjqiYahPkhmA68DG9Ip0gqR5QJy5y4UIplGwZOiscyzC72vcC0mJZETSSylzC7JV3vtEUy5ua5AoGAEwlDqjAMIyYBgpa5HV+xLKkrNbtaUL2gy8vMLsmhuHjNkuJMrlb3EyNhbiC/4moyqArehy0Qp1tSvIo7UGotLkzx/69CKBoW+IcNWDyJyXG1trqO7cKoCdqTViM98lIRwyzu9rMydONeN8o0HCT5id4nYDhAsXl1vc+2XY6F1pUCgYEA0dxGHBTKD/WzIvTYGYD6Xx224Y84mO6x2Mu16zFoq/NjuIdKi2O+92yrKDCMMCqaY77fXvWD3eI7QYYlbKAOqdLKVipTbhnBccDyNbtYHVg59t4xS+K6HyD+quVkL9n40UkxSZbKZBQhqt+vlQy0FUgONFii1ACZO0A8Sc/bvn4=");
//        System.out.println(a);
//        String p = "{\n" +
//                "  \"sys_id\": \"6666000182995771\",\n" +
//                "  \"product_id\": \"KAZX\",\n" +
//                "  \"sign\": \"" + sign + "\",\n" +
//                "  \"data\": {\n" +
//                "    \"req_seq_id\": \"" + req_seq_id + "\",\n" +
//                "    \"req_date\": \"" + req_date + "\",\n" +
//                "    \"huifu_id\": \"6666000182995771\",\n" +
//                "    \"trade_type\": \"T_MINIAPP\",\n" +
//                "    \"trans_amt\": \""+money+"\",\n" +
//                "    \"goods_desc\": \"test\",\n" +
//                "    \"remark\": \"嘉易行\",\n" +
//                "    \"notify_url\": \""+"http://221.182.45.100:8006/base/DGCallBackZfb"+"\",\n" +
//                "  }\n" +
//                "}\n";
//        System.out.println(p);
//        post.body(p);
//
//        HttpResponse execute = post.execute();
//        System.out.println(execute.body());
//        String body = execute.body();
//        JSONObject jsonObject = JSONObject.parseObject(body);
//        System.out.println(jsonObject);
    }