|
|
|
@@ -59,6 +59,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxShopMapper wxShopMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxShopUsersMapper wxShopUsersMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxMerchantShopMapper wxMerchantShopMapper; |
|
|
|
@@ -2114,7 +2117,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
Map<Long,WxMerchant> merchantMap = new HashMap<>(); |
|
|
|
List<WxMerchant> list = this.findList(merchantQ); |
|
|
|
if(!list.isEmpty()){ |
|
|
|
merchantMap = list.stream().collect(Collectors.toMap(WxMerchant::getId, Function.identity())); |
|
|
|
for (int i = 0 ; i < list.size(); i++ ){ |
|
|
|
WxMerchant m = list.get(i); |
|
|
|
merchantMap.put(m.getId(), m); |
|
|
|
} |
|
|
|
} |
|
|
|
return merchantMap; |
|
|
|
} |
|
|
|
@@ -2390,4 +2396,31 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
merchantShopQ.setIsDel(0); |
|
|
|
return wxMerchantShopMapper.findMerchantIdList(merchantShopQ); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public String getPrivateMerchantUser(Long merchantId) { |
|
|
|
WxMerchant m = this.selectById(merchantId); |
|
|
|
if (null == m || m.getIsPrivate() != EnumYesOrNo.YES.getCode()){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
WxMerchantShop merchantShopQ = new WxMerchantShop(); |
|
|
|
merchantShopQ.updateTenantInfo(m); |
|
|
|
merchantShopQ.setMerchantId(merchantId); |
|
|
|
merchantShopQ.setIsDel(0); |
|
|
|
List<WxMerchantShop> merchantShopList = wxMerchantShopMapper.findList(merchantShopQ); |
|
|
|
if (null == merchantShopList || merchantShopList.size() <= 0 ) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
WxMerchantShop ms = merchantShopList.get(0); |
|
|
|
WxShopUsers suq = new WxShopUsers(); |
|
|
|
suq.updateTenantInfo(m); |
|
|
|
suq.setShopId(ms.getShopId()); |
|
|
|
suq.setStatus(EnumShopUsersStatus.LIVE.getCode()); |
|
|
|
suq.setSortColumn(" type desc"); |
|
|
|
List<WxShopUsers> userList = wxShopUsersMapper.findList(suq); |
|
|
|
if (null == userList || userList.size() <= 0 ){ |
|
|
|
return null; |
|
|
|
} |
|
|
|
return userList.get(0).getName(); |
|
|
|
} |
|
|
|
} |