Browse Source

[商户][修改]:商户的租期从合同中获取

release_toaliyun_real
hupeng 7 years ago
parent
commit
7470ef2df5
2 changed files with 10 additions and 11 deletions
  1. +9
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxRentContractMapper.xml

+ 9
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java View File

@@ -88,20 +88,19 @@ public class WxMerchantServiceImpl implements WxMerchantService {


@Override @Override
public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) {
WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setTenantId(record.getTenantId());
List<WxRentContract> list = wxRentContractMapper.findList(wxRentContract);

PageHelper.startPage(pageIndex, pageSize); PageHelper.startPage(pageIndex, pageSize);
List<WxMerchant> merchants = wxMerchantMapper.findList(record); List<WxMerchant> merchants = wxMerchantMapper.findList(record);
for (WxMerchant merchant : merchants) { for (WxMerchant merchant : merchants) {
List<WxRentContract> collect = list.stream().filter(ms -> ms.getMerchantId() != null && ms.getMerchantId().equals(merchant.getId())
&& !ms.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode())
&& !ms.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode())
&& !ms.getStatus().equals(EnumRentContractStatus.INTENTION.getCode())).collect(Collectors.toList());
if (collect != null && collect.size() > 0) {
merchant.setRentalStartDate(collect.get(0).getRentalStartDate());
merchant.setRentalEndDate(collect.get(0).getRentalEndDate());
WxRentContract wxRentContract = new WxRentContract();
wxRentContract.setMerchantId(merchant.getId());
List<WxRentContract> lrc = wxRentContractMapper.selectRentContractByMerchantId(wxRentContract);
if (!lrc.isEmpty()) {
merchant.setRentalStartDate(lrc.get(0).getRentalStartDate());
merchant.setRentalEndDate(lrc.get(0).getRentalEndDate());
} }

if (record.getRentShopType() != null) { if (record.getRentShopType() != null) {
List<Map<String, Object>> shops = new ArrayList<>(); List<Map<String, Object>> shops = new ArrayList<>();
WxMerchantShop wxMerchantShop = new WxMerchantShop(); WxMerchantShop wxMerchantShop = new WxMerchantShop();


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

@@ -244,7 +244,7 @@
<select id="selectRentContractByMerchantId" parameterType="com.iformall.domain.po.WxRentContract" <select id="selectRentContractByMerchantId" parameterType="com.iformall.domain.po.WxRentContract"
resultType="com.iformall.domain.po.WxRentContract"> resultType="com.iformall.domain.po.WxRentContract">
select * from wx_rent_contract select * from wx_rent_contract
where status in(2,3,4,5)
where status in(2,3,4)
and merchant_id = #{merchantId} and merchant_id = #{merchantId}
</select> </select>




Loading…
Cancel
Save