From 1be181a17e20a487dbd4603a148dbb1c80d94fb3 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 27 Dec 2020 13:02:52 +0800 Subject: [PATCH] game add les --- .../controller/WxCreditHistoryController.java | 11 +++++------ .../main/java/com/iformall/enums/EnumScoreType.java | 4 +++- .../service/impl/WxCreditHistoryServiceImpl.java | 6 ++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index 67a4c869f..470e9a9fe 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -72,15 +72,14 @@ public class WxCreditHistoryController extends BaseController{ wxCreditHistory.setOperatorId(wxCUser.getId()); wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); - String desc = ""; - if(wxCreditHistory.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())){ - desc = "游戏奖励积分"; - }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.REDUCE_CREDIT.getCode())){ - desc = "游戏消耗积分"; + if(wxCreditHistory.getCreditType().equals(EnumScoreType.GAME_ADD_CREDIT.getCode())){ + wxCreditHistory.setChangePurpose(EnumScoreType.GAME_ADD_CREDIT.getMessage()); + }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.GAME_LES_CREDIT.getCode())){ + wxCreditHistory.setChangePurpose(EnumScoreType.GAME_LES_CREDIT.getMessage()); }else{ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR,"未知操作"); } - wxCreditHistory.setChangePurpose(desc); + try { wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),getTenantInfo()) ; WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java index 8e80a70ee..8544c22d5 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumScoreType.java @@ -18,7 +18,9 @@ public enum EnumScoreType { CHANGE_CREDIT(11, "积分兑换"), REDUCE_CREDIT(12, "消费积分"), ACTIVITY_JOIN(13, "活动报名"), - CLEAN_CREDIT(14, "积分清零计划"),; + CLEAN_CREDIT(14, "积分清零计划"), + GAME_LES_CREDIT(15, "游戏消耗积分"), + GAME_ADD_CREDIT(16, "游戏奖励积分"),; public static EnumScoreType getEnum(Integer code) { for (EnumScoreType value : values()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 182a32198..3e5a17e6d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -411,6 +411,12 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { if (record.getCreditType() == EnumScoreType.ACTIVITY_JOIN.getCode()) { return reduceCredit(record); } + if (record.getCreditType() == EnumScoreType.GAME_LES_CREDIT.getCode()) { + return reduceCredit(record); + } + if (record.getCreditType() == EnumScoreType.GAME_ADD_CREDIT.getCode()) { + return record.getCreditNum(); + } return 0; }