diff --git a/pom.xml b/pom.xml index deab9edd..c485638c 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 4.1.2 2.6.2 3.2.2 - 4.15.14.ALL + 4.22.37.ALL 1.9.3 diff --git a/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java index 5a3f0f1b..3e29ac8d 100644 --- a/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/com/xhpc/auth/controller/TokenController.java @@ -54,7 +54,7 @@ public class TokenController public R login(@RequestBody LoginBody form) { // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(),0); + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(),0,form.getTenantId()); // 获取登录token return R.ok(tokenService.createToken(userInfo)); } @@ -73,7 +73,7 @@ public class TokenController return R.fail(HttpStatus.ERROR_STATUS, "验证码错误"); } // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), "123456",1); + LoginUser userInfo = sysLoginService.login(form.getUsername(), "123456",1,form.getTenantId()); // 获取登录token redisService.deleteObject("pcToken:"+form.getUsername()); return R.ok(tokenService.createToken(userInfo)); diff --git a/ruoyi-auth/src/main/java/com/xhpc/auth/form/LoginBody.java b/ruoyi-auth/src/main/java/com/xhpc/auth/form/LoginBody.java index 9e7e7b90..903da49c 100644 --- a/ruoyi-auth/src/main/java/com/xhpc/auth/form/LoginBody.java +++ b/ruoyi-auth/src/main/java/com/xhpc/auth/form/LoginBody.java @@ -17,6 +17,8 @@ public class LoginBody */ private String password; + private String tenantId; + public String getUsername() { return username; @@ -36,4 +38,12 @@ public class LoginBody { this.password = password; } + + public String getTenantId() { + return tenantId; + } + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } } diff --git a/ruoyi-auth/src/main/java/com/xhpc/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/xhpc/auth/service/SysLoginService.java index fa6d45dc..c071b50d 100644 --- a/ruoyi-auth/src/main/java/com/xhpc/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/com/xhpc/auth/service/SysLoginService.java @@ -31,7 +31,7 @@ public class SysLoginService /** * 登录 */ - public LoginUser login(String username, String password,Integer type) + public LoginUser login(String username, String password,Integer type,String tenantId) { // 用户名或密码为空 错误 if (StringUtils.isAnyBlank(username, password)) @@ -54,7 +54,7 @@ public class SysLoginService throw new BaseException("用户名不在指定范围"); } // 查询用户信息 - R userResult = remoteUserService.getUserInfo(username); + R userResult = remoteUserService.getUserInfo(username+"&"+tenantId); if (R.FAIL == userResult.getCode()) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysProfileController.java index fd8be9c8..3c2479ca 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysProfileController.java @@ -63,8 +63,9 @@ public class SysProfileController extends BaseController @GetMapping public AjaxResult profile() { + LoginUser loginUser = tokenService.getLoginUser(); String username = SecurityUtils.getUsername(); - SysUser user = userService.selectUserByUserName(username); + SysUser user = userService.selectUserByUserName(username,loginUser.getTenantId()); AjaxResult ajax = AjaxResult.success(user); ajax.put("roleGroup", userService.selectUserRoleGroup(username)); ajax.put("postGroup", userService.selectUserPostGroup(username)); @@ -109,8 +110,9 @@ public class SysProfileController extends BaseController @PutMapping("/updatePwd") public AjaxResult updatePwd(String oldPassword, String newPassword) { + LoginUser loginUser = tokenService.getLoginUser(); String username = SecurityUtils.getUsername(); - SysUser user = userService.selectUserByUserName(username); + SysUser user = userService.selectUserByUserName(username,loginUser.getTenantId()); String password = user.getPassword(); if (!SecurityUtils.matchesPassword(oldPassword, password)) { @@ -123,7 +125,6 @@ public class SysProfileController extends BaseController if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0) { // 更新缓存用户密码 - LoginUser loginUser = tokenService.getLoginUser(); loginUser.getSysUser().setPassword(SecurityUtils.encryptPassword(newPassword)); tokenService.setLoginUser(loginUser); return AjaxResult.success(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java index 6430a50e..8b04d8d3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/controller/SysUserController.java @@ -76,11 +76,11 @@ public class SysUserController extends BaseController { @Log(title = "用户管理", businessType = BusinessType.IMPORT) @PreAuthorize(hasPermi = "system:user:import") @PostMapping("/importData") - public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception { + public AjaxResult importData(MultipartFile file, boolean updateSupport,String tenantId) throws Exception { ExcelUtil util = new ExcelUtil(SysUser.class); List userList = util.importExcel(file.getInputStream()); String operName = SecurityUtils.getUsername(); - String message = userService.importUser(userList, updateSupport, operName); + String message = userService.importUser(userList, updateSupport, operName,tenantId); return AjaxResult.success(message); } @@ -95,7 +95,10 @@ public class SysUserController extends BaseController { */ @GetMapping("/info/{username}") public R info(@PathVariable("username") String username) { - SysUser sysUser = userService.selectUserByUserName(username); + + String[] split = username.split("&"); + + SysUser sysUser = userService.selectUserByUserName(split[0],split[1]); if (StringUtils.isNull(sysUser)) { return R.fail("用户名或密码错误"); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysUserMapper.java index f945e658..c6cc9c51 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysUserMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/mapper/SysUserMapper.java @@ -41,7 +41,7 @@ public interface SysUserMapper { * @param userName 用户名 * @return 用户对象信息 */ - public SysUser selectUserByUserName(String userName); + public SysUser selectUserByUserName(@Param("userName")String userName,@Param("tenantId")String tenantId); /** * 通过用户ID查询用户 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysUserService.java index c664f186..884e6784 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/ISysUserService.java @@ -40,7 +40,7 @@ public interface ISysUserService { * @param userName 用户名 * @return 用户对象信息 */ - public SysUser selectUserByUserName(String userName); + public SysUser selectUserByUserName(String userName,String tenantId); /** * 通过用户ID查询用户 @@ -187,5 +187,5 @@ public interface ISysUserService { * @param operName 操作用户 * @return 结果 */ - public String importUser(List userList, Boolean isUpdateSupport, String operName); + public String importUser(List userList, Boolean isUpdateSupport, String operName,String tenantId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java index b74f41f1..ced0ccbb 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/xhpc/system/service/impl/SysUserServiceImpl.java @@ -99,9 +99,9 @@ public class SysUserServiceImpl implements ISysUserService * @return 用户对象信息 */ @Override - public SysUser selectUserByUserName(String userName) + public SysUser selectUserByUserName(String userName,String tenantId) { - return userMapper.selectUserByUserName(userName); + return userMapper.selectUserByUserName(userName,tenantId); } /** @@ -416,7 +416,7 @@ public class SysUserServiceImpl implements ISysUserService * @return 结果 */ @Override - public String importUser(List userList, Boolean isUpdateSupport, String operName) + public String importUser(List userList, Boolean isUpdateSupport, String operName,String tenantId) { if (StringUtils.isNull(userList) || userList.size() == 0) { @@ -432,7 +432,7 @@ public class SysUserServiceImpl implements ISysUserService try { // 验证是否存在这个用户 - SysUser u = userMapper.selectUserByUserName(user.getUserName()); + SysUser u = userMapper.selectUserByUserName(user.getUserName(),tenantId); if (StringUtils.isNull(u)) { user.setPassword(SecurityUtils.encryptPassword(password)); diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 679b6328..9488a1a1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -158,7 +158,7 @@ select tcm.timing_charging_model_id as timingChargingModelId, @@ -83,7 +118,10 @@ update_by, - remark + remark, + + + phone @@ -118,12 +156,15 @@ #{updateBy}, - #{remark} + #{remark}, + + + #{phone} - + insert into xhpc_timing_charging_rate @@ -514,4 +555,72 @@ and tcm.tenant_id=#{tenantId} + + + + + insert into xhpc_rate_model + + + status, + + + del_flag, + + + create_time, + + + create_by, + + + update_time, + + + update_by, + + + remark + + + + + #{status}, + + + #{delFlag}, + + + #{createTime}, + + + #{createBy}, + + + #{updateTime}, + + + #{updateBy}, + + + #{remark} + + + + + + + + diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java index 3490bb62..6200bd5d 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcSettingConfig.java @@ -97,9 +97,4 @@ public class XhpcSettingConfig extends BaseEntity { */ private String tenantId; - /** - *租户id - */ - private String filePrefix; - } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingCacheRateModel.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingCacheRateModel.java index 2e57679d..846b0d16 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingCacheRateModel.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingCacheRateModel.java @@ -42,4 +42,8 @@ public class XhpcTimingChargingCacheRateModel extends BaseEntity { private Integer delFlag; private String tenantId; + + private Long chargingStationId; + + private String phone; } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingModel.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingModel.java index e7745e78..91753050 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingModel.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingModel.java @@ -54,4 +54,6 @@ public class XhpcTimingChargingModel extends BaseEntity { * 租户id */ private String tenantId; + + private String phone; } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTtimingChargingRate.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingRate.java similarity index 93% rename from xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTtimingChargingRate.java rename to xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingRate.java index 72df86fc..8efc2b1d 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTtimingChargingRate.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTimingChargingRate.java @@ -10,7 +10,7 @@ import java.math.BigDecimal; * @date 2022/2/22 15:02 */ @Data -public class XhpcTtimingChargingRate extends BaseEntity { +public class XhpcTimingChargingRate extends BaseEntity { /** 费率id */ private Long timingChargingRateId; diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcSettingConfigController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcSettingConfigController.java index 66472522..3e338175 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcSettingConfigController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcSettingConfigController.java @@ -3,6 +3,8 @@ package com.xhpc.payment.controller; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.domain.XhpcSettingConfig; +import com.xhpc.common.log.annotation.Log; +import com.xhpc.common.log.enums.BusinessType; import com.xhpc.common.util.UserTypeUtil; import com.xhpc.payment.service.IXhpcSettingConfigService; import io.swagger.annotations.Api; @@ -34,11 +36,11 @@ public class XhpcSettingConfigController { */ @GetMapping("/info") @ApiOperation(value = "充值订单详情") - public R info(HttpServletRequest request, @RequestParam Integer status) { + public R info(@RequestParam Integer status) { if(status ==null){ return R.fail("类型为空"); } - return R.ok(xhpcSettingConfigService.getXhpcSettingConfigStatus(request,status)); + return R.ok(xhpcSettingConfigService.getXhpcSettingConfigStatus(status)); } /** @@ -47,8 +49,8 @@ public class XhpcSettingConfigController { * @return */ @PostMapping("/updateXhpcSettingConfig") - @ApiOperation(value = "支付配置修改") - public R updateXhpcSettingConfig(HttpServletRequest request,XhpcSettingConfig xhpcSettingConfig) { + @Log(title = "支付配置修改", businessType = BusinessType.UPDATE) + public R updateXhpcSettingConfig(@RequestBody XhpcSettingConfig xhpcSettingConfig) { if(xhpcSettingConfig.getStatus() ==null){ return R.fail("类型为空"); @@ -76,33 +78,33 @@ public class XhpcSettingConfigController { if(xhpcSettingConfig.getWxTransfersUrl()==null || "".equals(xhpcSettingConfig.getWxTransfersUrl())){ return R.fail("微信用户个人付款地址为空"); } - if(xhpcSettingConfig.getWxApiclientCertPem()==null || "".equals(xhpcSettingConfig.getWxApiclientCertPem())){ - return R.fail("微信证书p12为空"); - } - if(xhpcSettingConfig.getWxApiclientKeyPem()==null || "".equals(xhpcSettingConfig.getWxApiclientKeyPem())){ - return R.fail("微信证书key.pem为空"); - }else{ - String[] split = xhpcSettingConfig.getWxApiclientKeyPem().split("."); - if(split.length>1){ - if(!"pem".equals(split[1])){ - return R.fail("请上传key.pem类型证书"); - } - }else{ - return R.fail("请上传key.pem类型证书"); - } - } - if(xhpcSettingConfig.getWxAppCertPublicKey()==null || "".equals(xhpcSettingConfig.getWxAppCertPublicKey())){ - return R.fail("微信证书cret.pem为空"); - }else{ - String[] split = xhpcSettingConfig.getWxApiclientKeyPem().split("\\."); - if(split.length>1){ - if(!"pem".equals(split[1])){ - return R.fail("请上传cret.pem类型证书"); - } - }else{ - return R.fail("请上传cret.pem类型证书"); - } - } +// if(xhpcSettingConfig.getWxApiclientCertPem()==null || "".equals(xhpcSettingConfig.getWxApiclientCertPem())){ +// return R.fail("微信证书p12为空"); +// } +// if(xhpcSettingConfig.getWxApiclientKeyPem()==null || "".equals(xhpcSettingConfig.getWxApiclientKeyPem())){ +// return R.fail("微信证书key.pem为空"); +// }else{ +// String[] split = xhpcSettingConfig.getWxApiclientKeyPem().split("."); +// if(split.length>1){ +// if(!"pem".equals(split[1])){ +// return R.fail("请上传key.pem类型证书"); +// } +// }else{ +// return R.fail("请上传key.pem类型证书"); +// } +// } +// if(xhpcSettingConfig.getWxAppCertPublicKey()==null || "".equals(xhpcSettingConfig.getWxAppCertPublicKey())){ +// return R.fail("微信证书cret.pem为空"); +// }else{ +// String[] split = xhpcSettingConfig.getWxApiclientKeyPem().split("\\."); +// if(split.length>1){ +// if(!"pem".equals(split[1])){ +// return R.fail("请上传cret.pem类型证书"); +// } +// }else{ +// return R.fail("请上传cret.pem类型证书"); +// } +// } }else{ if(xhpcSettingConfig.getZfbAppId()==null || "".equals(xhpcSettingConfig.getZfbAppId())){ return R.fail("支付宝小程序AppId为空"); @@ -113,45 +115,45 @@ public class XhpcSettingConfigController { if(xhpcSettingConfig.getZfbCallbackUrl()==null || "".equals(xhpcSettingConfig.getZfbCallbackUrl())){ return R.fail("支付宝回调地址为空"); } - if(xhpcSettingConfig.getZfbAppCertPublicKey()==null || "".equals(xhpcSettingConfig.getZfbAppCertPublicKey())){ - return R.fail("支付宝应用公钥证书路径为空"); - }else{ - String[] split = xhpcSettingConfig.getZfbAppCertPublicKey().split("\\."); - if(split.length>1){ - if(!"crt".equals(split[1])){ - return R.fail("请上传支付宝公钥.crt类型证书"); - } - }else{ - return R.fail("请上传支付宝应用公钥.crt类型证书"); - } - } - if(xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa()==null || "".equals(xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa())){ - return R.fail("支付宝公钥证书路径为空"); - }else{ - String[] split = xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa().split("\\."); - if(split.length>1){ - if(!"crt".equals(split[1])){ - return R.fail("请上传支付宝公钥.crt类型证书"); - } - }else{ - return R.fail("请上传支付宝公钥.crt类型证书"); - } - } - if(xhpcSettingConfig.getZfbAlipayRootCert()==null || "".equals(xhpcSettingConfig.getZfbAlipayRootCert())){ - return R.fail("支付宝根证书路径为空"); - }else{ - String[] split = xhpcSettingConfig.getZfbAlipayRootCert().split("\\."); - if(split.length>1){ - if(!"crt".equals(split[1])){ - return R.fail("请上传支付宝根.crt类型证书"); - } - }else{ - return R.fail("请上传支付宝根.crt类型证书"); - } - } +// if(xhpcSettingConfig.getZfbAppCertPublicKey()==null || "".equals(xhpcSettingConfig.getZfbAppCertPublicKey())){ +// return R.fail("支付宝应用公钥证书路径为空"); +// }else{ +// String[] split = xhpcSettingConfig.getZfbAppCertPublicKey().split("\\."); +// if(split.length>1){ +// if(!"crt".equals(split[1])){ +// return R.fail("请上传支付宝公钥.crt类型证书"); +// } +// }else{ +// return R.fail("请上传支付宝应用公钥.crt类型证书"); +// } +// } +// if(xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa()==null || "".equals(xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa())){ +// return R.fail("支付宝公钥证书路径为空"); +// }else{ +// String[] split = xhpcSettingConfig.getZfbAlipayCertPublicKeyRsa().split("\\."); +// if(split.length>1){ +// if(!"crt".equals(split[1])){ +// return R.fail("请上传支付宝公钥.crt类型证书"); +// } +// }else{ +// return R.fail("请上传支付宝公钥.crt类型证书"); +// } +// } +// if(xhpcSettingConfig.getZfbAlipayRootCert()==null || "".equals(xhpcSettingConfig.getZfbAlipayRootCert())){ +// return R.fail("支付宝根证书路径为空"); +// }else{ +// String[] split = xhpcSettingConfig.getZfbAlipayRootCert().split("\\."); +// if(split.length>1){ +// if(!"crt".equals(split[1])){ +// return R.fail("请上传支付宝根.crt类型证书"); +// } +// }else{ +// return R.fail("请上传支付宝根.crt类型证书"); +// } +// } } //查询 - Map xhpcSettingConfigStatus = xhpcSettingConfigService.getXhpcSettingConfigStatus(request, xhpcSettingConfig.getStatus()); + Map xhpcSettingConfigStatus = xhpcSettingConfigService.getXhpcSettingConfigStatus(xhpcSettingConfig.getStatus()); if(xhpcSettingConfigStatus !=null){ xhpcSettingConfig.setSettingConfigId(Long.valueOf(xhpcSettingConfigStatus.get("settingConfigId").toString())); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcSettingConfigService.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcSettingConfigService.java index 034ad298..fcb17985 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcSettingConfigService.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcSettingConfigService.java @@ -16,6 +16,6 @@ public interface IXhpcSettingConfigService { R updateXhpcSettingConfig(XhpcSettingConfig xhpcSettingConfig); - Map getXhpcSettingConfigStatus(HttpServletRequest request,Integer status); + Map getXhpcSettingConfigStatus(Integer status); } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcSettingConfigImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcSettingConfigImpl.java index a3f40340..06851358 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcSettingConfigImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcSettingConfigImpl.java @@ -52,9 +52,9 @@ public class XhpcSettingConfigImpl implements IXhpcSettingConfigService { } @Override - public Map getXhpcSettingConfigStatus(HttpServletRequest request, Integer status) { + public Map getXhpcSettingConfigStatus(Integer status) { - LoginUser logUser = tokenService.getLoginUser(request); + LoginUser logUser = tokenService.getLoginUser(); if(logUser==null){ return new HashMap<>(); } diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml index 2049bc0b..dd58b32c 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcCommonPaymentMapper.xml @@ -32,7 +32,6 @@ -