From 4832b8937dd0f8622b3adaa4064efed059faebcc Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 16:41:07 +0800 Subject: [PATCH 01/12] fix bug --- .../com/iformall/controller/basic/TtMerchantPoiController.java | 3 +++ mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java | 1 + 2 files changed, 4 insertions(+) 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 994d547e6..5183d6878 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -174,6 +174,7 @@ public class TtMerchantPoiController extends DouyinBaseController { } } + //UrlCheck里加上该url @TenantIgnore @PostMapping(value = "/addLocationInfo", consumes = "multipart/*") public void addLocationInfo(@RequestParam("poiFile") MultipartFile mFile,HttpServletRequest request, HttpServletResponse response) { @@ -271,6 +272,7 @@ public class TtMerchantPoiController extends DouyinBaseController { } } + //UrlCheck里加上该url @TenantIgnore @PostMapping(value = "/importPoi", consumes = "multipart/*") @SystemControllerLog(description = "poi-导入数据") @@ -293,6 +295,7 @@ public class TtMerchantPoiController extends DouyinBaseController { } } + //UrlCheck里加上该url @TenantIgnore @PostMapping(value = "/importMerchantInitByPoi", consumes = "multipart/*") @SystemControllerLog(description = "poi-初始化商户商户") diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java index b865b2297..37aa7bdef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java +++ b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java @@ -26,6 +26,7 @@ public class UrlCheck { || url.contains("/video/upload") || url.contains("/merchantPoi/importPoi") || url.contains("/merchantPoi/addLocationInfo") + || url.contains("/merchantPoi/importMerchantInitByPoi") || url.contains("/couponPassword/importPrice"); } From 2de07a6f28040ce6d81141dc3abf7b92e83bb52c Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 16:59:03 +0800 Subject: [PATCH 02/12] fix poi bug --- .../com/iformall/controller/mem/AsyncTask.java | 18 +++++------------- 1 file changed, 5 insertions(+), 13 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 3d197fbbc..494c07f4a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -25,6 +25,7 @@ import com.iformall.domain.vo.WxCardPriceTemplate; import com.iformall.enums.EnumMerchantCreateFrom; import com.iformall.exception.MallinkException; import com.iformall.file.aliyun.AliyunOSS; +import com.iformall.service.ExcelService; import com.iformall.service.TtMerchantPoiService; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCouponPasswordService; @@ -79,6 +80,9 @@ public class AsyncTask { @Autowired private AliyunOSS aliyunOSS; + + @Autowired + ExcelService excelService; private class UserExcelHandler extends ExcelDataHandlerDefaultImpl { @Override @@ -400,19 +404,7 @@ public class AsyncTask { } private void exportExcel(HttpServletRequest request, HttpServletResponse response,List successList, Class dataClass, String fileName) throws Exception { - ExportParams exportParams = new ExportParams(); - exportParams.setType(ExcelType.XSSF); - Workbook workBook = ExcelExportUtil.exportExcel(exportParams, dataClass, successList); - response.setContentType("application/octet-stream;charset=UTF-8"); - //response.setHeader("Content-Type", "application/vnd.ms-excel");//xls - response.setHeader("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");//xlsx - response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("GB2312"), "8859_1")); - response.addHeader("Pargam", "no-cache"); - response.addHeader("Cache-Control", "no-cache"); - OutputStream out = response.getOutputStream(); - workBook.write(out); - out.flush(); - out.close(); + excelService.exportExcel(successList, null, "sheet1", dataClass, fileName, response, false); } private String uploadErrorExcel(List successList, Class dataClass, String fileName) throws Exception { From b9c81852f150fcb5994d183e5cb694b2d73651ad Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 17:45:32 +0800 Subject: [PATCH 03/12] fix poi --- .../com/iformall/controller/mem/AsyncTask.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 494c07f4a..deec742ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -404,7 +404,19 @@ public class AsyncTask { } private void exportExcel(HttpServletRequest request, HttpServletResponse response,List successList, Class dataClass, String fileName) throws Exception { - excelService.exportExcel(successList, null, "sheet1", dataClass, fileName, response, false); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workBook = ExcelExportUtil.exportExcel(exportParams, dataClass, successList); + response.setContentType("application/octet-stream;charset=UTF-8"); + //response.setHeader("Content-Type", "application/vnd.ms-excel");//xls + response.setHeader("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");//xlsx + response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("GB2312"), "8859_1")); + response.addHeader("Pargam", "no-cache"); + response.addHeader("Cache-Control", "no-cache"); + OutputStream out = response.getOutputStream(); + workBook.write(out); + out.flush(); + out.close(); } private String uploadErrorExcel(List successList, Class dataClass, String fileName) throws Exception { 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 04/12] 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"); From 2c78a799b4865a51362a1a50fd60250310f29d74 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 18:42:34 +0800 Subject: [PATCH 05/12] fix poi --- .../iformall/controller/mem/AsyncTask.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 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 deec742ab..afebc2926 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -404,19 +404,20 @@ public class AsyncTask { } private void exportExcel(HttpServletRequest request, HttpServletResponse response,List successList, Class dataClass, String fileName) throws Exception { - ExportParams exportParams = new ExportParams(); - exportParams.setType(ExcelType.XSSF); - Workbook workBook = ExcelExportUtil.exportExcel(exportParams, dataClass, successList); - response.setContentType("application/octet-stream;charset=UTF-8"); - //response.setHeader("Content-Type", "application/vnd.ms-excel");//xls - response.setHeader("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");//xlsx - response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("GB2312"), "8859_1")); - response.addHeader("Pargam", "no-cache"); - response.addHeader("Cache-Control", "no-cache"); - OutputStream out = response.getOutputStream(); - workBook.write(out); - out.flush(); - out.close(); +// ExportParams exportParams = new ExportParams(); +// exportParams.setType(ExcelType.XSSF); +// Workbook workBook = ExcelExportUtil.exportExcel(exportParams, dataClass, successList); +// response.setContentType("application/octet-stream;charset=UTF-8"); +// //response.setHeader("Content-Type", "application/vnd.ms-excel");//xls +// response.setHeader("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");//xlsx +// response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("GB2312"), "8859_1")); +// response.addHeader("Pargam", "no-cache"); +// response.addHeader("Cache-Control", "no-cache"); +// OutputStream out = response.getOutputStream(); +// workBook.write(out); +// out.flush(); +// out.close(); + excelService.exportExcel(successList, null, null, dataClass, fileName, response, false); } private String uploadErrorExcel(List successList, Class dataClass, String fileName) throws Exception { From e72de8e17e0564a2eec67e837ef95d3cde2262ac Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 19:02:44 +0800 Subject: [PATCH 06/12] fix bug --- .../com/iformall/controller/basic/TtMerchantPoiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0f0efebda..5ef040cdb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -304,7 +304,7 @@ public class TtMerchantPoiController extends DouyinBaseController { final MallUserInfo user = getUser(); String userId = "" + user.getId(); String importKey = Constant.importPoiMerchantPrev + userId; - File lFile = handlerImportFile(mFile,importKey,"poiMerchantInit"); + File lFile = handlerImportFile(mFile,null,"poiMerchantInit"); asyncTask.importMerchantInit(lFile, user, importKey,request,response); } } catch (Exception e) { From 2d0ae7a5efec7675bd64f4ef2817a9a459d0cb0d Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 19:42:01 +0800 Subject: [PATCH 07/12] fix bug --- .../src/main/java/com/iformall/controller/mem/AsyncTask.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 afebc2926..62ad0caeb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -549,11 +549,11 @@ public class AsyncTask { logger.error("session :"+ue.getMessage(),ue); } } - stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); + //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); + //stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); } } } 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 08/12] 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); +// } } } From a47efc2a25b9fe0dc21044497a9d63008ef98190 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 20:15:00 +0800 Subject: [PATCH 09/12] fix bug --- .../iformall/controller/mem/AsyncTask.java | 134 +++++++++--------- 1 file changed, 65 insertions(+), 69 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 25ce45d65..1954d18bc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -404,20 +404,21 @@ public class AsyncTask { } private void exportExcel(HttpServletRequest request, HttpServletResponse response,List successList, Class dataClass, String fileName) throws Exception { -// ExportParams exportParams = new ExportParams(); -// exportParams.setType(ExcelType.XSSF); -// Workbook workBook = ExcelExportUtil.exportExcel(exportParams, dataClass, successList); -// response.setContentType("application/octet-stream;charset=UTF-8"); -// //response.setHeader("Content-Type", "application/vnd.ms-excel");//xls -// response.setHeader("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");//xlsx -// response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("GB2312"), "8859_1")); -// response.addHeader("Pargam", "no-cache"); -// response.addHeader("Cache-Control", "no-cache"); -// OutputStream out = response.getOutputStream(); -// workBook.write(out); -// out.flush(); -// out.close(); - excelService.exportExcel(successList, null, null, dataClass, fileName, response, false); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + Workbook workBook = ExcelExportUtil.exportExcel(exportParams, dataClass, successList); + response.setContentType("application/octet-stream;charset=UTF-8"); + //response.setHeader("Content-Type", "application/vnd.ms-excel");//xls + response.setHeader("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");//xlsx + response.setHeader("Content-Disposition", "attachment;filename=" + new String(fileName.getBytes("GB2312"), "8859_1")); + response.addHeader("Pargam", "no-cache"); + response.addHeader("Cache-Control", "no-cache"); + OutputStream out = response.getOutputStream(); + System.out.println(">>>>>>>>> rrrrrrrrrrrrr:"+response.getStatus()); + workBook.write(out); + out.flush(); + out.close(); + //excelService.exportExcel(successList, null, null, dataClass, fileName, response, false); } private String uploadErrorExcel(List successList, Class dataClass, String fileName) throws Exception { @@ -505,61 +506,56 @@ public class AsyncTask { List successList = datalist.getList(); if(successList.size() > 0) { - 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); -// } + 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); + } } } From 04b4fb3ffdd63ed01700d513bc9061273f09c7a0 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 20:19:58 +0800 Subject: [PATCH 10/12] fix bug --- .../src/main/java/com/iformall/controller/mem/AsyncTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1954d18bc..5ca9a4a42 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -414,7 +414,7 @@ public class AsyncTask { response.addHeader("Pargam", "no-cache"); response.addHeader("Cache-Control", "no-cache"); OutputStream out = response.getOutputStream(); - System.out.println(">>>>>>>>> rrrrrrrrrrrrr:"+response.getStatus()); + logger.info(">>>>>>>>> rrrrrrrrrrrrr:"+response.getStatus()); workBook.write(out); out.flush(); out.close(); From 09c5eb6b65dcdef6f55be03b622fb8af022c3805 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 20:49:01 +0800 Subject: [PATCH 11/12] fix bug --- .../iformall/controller/basic/TtMerchantPoiController.java | 2 +- .../src/main/java/com/iformall/controller/mem/AsyncTask.java | 5 +++-- 2 files changed, 4 insertions(+), 3 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 5ef040cdb..0f0efebda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/TtMerchantPoiController.java @@ -304,7 +304,7 @@ public class TtMerchantPoiController extends DouyinBaseController { final MallUserInfo user = getUser(); String userId = "" + user.getId(); String importKey = Constant.importPoiMerchantPrev + userId; - File lFile = handlerImportFile(mFile,null,"poiMerchantInit"); + File lFile = handlerImportFile(mFile,importKey,"poiMerchantInit"); asyncTask.importMerchantInit(lFile, user, importKey,request,response); } } catch (Exception e) { 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 5ca9a4a42..76f061fc2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -414,7 +414,6 @@ public class AsyncTask { response.addHeader("Pargam", "no-cache"); response.addHeader("Cache-Control", "no-cache"); OutputStream out = response.getOutputStream(); - logger.info(">>>>>>>>> rrrrrrrrrrrrr:"+response.getStatus()); workBook.write(out); out.flush(); out.close(); @@ -551,7 +550,9 @@ public class AsyncTask { } } stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); - exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx"); + //exportExcel(request, response, successList,MerchantPoiTNew.class, "POI初始化商户.xlsx"); + String url = uploadErrorExcel(successList, MerchantPoiTNew.class, "POI初始化商户.xlsx"); + logger.info(">>>>>>> url :"+url); } catch (Exception e) { logger.error("导入模板失败:"+e.getMessage(),e); stringRedisTemplate.expire(importKey,10, TimeUnit.SECONDS); From 24a501d9255accb03dd6ee06374e55bea9e21a57 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Fri, 14 Jul 2023 21:51:26 +0800 Subject: [PATCH 12/12] fix bug --- .../service/impl/WxMerchantServiceImpl.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) 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 213383772..fcc609bb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2206,7 +2206,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { shop.setOperationArea("0"); shop.setBusinessId(0); shop.setRentUnit(2); - wxShopService.saveOrUpdate(shop); + Result result = wxShopService.saveOrUpdate(shop); + if (null == result) { + return null; + } + if (result.code != Result.SUCCESS) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),result.message); + } } return shop; } @@ -2241,7 +2247,13 @@ public class WxMerchantServiceImpl implements WxMerchantService { merchant.setType(1); merchant.setCreateFrom(EnumMerchantCreateFrom.DOUYIN_LAIKE.getCode()); merchant.setCreateFromId(poiId); - this.addMerchant(merchant, user.getId()); + Result result = this.addMerchant(merchant, user.getId()); + if (null == result) { + return null; + } + if (result.code != Result.SUCCESS) { + throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),result.message); + } } return merchant; }