From 7d2e3eca9d15913ea411ca4fff1c8df1b162a85b Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 8 Jul 2019 15:32:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=A7=AF=E5=88=86][=E4=BF=AE=E6=94=B9][bug100?= =?UTF-8?q?2019]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxChartServiceImpl.java | 1 + .../com/iformall/service/impl/WxOrderServiceImpl.java | 2 +- .../src/main/resources/mapper/WxMerchantMapper.xml | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) 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 cc656913a..3f661fabd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -345,6 +345,7 @@ public class WxChartServiceImpl implements WxChartDataService { Map query = new HashedMap(); query.put("tenantId",tenantId); query.put("id",paramsMap.get("id")); + query.put("buildingId",paramsMap.get("buildingId")); List> mapList = wxMerchantMapper.findBusByFloorId(query); for (Map map:mapList) { resultMap.put((String)map.get("btitle"),(Long)map.get("count")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 0c763ad50..5dcb28107 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -313,7 +313,7 @@ public class WxOrderServiceImpl implements WxOrderService { long time = System.currentTimeMillis() + RedisLock.TIMEOUT; String timeStr = String.valueOf(time); // 库存加锁 - if (!redisLock.lock(couponIdStr, timeStr)) { + if (!redisLock.lock(couponIdStr, timeStr)) { logger.error("此券被锁定, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.TOO_MANY_REQUEST); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 9a2481e0c..cad4ee297 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -241,8 +241,15 @@ left join wx_merchant_shop ms on(m.id = ms.merchant_id) left join wx_shop s on(ms.shop_id = s.id) left join wx_mall_floor f on(s.floor = f.id) + left join wx_mall_building mb on(f.building_id = mb.id) left join wx_business b on(m.business_id = b.id) - where f.id = #{id} + where 1=1 + + and f.id = #{id} + + + and mb.id = #{buildingId} + and m.tenant_id = #{tenantId} and s.is_del = 0 and ms.is_del = 0