From 5601b036ec5805d724612df4cd14c4f524de36a3 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 19:52:46 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/mem/AsyncTask.java | 105 +++++++++--------- 1 file changed, 55 insertions(+), 50 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 62ad0caeb..25ce45d65 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -505,56 +505,61 @@ public class AsyncTask { List successList = datalist.getList(); if(successList.size() > 0) { - try { - for (int i = 0 ; i < successList.size(); i ++) { - try { - MerchantPoiTNew poiBase = successList.get(i); - WxMerchant createM = createMerchantMap.get(poiBase.getPoiId()); - boolean create = true; - if (null != createM ) { - create = false; - if (createM.getId() > 0 ) { - poiBase.setMerchantId(String.valueOf(createM.getId())); - poiBase.setMerchantName(createM.getName()); - poiBase.setInitMerchantRemark("初始化商户成功.已存在该POI创建的商户,无需重复创建"); - }else { - poiBase.setMerchantName(createM.getName()); - poiBase.setInitMerchantRemark("初始化商户失败,已存在多个该POI创建的商户"); - } - }else { - TtMerchantPoi poi = poiMerchantMap.get(poiBase.getPoiId()); - if (null != poi) { - create = false; - if (poi.getId() > 0 ) { - poiBase.setMerchantId(String.valueOf(poi.getId())); - poiBase.setMerchantName(poi.getPoiName()); - poiBase.setInitMerchantRemark("初始化商户成功.已存在该POI匹配的商户,无需重复创建"); - }else { - poiBase.setMerchantName(poi.getPoiName()); - poiBase.setInitMerchantRemark("初始化商户失败,该POI匹配了多个商户"); - } - } - } - if (create) { - try { - WxMerchant merchant = wxMerchantService.initMerchantByPoi(user,poiBase.getPoiName(), poiBase.getPoiId(),poiBase.getPhone()); - poiBase.setMerchantId(String.valueOf(merchant.getId())); - poiBase.setMerchantName(merchant.getName()); - poiBase.setInitMerchantRemark("初始化商户成功."); - }catch(Exception e) { - poiBase.setInitMerchantRemark("初始化商户失败."+e.getMessage()); - } - } - } catch (UnknownSessionException ue) { - logger.error("session :"+ue.getMessage(),ue); - } - } - //stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); - exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx"); - } catch (Exception e) { - logger.error("导入模板失败:"+e.getMessage(),e); - //stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); - } + try { + exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx"); + } catch (Exception e) { + e.printStackTrace(); + } +// try { +// for (int i = 0 ; i < successList.size(); i ++) { +// try { +// MerchantPoiTNew poiBase = successList.get(i); +// WxMerchant createM = createMerchantMap.get(poiBase.getPoiId()); +// boolean create = true; +// if (null != createM ) { +// create = false; +// if (createM.getId() > 0 ) { +// poiBase.setMerchantId(String.valueOf(createM.getId())); +// poiBase.setMerchantName(createM.getName()); +// poiBase.setInitMerchantRemark("初始化商户成功.已存在该POI创建的商户,无需重复创建"); +// }else { +// poiBase.setMerchantName(createM.getName()); +// poiBase.setInitMerchantRemark("初始化商户失败,已存在多个该POI创建的商户"); +// } +// }else { +// TtMerchantPoi poi = poiMerchantMap.get(poiBase.getPoiId()); +// if (null != poi) { +// create = false; +// if (poi.getId() > 0 ) { +// poiBase.setMerchantId(String.valueOf(poi.getId())); +// poiBase.setMerchantName(poi.getPoiName()); +// poiBase.setInitMerchantRemark("初始化商户成功.已存在该POI匹配的商户,无需重复创建"); +// }else { +// poiBase.setMerchantName(poi.getPoiName()); +// poiBase.setInitMerchantRemark("初始化商户失败,该POI匹配了多个商户"); +// } +// } +// } +// if (create) { +// try { +// WxMerchant merchant = wxMerchantService.initMerchantByPoi(user,poiBase.getPoiName(), poiBase.getPoiId(),poiBase.getPhone()); +// poiBase.setMerchantId(String.valueOf(merchant.getId())); +// poiBase.setMerchantName(merchant.getName()); +// poiBase.setInitMerchantRemark("初始化商户成功."); +// }catch(Exception e) { +// poiBase.setInitMerchantRemark("初始化商户失败."+e.getMessage()); +// } +// } +// } catch (UnknownSessionException ue) { +// logger.error("session :"+ue.getMessage(),ue); +// } +// } +// stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); +// exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx"); +// } catch (Exception e) { +// logger.error("导入模板失败:"+e.getMessage(),e); +// stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); +// } } }