xhxu 5 лет назад
Родитель
Сommit
548ca0b9f4
3 измененных файлов: 5 добавлений и 3 удалений
  1. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java

+ 1
- 1
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);



+ 1
- 0
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());


+ 3
- 2
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<WxShop> allList = wxShopMapper.findList(query);
Long total = wxShopMapper.getCountByWxShop(query);
// List<WxShop> allList = wxShopMapper.findList(query);

List<Map<String,Object>> 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<String,String> resultMap = new LinkedMap();
double rentTotal = 0;
for (String key : map.keySet()) {


Загрузка…
Отмена
Сохранить