|
|
|
@@ -161,6 +161,19 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
return wxMerchantMapper.findIdNameList(record); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<Long, String> getIdAndNamesMap(WxMerchant record) { |
|
|
|
Map<Long,String> merchantSimpleMap = new HashMap<Long,String>(); |
|
|
|
List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(record); |
|
|
|
if (null != merchantList && !merchantList.isEmpty()) { |
|
|
|
for (int k = 0 ; k < merchantList.size() ; k++) { |
|
|
|
WxMerchant m = merchantList.get(k); |
|
|
|
merchantSimpleMap.put(m.getId(), m.getName()); |
|
|
|
} |
|
|
|
} |
|
|
|
return merchantSimpleMap; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxMerchantVo getMerchantInfo(HashMap<String, String> params) { |
|
|
|
WxMerchant merchant = wxMerchantMapper.getMerchantByCode(params); |
|
|
|
@@ -328,6 +341,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
otherQ.setOtherMerchantId(wxMerchant.getId().toString()); |
|
|
|
otherQ.setStatus(EnumMerchantBUserStatus.VALID.getCode()); |
|
|
|
List<WxMerchantBUser> otherUserList = wxMerchantBUserMapper.findList(otherQ); |
|
|
|
if(otherUserList != null && !otherUserList.isEmpty()){ |
|
|
|
List<Long> ids = otherUserList.stream().map(u -> u.getMerchantId()).collect(Collectors.toList()); |
|
|
|
WxMerchant merchantQ = new WxMerchant(); |
|
|
|
merchantQ.updateTenantInfo(wxMerchant); |
|
|
|
merchantQ.setIds(ids); |
|
|
|
Map<Long, String> idAndNamesMap = getIdAndNamesMap(merchantQ); |
|
|
|
for (WxMerchantBUser buser: otherUserList) { |
|
|
|
buser.setMerchantName(idAndNamesMap.get(buser.getMerchantId())); |
|
|
|
} |
|
|
|
} |
|
|
|
wxMerchant.setOtherMerchantUsers(otherUserList); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -870,6 +893,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
if (wxMerchant.getId() == null) { |
|
|
|
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); |
|
|
|
} |
|
|
|
if(EnumYesOrNo.NO.getCode().equals(wxMerchant.getIsAdmin())){ |
|
|
|
//删除关联的其他门店用户 |
|
|
|
wxMerchantBUserMapper.deleteOtherMerchant(wxMerchant.getTenantId(),wxMerchant.getId().toString()); |
|
|
|
} |
|
|
|
wxMerchantMapper.updateById(wxMerchant); |
|
|
|
wxLevelConfigService.batchSaveByMerchantId(wxMerchant, wxMerchant.getId(), wxMerchant.getLevelConfigList()); |
|
|
|
} catch (Exception e) { |
|
|
|
|