Browse Source

// merchant

release_toaliyun_real
xhxu 3 years ago
parent
commit
bf29af1511
3 changed files with 31 additions and 3 deletions
  1. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
  2. +27
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml

+ 3
- 2
mallinkService/src/main/java/com/iformall/service/WxMerchantService.java View File

@@ -67,8 +67,9 @@ public interface WxMerchantService {
PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize);
List<WxMerchant> queryIdAndNames(WxMerchant record);

Map<Long,String> getIdAndNamesMap(WxMerchant record);

PageInfo<WxMerchantVo> listAsPageCVo(WxMerchantDto wxMerchantDto, Integer pageIndex, Integer pageSize,boolean hasShop);
/**
* 根据code查询


+ 27
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -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) {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml View File

@@ -180,7 +180,7 @@
and json_search(other_merchant, 'one', #{otherId}) IS NOT NULL;
</update>

<update id="deleteOtherMerchant" parameterType="hashmap">
<update id="addOtherMerchant" parameterType="hashmap">
update wx_merchant_b_user set other_merchant = json_array_append(coalesce(other_merchant,'[]'), '$', #{otherId})
where `tenant_id` = #{tenantId}
and id in


Loading…
Cancel
Save