From 38c037c2dc84475b9d274fae16a9e16e0d910996 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Tue, 11 Jul 2023 18:38:59 +0800 Subject: [PATCH] fix bug --- .../com/iformall/controller/mem/AsyncTask.java | 16 +++++++++++++--- .../com/iformall/service/WxMerchantService.java | 2 ++ .../service/impl/TtMerchantPoiServiceImpl.java | 10 ++++++---- .../service/impl/WxMerchantServiceImpl.java | 5 +++++ 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index e05fc13bb..5f92da0ee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -437,18 +437,28 @@ public class AsyncTask { @Async public void importMerchantInit(File file, MallUserInfo user, String importKey,HttpServletRequest request, HttpServletResponse response) { // 需要验证 - String[] needFields = new String[]{"门店ID","富茂系统商户ID","富茂系统省份", "富茂系统城市", "富茂系统地址","富茂系统经度", "富茂系统纬度"}; + String[] needFields = new String[]{"门店名称", "门店ID", "城市", "详细地址"}; ExcelImportResult datalist = handleImportFile(null,file,MerchantPoiTNew.class,poiImportFields,needFields,new AsyncTask.PoiNewExcelHandler()); if (null == datalist) { return ; } - + //查询所有匹配了poi的 + TtMerchantPoi poiQ = new TtMerchantPoi(); + poiQ.updateTenantInfo(user); + Map poiMerchantMap = ttMerchantPoiService.queryPoiMerchantMap(poiQ); + List successList = datalist.getList(); if(successList.size() > 0) { try { successList.parallelStream().forEach(poiBase -> { try { - ttMerchantPoiService.importOnePoiNew(user, poiBase); + if (null != poiMerchantMap) { + TtMerchantPoi tp = poiMerchantMap.get(poiBase.getPoiId()); + if (null != tp && ) { + + } + } + wxMerchantService.initMerchantByPoi(poiBase.getPoiName(), poiBase.getPoiId()); } catch (UnknownSessionException ue) { logger.error("session :"+ue.getMessage(),ue); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java index a9b373160..5e31efb26 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java @@ -219,5 +219,7 @@ public interface WxMerchantService { List relationList(Long regionId); PageInfo subMerchantList(WxMerchant wxMerchant, Integer pageNum, Integer pageSize); + + void initMerchantByPoi(String poiName,String poiId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java index ee08f2b78..d01fb06dd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtMerchantPoiServiceImpl.java @@ -610,12 +610,14 @@ public class TtMerchantPoiServiceImpl implements TtMerchantPoiService { poiBase.setImportRemark("导入失败.门店ID为空"); return; } + + if (StringUtils.isBlank(poiBase.getMerchantId())) { + poiBase.setImportRemark("导入失败.富茂系统商户ID为空"); + return; + } try { - TtMerchantPoi merchantPoi = null; - if (StringUtils.isNotBlank(poiBase.getMerchantId())) { - merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong(poiBase.getMerchantId())); - } + TtMerchantPoi merchantPoi = ttMerchantPoiMapper.selectById(Long.parseLong(poiBase.getMerchantId())); Date now = new Date(); if(merchantPoi == null){ merchantPoi = new TtMerchantPoi(); 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 89a790891..1b522c2d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2132,4 +2132,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { PageInfo pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(wxMerchant)); return pageInfo; } + + @Override + public void initMerchantByPoi(String poiName, String poiId) { + + } }