From ba6b508a44cb1f0730c6a27a5d73b8d2ae8f1d4b Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 19 八月 2025 18:43:47 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java index 406ea88..42807a3 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java @@ -750,20 +750,20 @@ List<SettlementRecord> settlementRecords = settlementRecordService.selectList(settlementRecordWrapper.isNotNull("arrivalTime").orderBy("insertTime desc")); model.addAttribute("settlementRecords", settlementRecords); - QueryBalance queryBalance = new QueryBalance(); - queryBalance.setUserId(tAgent.getMerchantNumber()); +// QueryBalance queryBalance = new QueryBalance(); +// queryBalance.setUserId(tAgent.getMerchantNumber()); TrhRequest<QueryBalance> request = new TrhRequest(); - InterfaceResponse execute = request.execute(queryBalance, QueryBalance.SERVICE_CODE); +// InterfaceResponse execute = request.execute(queryBalance, QueryBalance.SERVICE_CODE); model.addAttribute("balance", 0); model.addAttribute("marketingAmount", 0); - if("0000".equals(execute.getCode())){ - JSONObject jsonObject = JSON.parseObject(execute.getResult()); - model.addAttribute("balance", jsonObject.getDoubleValue("settledAmount") / 100); - if(roleType == 1){ - Double amount = rechargeRecordService.querSumSurplusDividedAmount(4); - model.addAttribute("marketingAmount", amount); - } - } +// if("0000".equals(execute.getCode())){ +// JSONObject jsonObject = JSON.parseObject(execute.getResult()); +// model.addAttribute("balance", jsonObject.getDoubleValue("settledAmount") / 100); +// if(roleType == 1){ +// Double amount = rechargeRecordService.querSumSurplusDividedAmount(4); +// model.addAttribute("marketingAmount", amount); +// } +// } return PREFIX + "enterprisePage.html"; } -- Gitblit v1.7.1