|
|
|
@@ -19,7 +19,6 @@ import com.iformall.enums.*; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.mapper.*; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.utils.BeanMapping; |
|
|
|
import com.iformall.utils.DateUtils; |
|
|
|
import com.iformall.utils.EventUtil; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
@@ -140,7 +139,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxMerchant.setTenantId(tenantId); |
|
|
|
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
List<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant); |
|
|
|
return BeanMapping.mapList(wxMerchantList,WxMerchantSimpleVo.class,(s, t)->t.setMerchantName(s.getName())); |
|
|
|
WxMerchantSimpleVo wxMerchantSimpleVo = new WxMerchantSimpleVo(); |
|
|
|
List<WxMerchantSimpleVo> collect = wxMerchantList.stream().map(x -> { |
|
|
|
wxMerchantSimpleVo.setId(x.getId()); |
|
|
|
wxMerchantSimpleVo.setMerchantName(x.getName()); |
|
|
|
wxMerchantSimpleVo.setBusinessId(x.getBusinessId()); |
|
|
|
return wxMerchantSimpleVo; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
return collect; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|