fd345592daef5f203af84eeb4fa33fd989a2ba66..611332c6e1b51b00b9b259c14499ff8725bb98ca
2025-05-07 xuhy
Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiS...
611332 对比 | 目录
2025-05-07 xuhy
大屏修改
a09726 对比 | 目录
2025-05-06 无关风月
线上微信证书
0499b7 对比 | 目录
2个文件已修改
4 ■■■■ 已修改文件
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleTypeDataController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/large/AnalysisRecycleTypeDataController.java
@@ -49,7 +49,7 @@
    @PostMapping(value = "/pageList")
    public R<Page<AnalysisRecycleTypeData>> pageList(@RequestBody BasePage basePage) {
        Page<AnalysisRecycleTypeData> page = analysisRecycleTypeDataService.lambdaQuery()
                .orderByDesc(AnalysisRecycleTypeData::getCreateTime)
                .orderByDesc(AnalysisRecycleTypeData::getOrderCount)
                .page(Page.of(basePage.getPageNum(), basePage.getPageSize()));
        return R.ok(page);
    }
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/WithdrawServiceImpl.java
@@ -394,7 +394,7 @@
                    JSONObject.toJSONString(postMap),
                    "7EEA04429B006E12AAA421C002EC48BBEED5BE94",
                    "1665330417",
                    "D://apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
                    "/usr/local/vx/apiclient_key.pem", "/v3/fund-app/mch-transfer/transfer-bills");
            JSONObject jsonObject = JSONObject.parseObject(result);
//            WithdrawDetail withdrawDetail = new WithdrawDetail();
//            withdrawDetail.setWithdrawId(withdrawId);