diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java index 9d58facf7..7b7b3c0a9 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxRentContractMapper.java @@ -39,4 +39,6 @@ public interface WxRentContractMapper extends CommonMapper getRentInvalidList(WxRentContract wxRentContract); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 7bcb14b40..eefd6789a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -34,6 +34,7 @@ import java.math.RoundingMode; import java.net.HttpURLConnection; import java.net.URL; import java.util.*; +import java.util.stream.Collectors; /** * @author gongbiao @@ -607,6 +608,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { int allCount = wxRentContractMapper.selectCount(wxRentContract); resultData.put("allCount", allCount); + //审核流程中止 + List collect = wxRentContractMapper.getRentInvalidList(wxRentContract).stream() + .map(r -> r.getId()).collect(Collectors.toList()); + if (!collect.isEmpty()) { + //中止 + } + //把状态为签约而商户未关联的数据改为待签约状态 wxRentContractMapper.updateStatusForUnsign(wxRentContract); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 16d425b81..33399fd3d 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -39,12 +39,12 @@ and `img_url` like concat('%', #{imgUrl},'%') - - + + and `name` like concat('%', #{name},'%') - - + + and `link_phone` like concat('%', #{linkPhone},'%') diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index a3be9248c..c46a18ff6 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -178,5 +178,13 @@ + + +