| @@ -345,6 +345,7 @@ public class WxChartServiceImpl implements WxChartDataService { | |||||
| Map<String,Object> query = new HashedMap(); | Map<String,Object> query = new HashedMap(); | ||||
| query.put("tenantId",tenantId); | query.put("tenantId",tenantId); | ||||
| query.put("id",paramsMap.get("id")); | query.put("id",paramsMap.get("id")); | ||||
| query.put("buildingId",paramsMap.get("buildingId")); | |||||
| List<Map<String,Object>> mapList = wxMerchantMapper.findBusByFloorId(query); | List<Map<String,Object>> mapList = wxMerchantMapper.findBusByFloorId(query); | ||||
| for (Map<String,Object> map:mapList) { | for (Map<String,Object> map:mapList) { | ||||
| resultMap.put((String)map.get("btitle"),(Long)map.get("count")); | resultMap.put((String)map.get("btitle"),(Long)map.get("count")); | ||||
| @@ -313,7 +313,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| long time = System.currentTimeMillis() + RedisLock.TIMEOUT; | long time = System.currentTimeMillis() + RedisLock.TIMEOUT; | ||||
| String timeStr = String.valueOf(time); | String timeStr = String.valueOf(time); | ||||
| // 库存加锁 | // 库存加锁 | ||||
| if (!redisLock.lock(couponIdStr, timeStr)) { | |||||
| if (!redisLock.lock(couponIdStr, timeStr)) { | |||||
| logger.error("此券被锁定, couponId: " + couponIdStr); | logger.error("此券被锁定, couponId: " + couponIdStr); | ||||
| throw new MallinkException(ErrorCode.TOO_MANY_REQUEST); | throw new MallinkException(ErrorCode.TOO_MANY_REQUEST); | ||||
| } | } | ||||
| @@ -241,8 +241,15 @@ | |||||
| left join wx_merchant_shop ms on(m.id = ms.merchant_id) | 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_shop s on(ms.shop_id = s.id) | ||||
| left join wx_mall_floor f on(s.floor = f.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) | left join wx_business b on(m.business_id = b.id) | ||||
| where f.id = #{id} | |||||
| where 1=1 | |||||
| <if test=" null != id"> | |||||
| and f.id = #{id} | |||||
| </if> | |||||
| <if test=" null != buildingId"> | |||||
| and mb.id = #{buildingId} | |||||
| </if> | |||||
| and m.tenant_id = #{tenantId} | and m.tenant_id = #{tenantId} | ||||
| and s.is_del = 0 | and s.is_del = 0 | ||||
| and ms.is_del = 0 | and ms.is_del = 0 | ||||