|
|
|
@ -324,19 +324,16 @@ public class CashCollectionController { |
|
|
|
public Result selectWalletRecords(@RequestBody Page page, @RequestHeader(defaultValue = "zh_CN") String lang) { |
|
|
|
try { |
|
|
|
if (ObjectUtils.isEmpty(page.getPageNum())) { |
|
|
|
String errorMsg = languageTranslationUtil.translate("页码数为空!", lang); |
|
|
|
return Result.error(errorMsg); |
|
|
|
return Result.error("页码数为空!"); |
|
|
|
} |
|
|
|
if (ObjectUtils.isEmpty(page.getPageSize())) { |
|
|
|
String errorMsg = languageTranslationUtil.translate("页大小为空!", lang); |
|
|
|
return Result.error(errorMsg); |
|
|
|
return Result.error("页大小为空!"); |
|
|
|
} |
|
|
|
|
|
|
|
UserWalletRecord queryCondition = page.getUserWalletRecord(); |
|
|
|
if (queryCondition == null || |
|
|
|
(queryCondition.getJwcode() == null && queryCondition.getWalletId() == null)) { |
|
|
|
String errorMsg = languageTranslationUtil.translate("精网号和钱包 ID 不能同时为空", lang); |
|
|
|
return Result.error(errorMsg); |
|
|
|
return Result.error("精网号和钱包 ID 不能同时为空"); |
|
|
|
} |
|
|
|
|
|
|
|
Result result = Result.success(cashCollectionService.selectWalletRecordsByJwcodeAndWalletId( |
|
|
|
@ -354,8 +351,7 @@ public class CashCollectionController { |
|
|
|
|
|
|
|
return result; |
|
|
|
} catch (Exception e) { |
|
|
|
String errorMsg = languageTranslationUtil.translate("查询失败", lang); |
|
|
|
return Result.error(errorMsg + ": " + e.getMessage()); |
|
|
|
return Result.error("查询失败" + ": " + e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -428,8 +424,7 @@ public class CashCollectionController { |
|
|
|
} |
|
|
|
return Result.success(result); |
|
|
|
} catch (Exception e) { |
|
|
|
String errorMsg = languageTranslationUtil.translate("查询失败", lang); |
|
|
|
return Result.error(errorMsg + ": " + e.getMessage()); |
|
|
|
return Result.error("查询失败" + ": " + e.getMessage()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|