From f448b13be73245d8ac5374384c79713040c661c0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 23 Jan 2022 11:27:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?/=E3=80=81test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/interceptor/TestControllerReturnAspect.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java b/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java index e08d206b3..958c19fa6 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java @@ -24,17 +24,17 @@ import lombok.extern.slf4j.Slf4j; * @author alascor * */ -//@Aspect -//@Configuration +@Aspect +@Configuration @Slf4j public class TestControllerReturnAspect { -// @Pointcut("execution(* com.iformall.controller.*Controller.*(..))") + @Pointcut("execution(* com.iformall.controller.*Controller.*(..))") public void excudeService() { } -// @Around("excudeService()") + @Around("excudeService()") public Object doAround(ProceedingJoinPoint pjp) throws Throwable { RequestAttributes ra = RequestContextHolder.getRequestAttributes(); ServletRequestAttributes sra = (ServletRequestAttributes) ra; From debb5b39004b5589ca28e3934e5f05c20c0ff723 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 23 Jan 2022 13:58:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?/=E3=80=81upd=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/interceptor/TestControllerReturnAspect.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java b/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java index 958c19fa6..e08d206b3 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java @@ -24,17 +24,17 @@ import lombok.extern.slf4j.Slf4j; * @author alascor * */ -@Aspect -@Configuration +//@Aspect +//@Configuration @Slf4j public class TestControllerReturnAspect { - @Pointcut("execution(* com.iformall.controller.*Controller.*(..))") +// @Pointcut("execution(* com.iformall.controller.*Controller.*(..))") public void excudeService() { } - @Around("excudeService()") +// @Around("excudeService()") public Object doAround(ProceedingJoinPoint pjp) throws Throwable { RequestAttributes ra = RequestContextHolder.getRequestAttributes(); ServletRequestAttributes sra = (ServletRequestAttributes) ra; From 1977c94fe2e8e602a23712bee0a28cfc8b4eb29c Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 24 Jan 2022 11:58:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?/=E3=80=82bug=5F=E7=A7=AF=E5=88=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=20=E5=8D=B7=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxShopServiceImpl.java | 9 +++++++-- .../src/main/resources/mapper/WxCreditHistoryMapper.xml | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index 0fb74376a..9f569757e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -274,9 +274,14 @@ public class WxShopServiceImpl implements WxShopService { @Override public Map> findMerchantShopVoList(TenantEntity tenantEntity, List merchantIds) { + Map> retMap = new HashMap>(); Map floorMap = wxMallFloorService.getFloorMap(tenantEntity); Map buildingMap = wxMallBuildingService.getBuildingMap(tenantEntity); List shopIds = wxMerchantShopMapper.findShopIds(merchantIds); + + if(shopIds == null || shopIds.isEmpty()){ + return retMap; + } List shopVoList = wxShopMapper.newFindShopVoList(tenantEntity.getTenantId(),shopIds); Map shopVoMap = new HashMap(); @@ -288,13 +293,13 @@ public class WxShopServiceImpl implements WxShopService { } } - Map> retMap = new HashMap>(); + WxMerchantShop merchantShopQ = new WxMerchantShop(); merchantShopQ.updateTenantInfo(tenantEntity); merchantShopQ.setMerchantIds(merchantIds); List merchantShops = wxMerchantShopMapper.findList(merchantShopQ); if (null == merchantShops) { - return null; + return retMap; } for (int i = 0 ; i < merchantShops.size(); i ++) { WxMerchantShop ms = merchantShops.get(i); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 3d5ed97fa..c67d72c7e 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -176,7 +176,7 @@ - and credit.merchantId in + and credit.merchant_id in #{merchantIdItem}