|
|
@@ -1334,7 +1334,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
@Override |
|
|
@Override |
|
|
public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel,String shopNumber ) { |
|
|
public List<Long> getFloorBuildMerchantIds(TenantEntity tenantEntity,String floorRule,Long building,Long floor,String shopTypeForRule,Integer merchantShopDel,Integer shopDel,String shopNumber ) { |
|
|
if (null != floorRule || null != building || null != floor) { |
|
|
if (null != floorRule || null != building || null != floor) { |
|
|
List<Long> floorMerchantIds = null; |
|
|
|
|
|
|
|
|
List<Long> merchantIds = new ArrayList<Long>(); |
|
|
WxShop shopQ = new WxShop(); |
|
|
WxShop shopQ = new WxShop(); |
|
|
if (null != shopDel) { |
|
|
if (null != shopDel) { |
|
|
shopQ.setIsDel(shopDel); |
|
|
shopQ.setIsDel(shopDel); |
|
|
@@ -1354,23 +1354,34 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
} |
|
|
} |
|
|
shopQ.setShopNumber(shopNumber); |
|
|
shopQ.setShopNumber(shopNumber); |
|
|
List<Long> shopIds = wxShopMapper.findIdList(shopQ); |
|
|
List<Long> shopIds = wxShopMapper.findIdList(shopQ); |
|
|
|
|
|
List<String> shopNumberList = wxShopMapper.findShopNumberList(shopQ); |
|
|
if (null == shopIds || shopIds.size() <= 0) { |
|
|
if (null == shopIds || shopIds.size() <= 0) { |
|
|
floorMerchantIds = new ArrayList<Long>(); |
|
|
|
|
|
floorMerchantIds.add(-999L); |
|
|
|
|
|
return floorMerchantIds; |
|
|
|
|
|
|
|
|
merchantIds.add(-999L); |
|
|
|
|
|
return merchantIds; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
WxMerchantShop merchantShopQ = new WxMerchantShop(); |
|
|
WxMerchantShop merchantShopQ = new WxMerchantShop(); |
|
|
if (null != merchantShopDel) { |
|
|
if (null != merchantShopDel) { |
|
|
merchantShopQ.setIsDel(merchantShopDel); |
|
|
merchantShopQ.setIsDel(merchantShopDel); |
|
|
} |
|
|
} |
|
|
merchantShopQ.updateTenantInfo(tenantEntity); |
|
|
merchantShopQ.updateTenantInfo(tenantEntity); |
|
|
merchantShopQ.setShopIdList(shopIds); |
|
|
merchantShopQ.setShopIdList(shopIds); |
|
|
floorMerchantIds = wxMerchantShopMapper.findMerchantIdList(merchantShopQ); |
|
|
|
|
|
if (null == floorMerchantIds || floorMerchantIds.size() <= 0) { |
|
|
|
|
|
floorMerchantIds = new ArrayList<Long>(); |
|
|
|
|
|
floorMerchantIds.add(-999L); |
|
|
|
|
|
return floorMerchantIds; |
|
|
|
|
|
|
|
|
List<Long> 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<Long> mids = wxMerchantMapper.findIdList(mq); |
|
|
|
|
|
if (null != mids && mids.size() > 0 ) { |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
return floorMerchantIds; |
|
|
return floorMerchantIds; |
|
|
} |
|
|
} |
|
|
return null; |
|
|
return null; |
|
|
|