Просмотр исходного кода

/。bug_积分查询, 卷详情

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
1977c94fe2
2 измененных файлов: 8 добавлений и 3 удалений
  1. +7
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 7
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java Просмотреть файл

@@ -274,9 +274,14 @@ public class WxShopServiceImpl implements WxShopService {

@Override
public Map<Long,List<WxShopVo>> findMerchantShopVoList(TenantEntity tenantEntity, List<Long> merchantIds) {
Map<Long,List<WxShopVo>> retMap = new HashMap<Long,List<WxShopVo>>();
Map<Long,String> floorMap = wxMallFloorService.getFloorMap(tenantEntity);
Map<Long,String> buildingMap = wxMallBuildingService.getBuildingMap(tenantEntity);
List<Long> shopIds = wxMerchantShopMapper.findShopIds(merchantIds);

if(shopIds == null || shopIds.isEmpty()){
return retMap;
}
List<WxShopVo> shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds);
Map<Long,WxShopVo> shopVoMap = new HashMap<Long,WxShopVo>();
@@ -288,13 +293,13 @@ public class WxShopServiceImpl implements WxShopService {
}
}
Map<Long,List<WxShopVo>> retMap = new HashMap<Long,List<WxShopVo>>();
WxMerchantShop merchantShopQ = new WxMerchantShop();
merchantShopQ.updateTenantInfo(tenantEntity);
merchantShopQ.setMerchantIds(merchantIds);
List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShopQ);
if (null == merchantShops) {
return null;
return retMap;
}
for (int i = 0 ; i < merchantShops.size(); i ++) {
WxMerchantShop ms = merchantShops.get(i);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml Просмотреть файл

@@ -176,7 +176,7 @@
</if>
<if test=" null != merchantIds ">
and credit.merchantId in
and credit.merchant_id in
<foreach collection="merchantIds" index="index" item="merchantIdItem" open="(" separator="," close=")">
#{merchantIdItem}
</foreach>


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