Browse Source

Merge branch 'release_real_202008' of https://git.malls.iformall.com/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
0a9a048d2d
4 changed files with 19 additions and 1 deletions
  1. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  2. +6
    -0
      mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  3. +6
    -0
      mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java

+ 6
- 0
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java View File

@@ -107,6 +107,12 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_c_user_basic_info".equals(tableName)) { if ("wx_c_user_basic_info".equals(tableName)) {
return true; return true;
} }
if ("wx_credit_history".equals(tableName)) {
return true;
}
if ("wx_score_history".equals(tableName)) {
return true;
}
return false; return false;
} }




+ 6
- 0
mallinkBApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java View File

@@ -95,6 +95,12 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_c_user_basic_info".equals(tableName)) { if ("wx_c_user_basic_info".equals(tableName)) {
return true; return true;
} }
if ("wx_credit_history".equals(tableName)) {
return true;
}
if ("wx_score_history".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver // wx_profit_sharing_receiver
// wx_profit_sharing_result // wx_profit_sharing_result
return false; return false;


+ 6
- 0
mallinkCApi/src/main/java/com/iformall/tenant/TenantInfoImpl.java View File

@@ -95,6 +95,12 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_c_user_basic_info".equals(tableName)) { if ("wx_c_user_basic_info".equals(tableName)) {
return true; return true;
} }
if ("wx_credit_history".equals(tableName)) {
return true;
}
if ("wx_score_history".equals(tableName)) {
return true;
}
// wx_profit_sharing_receiver // wx_profit_sharing_receiver
// wx_profit_sharing_result // wx_profit_sharing_result
return false; return false;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java View File

@@ -282,7 +282,7 @@ public class WxCUserServiceImpl implements WxCUserService {
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId());
if (wxCUserBasicInfo != null) { if (wxCUserBasicInfo != null) {
WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo();
basicInfo.setId(user.getId());
basicInfo.setId(wxCUserBasicInfo.getId());
basicInfo.setActiveTime(new Date()); basicInfo.setActiveTime(new Date());
basicInfo.setLoginCount(wxCUserBasicInfo.getLoginCount()+1); basicInfo.setLoginCount(wxCUserBasicInfo.getLoginCount()+1);
wxCUserBasicInfoService.update(basicInfo); wxCUserBasicInfoService.update(basicInfo);


Loading…
Cancel
Save