|
|
|
@@ -245,27 +245,6 @@ public class WxShopServiceImpl implements WxShopService { |
|
|
|
return count; |
|
|
|
} |
|
|
|
|
|
|
|
private Map<Long,WxMerchant> getMerchantMap(TenantEntity tenantEntity,List<Long> merchantIds,Map<Long,WxMerchant> merchantMap) { |
|
|
|
if (null == merchantMap) { |
|
|
|
merchantMap = new HashMap<Long,WxMerchant>(); |
|
|
|
} |
|
|
|
if (null != merchantIds && merchantIds.size() > 0 ) { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(tenantEntity); |
|
|
|
merchantQ.setIds(merchantIds); |
|
|
|
List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ); |
|
|
|
if (null != merchantList && merchantList.size() > 0 ) { |
|
|
|
for (int i = 0 ; i < merchantList.size() ; i ++) { |
|
|
|
WxMerchant m = merchantList.get(i); |
|
|
|
if (null != m) { |
|
|
|
merchantMap.put(m.getId(), m); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return merchantMap; |
|
|
|
} |
|
|
|
|
|
|
|
private void initShopMerchantMap(WxShop record,Map<Long,Long> shopMerchantIdMap,Map<Long,WxMerchant> merchantMap) { |
|
|
|
WxMerchantShop merchantShopQ = new WxMerchantShop(); |
|
|
|
merchantShopQ.updateTenantInfo(record); |
|
|
|
@@ -287,43 +266,25 @@ public class WxShopServiceImpl implements WxShopService { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//还得查一下虚拟商户,如果店铺既有品牌商户关联,又有虚拟商户,则取虚拟商户。因为这种情况代表的是已售铺创建的品牌,不能创建合同,智能做营销。 |
|
|
|
WxShop sq = new WxShop(); |
|
|
|
sq.setId(record.getId()); |
|
|
|
sq.setIds(record.getIds()); |
|
|
|
sq.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
List<WxShop> shopList = wxShopMapper.findList(sq); |
|
|
|
if (null != shopList && shopList.size() > 0 ) { |
|
|
|
Map<String,Long> shopNumberMap = new HashMap<String,Long>(); |
|
|
|
List<String> shopNumberList = new ArrayList<String>(); |
|
|
|
for (int i = 0 ; i < shopList.size() ; i ++ ) { |
|
|
|
WxShop s = shopList.get(i); |
|
|
|
shopNumberMap.put(s.getShopNumber(), s.getId()); |
|
|
|
shopNumberList.add(s.getShopNumber()); |
|
|
|
} |
|
|
|
|
|
|
|
WxMerchant mq = new WxMerchant(); |
|
|
|
mq.updateTenantInfo(record); |
|
|
|
sq.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
mq.setCreateShopNumberList(shopNumberList); |
|
|
|
List<WxMerchant> mlist = wxMerchantMapper.findList(mq); |
|
|
|
if (null != mlist && mlist.size() > 0) { |
|
|
|
for (int i = 0 ; i < mlist.size() ; i ++ ) { |
|
|
|
WxMerchant m = mlist.get(i); |
|
|
|
String createshopNumber = m.getCreateShopNumber(); |
|
|
|
if (StringUtils.isNotBlank(createshopNumber)) { |
|
|
|
Long shopId = shopNumberMap.get(createshopNumber); |
|
|
|
if (null != shopId) { |
|
|
|
shopMerchantIdMap.put(shopId, m.getId()); |
|
|
|
} |
|
|
|
|
|
|
|
if (null == merchantMap) { |
|
|
|
merchantMap = new HashMap<Long,WxMerchant>(); |
|
|
|
} |
|
|
|
if (null != merchantIds && merchantIds.size() > 0 ) { |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(record); |
|
|
|
merchantQ.setIds(merchantIds); |
|
|
|
List<WxMerchant> merchantList = wxMerchantMapper.findList(merchantQ); |
|
|
|
if (null != merchantList && merchantList.size() > 0 ) { |
|
|
|
for (int i = 0 ; i < merchantList.size() ; i ++) { |
|
|
|
WxMerchant m = merchantList.get(i); |
|
|
|
if (null != m) { |
|
|
|
merchantMap.put(m.getId(), m); |
|
|
|
} |
|
|
|
if (!merchantIds.contains(m.getId())) { |
|
|
|
merchantIds.add(m.getId()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
merchantMap = getMerchantMap(record,merchantIds,merchantMap); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|