| @@ -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); | 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` | 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); | 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); | ||||
| @@ -211,6 +211,7 @@ public class BaseController { | |||||
| basicInfo = new WxCUserBasicInfo(); | basicInfo = new WxCUserBasicInfo(); | ||||
| basicInfo.setId(user.getId()); | basicInfo.setId(user.getId()); | ||||
| basicInfo.updateTenantInfo(tenantEntity); | basicInfo.updateTenantInfo(tenantEntity); | ||||
| basicInfo.undateFinalTenantId(tenantEntity); | |||||
| basicInfo.setPhone(phone); | basicInfo.setPhone(phone); | ||||
| basicInfo.setNickName(user.getNickName()); | basicInfo.setNickName(user.getNickName()); | ||||
| basicInfo.setAvatarUrl(user.getAvatarUrl()); | basicInfo.setAvatarUrl(user.getAvatarUrl()); | ||||
| @@ -669,7 +669,8 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| // get all | // get all | ||||
| WxShop query = new WxShop(); | WxShop query = new WxShop(); | ||||
| query.updateTenantInfo(tenantEntity); | query.updateTenantInfo(tenantEntity); | ||||
| List<WxShop> allList = wxShopMapper.findList(query); | |||||
| Long total = wxShopMapper.getCountByWxShop(query); | |||||
| // List<WxShop> allList = wxShopMapper.findList(query); | |||||
| List<Map<String,Object>> mapList = wxShopMapper.rentRateHistory(queryMap); | List<Map<String,Object>> mapList = wxShopMapper.rentRateHistory(queryMap); | ||||
| if(CollectionUtils.isNotEmpty(mapList)){ | if(CollectionUtils.isNotEmpty(mapList)){ | ||||
| @@ -681,7 +682,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| map.put((String)m.get( "xTime"),(Long)m.get("xCount")); | map.put((String)m.get( "xTime"),(Long)m.get("xCount")); | ||||
| } | } | ||||
| double all = allList.size(); | |||||
| double all = total; | |||||
| Map<String,String> resultMap = new LinkedMap(); | Map<String,String> resultMap = new LinkedMap(); | ||||
| double rentTotal = 0; | double rentTotal = 0; | ||||
| for (String key : map.keySet()) { | for (String key : map.keySet()) { | ||||