Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,12 @@ public JSONObject getUserPoints(final String userId, final int currentPageNum, f

final int type = record.optInt(Pointtransfer.TYPE);
final String dataId = record.optString(Pointtransfer.DATA_ID);
String desTemplate = langPropsService.get("pointType" + typeStr + "DesLabel");
String desTemplate;
if (Pointtransfer.TRANSFER_TYPE_C_APP_ADJUST == type) {
desTemplate = buildAppPointDescription(record, userId.equals(toId));
} else {
desTemplate = langPropsService.get("pointType" + typeStr + "DesLabel");
}

switch (type) {
case Pointtransfer.TRANSFER_TYPE_C_DATA_EXPORT:
Expand Down Expand Up @@ -446,7 +451,6 @@ public JSONObject getUserPoints(final String userId, final int currentPageNum, f
desTemplate = desTemplate.replace("{point}", String.valueOf(record.optInt(Pointtransfer.SUM)));
break;
case Pointtransfer.TRANSFER_TYPE_C_APP_ADJUST:
desTemplate = buildAppPointDescription(record, userId.equals(toId));
break;
case Pointtransfer.TRANSFER_TYPE_C_INVITE_REGISTER:
final JSONObject newUser = userRepository.get(dataId);
Expand Down
Loading