From e51e1f748dd934a1aee9eab79cdc6cea64d146f4 Mon Sep 17 00:00:00 2001 From: yuyang Date: Mon, 14 Feb 2022 17:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/order/api/XhpcChargeOrderController.java | 4 ++-- .../order/service/impl/XhpcChargeOrderServiceImpl.java | 3 ++- .../com/xhpc/user/controller/XhpcAppUserController.java | 8 ++++---- .../xhpc/user/service/impl/XhpcAppUserServiceImpl.java | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java index 90a0842e..01639c35 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcChargeOrderController.java @@ -76,8 +76,8 @@ public class XhpcChargeOrderController extends BaseController { */ @GetMapping("/startUp") public AjaxResult startUp(HttpServletRequest request, @RequestParam Long userId, @RequestParam String serialNumber, @RequestParam Integer type){ - logger.info("<<<<<<<<<<<<<<<<<<<<<<<<启动充电>>>>>>>>>>>>>>>>>"); - logger.info("<<<<<<<<<<<<<<<<<<<<<<<<启动充电>>>>>>>>>>>>>>>>>"); + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<启动充电>>>>>>>>>>>>>>>>>"+serialNumber); + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<启动充电>>>>>>>>>>>>>>>>>"+serialNumber); return iXhpcChargeOrderService.startUp(request,userId, serialNumber, type); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index c5949c45..ab0f4340 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -199,12 +199,13 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar } } } - + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<无效的终端编号>>>>"+terminalSerialNumber+">>>>>>>>>>>>>"+tenantId); //终端信息 XhpcTerminal xhpcTerminal = xhpcChargeOrderMapper.getXhpcTerminalSerialNumber(terminalSerialNumber,tenantId); if (xhpcTerminal == null || xhpcTerminal.getTerminalId() == null || xhpcTerminal.getChargingPileId() == null || xhpcTerminal.getPileSerialNumber() == null) { return AjaxResult.error(1104, "无效的终端编号"); } + logger.info("<<<<<<<<<<<<<<<<<<<<<<<<无效的终端编号>>>>666666>>>>>>>>>>>>>"); //余额 String balance = new BigDecimal(userMessage.get("balance").toString()).multiply(new BigDecimal(100)).toString(); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java index a1095c55..05a78771 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/controller/XhpcAppUserController.java @@ -245,8 +245,8 @@ public class XhpcAppUserController extends BaseController { * 支付宝授权 */ @ApiOperation("支付宝授权") - @PostMapping("/alipayEmpowerYu") - public AjaxResult alipayEmpowerYu(@RequestParam String code,String tenantId) throws Exception { + @PostMapping("/alipayEmpower") + public AjaxResult alipayEmpower(@RequestParam String code,String tenantId) throws Exception { if("".equals(tenantId) || null==tenantId){ tenantId="000000"; } @@ -296,8 +296,8 @@ public class XhpcAppUserController extends BaseController { * 支付宝授权 */ @ApiOperation("支付宝授权") - @PostMapping("/alipayEmpower") - public AjaxResult alipayEmpower(@RequestParam String code) throws Exception { + @PostMapping("/alipayEmpowerYu") + public AjaxResult alipayEmpowerYu(@RequestParam String code) throws Exception { /** 初始化 **/ CertAlipayRequest certAlipayRequest = new CertAlipayRequest(); diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java index 6ef1341e..f0889ffe 100644 --- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java +++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java @@ -190,6 +190,7 @@ public class XhpcAppUserServiceImpl extends BaseService implements IXhpcAppUserU String type = StringUtils.valueOf(map.get("type")); String tenantId = StringUtils.valueOf(map.get("tenantId")); logger.info("<<<<<<<<<>>>>>>>>>>>"+code); + logger.info("<<<<<<<<<>>>>>>>>>>>"+tenantId); if("18123374652".equals(phone) && "123456".equals(code)){ if("1".equals(type)){ return appLogin(phone, "1", "ot6ul4nlSC5ZZOC4rTLS5hedFTGk", tenantId);