From bd9cbb2979fcde51fa936fb406d2a5f5ba45a975 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 18:17:27 +0800 Subject: [PATCH] fix poi --- .../controller/basic/TtMerchantPoiController.java | 12 ++++-------- .../iformall/service/impl/WxMerchantServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java index 5183d6878..0f0efebda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -245,14 +245,14 @@ public class TtMerchantPoiController extends DouyinBaseController { logger.error("poi import error.",e); throw new MallinkException(ErrorCode.MEM_IMPORT_ERR.getCode(), "模板上传失败"); } finally { + if (isSetCacheLock) { + stringRedisTemplate.expire(importKey,3,TimeUnit.SECONDS); + stringRedisTemplate.opsForHash().putIfAbsent(importKey, "allCount", "1"); + } if (fos != null) { try { fos.close(); } catch (IOException e) { - if (isSetCacheLock) { - stringRedisTemplate.expire(importKey,3,TimeUnit.SECONDS); - stringRedisTemplate.opsForHash().putIfAbsent(importKey, "allCount", "1"); - } logger.error("poi import error.",e); throw new MallinkException(ErrorCode.MEM_IMPORT_ERR.getCode(), "模板上传失败"); } @@ -261,10 +261,6 @@ public class TtMerchantPoiController extends DouyinBaseController { try { fs.close(); } catch (IOException e) { - if (isSetCacheLock) { - stringRedisTemplate.expire(importKey,3,TimeUnit.SECONDS); - stringRedisTemplate.opsForHash().putIfAbsent(importKey, "allCount", "1"); - } logger.error("poi import error.",e); throw new MallinkException(ErrorCode.MEM_IMPORT_ERR.getCode(), "模板上传失败"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index ee22ba610..213383772 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2223,6 +2223,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { } if (null == merchant) { merchant = new WxMerchant(); + merchant.updateTenantInfo(shop); merchant.setIsAdmin(EnumMerchantAdmin.PUBLIC_COMMON.getCode()); merchant.setCarVendorType(0); merchant.setImgUrl("https://formall.oss-accelerate.aliyuncs.com/234/WechatIMG5071.png");