From e122099b780c8a08c345c5d3d6696a5510a2e64b Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 30 Sep 2024 16:25:36 +0800 Subject: [PATCH] fix --- .../iformall/domain/vo/WxCouponOrderCVo.java | 3 +- .../service/impl/WxMerchantServiceImpl.java | 29 +++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index 47cd7c200..9fd1f28bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -183,6 +183,7 @@ public class WxCouponOrderCVo extends WxCouponOrder { } public static void main(String[] args) { - System.out.println(calcuteExpiredCouponOrderId("632830267681071104",300,"632830267681071104")); + //System.out.println(calcuteExpiredCouponOrderId("632830267681071104",300,"632830267681071104")); + System.out.println(getDecodeExpiredCouponOrderId("MTAwMDIyNjcxMDkwMDczMTkwNCYyMDkyLTEwLTE4IDE3OjI5OjUwJjEwMDAyMjUwNDg5NTg1MDA4NjQ=")); } } 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 2e1d3b6c4..f3b34329a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1334,7 +1334,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public List getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel,String shopNumber ) { if (null != floorRule || null != building || null != floor) { - List floorMerchantIds = null; + List merchantIds = new ArrayList(); WxShop shopQ = new WxShop(); if (null != shopDel) { shopQ.setIsDel(shopDel); @@ -1354,23 +1354,34 @@ public class WxMerchantServiceImpl implements WxMerchantService { } shopQ.setShopNumber(shopNumber); List shopIds = wxShopMapper.findIdList(shopQ); + List shopNumberList = wxShopMapper.findShopNumberList(shopQ); if (null == shopIds || shopIds.size() <= 0) { - floorMerchantIds = new ArrayList(); - floorMerchantIds.add(-999L); - return floorMerchantIds; + merchantIds.add(-999L); + return merchantIds; } + WxMerchantShop merchantShopQ = new WxMerchantShop(); if (null != merchantShopDel) { merchantShopQ.setIsDel(merchantShopDel); } merchantShopQ.updateTenantInfo(tenantEntity); merchantShopQ.setShopIdList(shopIds); - floorMerchantIds = wxMerchantShopMapper.findMerchantIdList(merchantShopQ); - if (null == floorMerchantIds || floorMerchantIds.size() <= 0) { - floorMerchantIds = new ArrayList(); - floorMerchantIds.add(-999L); - return floorMerchantIds; + List floorMerchantIds = wxMerchantShopMapper.findMerchantIdList(merchantShopQ); + if (null != floorMerchantIds && floorMerchantIds.size() > 0) { + merchantIds.addAll(floorMerchantIds); + } + //还得查虚拟商户 + WxMerchant mq = new WxMerchant(); + mq.updateTenantInfo(tenantEntity); + mq.setCreateShopNumberList(shopNumberList); + if (null != shopDel) { + mq.setIsDel(shopDel); + } + List mids = wxMerchantMapper.findIdList(mq); + if (null != mids && mids.size() > 0 ) { + } + return floorMerchantIds; } return null;