diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql index 595dc5821..fd89442e4 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql @@ -20,7 +20,7 @@ ADD COLUMN `login_count` int(11) DEFAULT 0 COMMENT '登陆次数' AFTER `active update wx_c_user_basic_info wcubi set wcubi.login_count = (select wcu.login_count from wx_c_user wcu where wcu.id=wcubi.id); ALTER TABLE `wx_c_user_basic_info` -ADD COLUMN `avatar_url` int(11) DEFAULT 0 COMMENT '头像地址' AFTER `nick_name`; +ADD COLUMN `avatar_url` VARCHAR(225) DEFAULT 0 COMMENT '头像地址' AFTER `nick_name`; update wx_c_user_basic_info wcubi set wcubi.avatar_url = (select wcu.avatar_url from wx_c_user wcu where wcu.id=wcubi.id); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 982e2ed6f..51acbd2c7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -211,6 +211,7 @@ public class BaseController { basicInfo = new WxCUserBasicInfo(); basicInfo.setId(user.getId()); basicInfo.updateTenantInfo(tenantEntity); + basicInfo.undateFinalTenantId(tenantEntity); basicInfo.setPhone(phone); basicInfo.setNickName(user.getNickName()); basicInfo.setAvatarUrl(user.getAvatarUrl()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index e992903ef..a23afaf93 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -669,7 +669,8 @@ public class WxChartServiceImpl implements WxChartDataService { // get all WxShop query = new WxShop(); query.updateTenantInfo(tenantEntity); - List allList = wxShopMapper.findList(query); + Long total = wxShopMapper.getCountByWxShop(query); +// List allList = wxShopMapper.findList(query); List> mapList = wxShopMapper.rentRateHistory(queryMap); if(CollectionUtils.isNotEmpty(mapList)){ @@ -681,7 +682,7 @@ public class WxChartServiceImpl implements WxChartDataService { map.put((String)m.get( "xTime"),(Long)m.get("xCount")); } - double all = allList.size(); + double all = total; Map resultMap = new LinkedMap(); double rentTotal = 0; for (String key : map.keySet()) {