|
|
|
@@ -162,6 +162,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { |
|
|
|
if(record.getIsAdmin() == null){ |
|
|
|
record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
} |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -288,6 +291,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Long> findIdList(WxMerchant record) { |
|
|
|
if(record == null){ |
|
|
|
record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
} |
|
|
|
return wxMerchantMapper.findIdList(record); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -307,6 +313,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxMerchant.updateTenantInfo(tenantEntity); |
|
|
|
wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); |
|
|
|
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
List<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant); |
|
|
|
List<WxMerchantSimpleVo> collect = wxMerchantList.stream().map(x -> { |
|
|
|
WxMerchantSimpleVo wxMerchantSimpleVo = new WxMerchantSimpleVo(); |
|
|
|
@@ -1013,6 +1020,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
@Override |
|
|
|
public void exportData(WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response) { |
|
|
|
|
|
|
|
if(wxMerchant.getIsAdmin() == null){ |
|
|
|
wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
} |
|
|
|
|
|
|
|
List<WxMerchant> list = wxMerchantMapper.findList(wxMerchant); |
|
|
|
|
|
|
|
WxBusiness bq = new WxBusiness(); |
|
|
|
@@ -1145,6 +1156,10 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
|
|
|
|
private void initQueryParam(WxMerchant record,boolean hasRentContractInfo,Map<Long,WxRentContract> merchantRentMap) { |
|
|
|
|
|
|
|
if(record.getIsAdmin() == null){ |
|
|
|
record.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
} |
|
|
|
|
|
|
|
if (hasRentContractInfo) { |
|
|
|
WxRentContract wxRentContractQ = new WxRentContract(); |
|
|
|
wxRentContractQ.updateTenantInfo(record); |
|
|
|
@@ -2030,6 +2045,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxMerchant.setTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); |
|
|
|
wxMerchant.setBrand(brand); |
|
|
|
wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); |
|
|
|
List<WxMerchant> list = findList(wxMerchant); |
|
|
|
if(list.size() > 0){ |
|
|
|
return list.get(0); |
|
|
|
|