diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicSign.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicSign.java index a4f5f553d..9c3dc55a6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicSign.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicSign.java @@ -52,6 +52,8 @@ public class WxCUserBasicSign extends TenantEntity { private String mark; + + @TableField(exist = false) private Date startDate; @@ -64,4 +66,7 @@ public class WxCUserBasicSign extends TenantEntity { @TableField(exist = false) private Integer limit; + @TableField(exist = false) + private Integer credit; + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java index c3844e22c..036c10ec1 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicSignService.java @@ -25,7 +25,7 @@ public interface WxCUserBasicSignService { Map getLastSignIn(WxCUserBasicSign record); - void signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType); + int signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType); ResultData getListStatus(WxCUserBasicSign wxCUserBasicSign); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java index 3df3ecb5e..7abec0950 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicSignServiceImpl.java @@ -113,8 +113,9 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { } wxCUserBasicSignMapper.insert(record); } - signInCreditHistory(record,EnumScoreType.SIGN_IN_DAY); - continueSignInAddCredit(record); + int inCredit = signInCreditHistory(record, EnumScoreType.SIGN_IN_DAY); + int continueIn = continueSignInAddCredit(record); + record.setCredit(inCredit + continueIn); return record; }else{ //补签 @@ -213,7 +214,7 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { } @Override - public void signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType){ + public int signInCreditHistory(WxCUserBasicSign record, EnumScoreType enumScoreType){ WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setCUserId(record.getUserId()); wxCreditHistory.setTenantId(record.getFinalTenantId()); @@ -222,7 +223,11 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { wxCreditHistory.setChangePurpose(enumScoreType.getMessage()); wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode()); wxCreditHistory.setOperatorId(record.getUserId()); - wxCreditHistoryService.saveOrUpdate(wxCreditHistory,null); + WxCreditHistory wxCreditHistory1 = wxCreditHistoryService.saveOrUpdate(wxCreditHistory, null); + if(wxCreditHistory1.getCreditNum() == null){ + return 0; + } + return wxCreditHistory1.getCreditNum(); } @Override @@ -241,15 +246,16 @@ public class WxCUserBasicSignServiceImpl implements WxCUserBasicSignService { return new ResultData(list); } - private void continueSignInAddCredit(WxCUserBasicSign record){ + private int continueSignInAddCredit(WxCUserBasicSign record){ int i = record.getContinueSign() % 28; if(record.getContinueSign() > 0 && i == 0){ - signInCreditHistory(record,EnumScoreType.SIGN_IN_TEDAY); + return signInCreditHistory(record, EnumScoreType.SIGN_IN_TEDAY); }else if(i == 7){ - signInCreditHistory(record,EnumScoreType.SIGN_IN_SEVENDAY); + return signInCreditHistory(record,EnumScoreType.SIGN_IN_SEVENDAY); }else if(i == 14){ - signInCreditHistory(record,EnumScoreType.SIGN_IN_FTDAY); + return signInCreditHistory(record,EnumScoreType.SIGN_IN_FTDAY); } + return 0; } }