|
@@ -39,14 +39,17 @@ public class SporadicChargeInfoController extends BaseController {
|
|
|
|
|
|
@ApiOperation(value = "单查询")
|
|
@ApiOperation(value = "单查询")
|
|
@GetMapping("/get")
|
|
@GetMapping("/get")
|
|
- public Object get(Integer id) {
|
|
|
|
-// SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
|
-// if (sysUser == null) {
|
|
|
|
-// return failed("用户不存在");
|
|
|
|
-// }
|
|
|
|
|
|
+ public Object get(Integer id,Integer userId) {
|
|
|
|
+ if(userId == null){
|
|
|
|
+ SysUser sysUser = sysUserFeignService.queryUserInfo();
|
|
|
|
+ if (sysUser == null || sysUser.getId() == null) {
|
|
|
|
+ return failed("用户不存在");
|
|
|
|
+ }
|
|
|
|
+ userId = sysUser.getId();
|
|
|
|
+ }
|
|
SporadicChargeInfo chargeInfo = sporadicChargeInfoService.get(id);
|
|
SporadicChargeInfo chargeInfo = sporadicChargeInfoService.get(id);
|
|
if(chargeInfo != null){
|
|
if(chargeInfo != null){
|
|
- SysUserCashAccount locked = sysUserCashAccountDao.getLocked(chargeInfo.getUserId());
|
|
|
|
|
|
+ SysUserCashAccount locked = sysUserCashAccountDao.getLocked(userId);
|
|
chargeInfo.setBalance(locked.getBalance());
|
|
chargeInfo.setBalance(locked.getBalance());
|
|
}else {
|
|
}else {
|
|
throw new BizException("信息不存在");
|
|
throw new BizException("信息不存在");
|