|
|
@@ -26,10 +26,7 @@ import org.slf4j.LoggerFactory; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
import java.util.HashMap; |
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@@ -58,6 +55,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { |
|
|
merchantQ1.updateTenantInfo(record); |
|
|
merchantQ1.updateTenantInfo(record); |
|
|
merchantQ1.setName(record.getMerchantName()); |
|
|
merchantQ1.setName(record.getMerchantName()); |
|
|
merchantQ1.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
merchantQ1.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
|
|
if(record.getNotMerchantId() != null){ |
|
|
|
|
|
List<Long> notIds = new ArrayList<>(); |
|
|
|
|
|
notIds.add(record.getNotMerchantId()); |
|
|
|
|
|
merchantQ1.setNotInids(notIds); |
|
|
|
|
|
} |
|
|
List<Long> merchantIdList = wxMerchantMapper.findIdList(merchantQ1); |
|
|
List<Long> merchantIdList = wxMerchantMapper.findIdList(merchantQ1); |
|
|
if(merchantIdList == null || merchantIdList.isEmpty()){ |
|
|
if(merchantIdList == null || merchantIdList.isEmpty()){ |
|
|
return new PageInfo<WxMerchantBUser>(); |
|
|
return new PageInfo<WxMerchantBUser>(); |
|
|
|