Просмотр исходного кода

Merge branch 'release_toaliyun_real' into release_real_200809

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
ad1bd5bd04
4 измененных файлов: 37 добавлений и 20 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java
  2. +20
    -16
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
  3. +11
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  4. +5
    -2
      mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxMerchantShopMapper.java Просмотреть файл

@@ -15,7 +15,7 @@ public interface WxMerchantShopMapper extends CommonMapper<WxMerchantShop, Strin

void delShops(@Param("merchantId") Long merchantId,@Param("shopList") List<Long> shopIds);
void realDelByMerchantId(@Param("merchantId") Long merchantId);
void realDelByMerchantId(@Param("merchantId") Long merchantId,@Param("shopList") List<Long> shopIds);
}

+ 20
- 16
mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -463,26 +463,30 @@ public class WxMerchantServiceImpl implements WxMerchantService {
List<Long> shopIds = wxMerchant.getShopids();
//如果原来店铺在商户里面有有效的合同,则不能操作
List<Long> oldShopIds = wxMerchantShopMapper.findShopIds(wxMerchant.getId());
List<Long> coldShopIds = new ArrayList<Long>();
if (null != oldShopIds && oldShopIds.size() > 0) {
for (Long osid : oldShopIds) {
WxRentContract wrc = new WxRentContract();
wrc.setMerchantId(wxMerchant.getId());
wrc.setQueryShopId(osid);
wrc.setStatuss(EnumRentContractStatus.getValidStatus());
wrc.updateTenantInfo(wxMerchant);
List<WxRentContract> clist = wxRentContractService.findList(wrc);
if (null != clist && clist.size() > 0 ) {
return new ResultData(ErrorCode.MERCHANT_HASRENTCONTRACT.getCode(),"店铺["+osid+"]存在有效的合同,不能解除绑定.");
}
}
coldShopIds.addAll(oldShopIds);
oldShopIds.removeAll(shopIds);
if (null != oldShopIds && oldShopIds.size() > 0 ) {
for (Long osid : oldShopIds) {
WxRentContract wrc = new WxRentContract();
wrc.setMerchantId(wxMerchant.getId());
wrc.setQueryShopId(osid);
wrc.setStatuss(EnumRentContractStatus.getValidStatus());
wrc.updateTenantInfo(wxMerchant);
List<WxRentContract> clist = wxRentContractService.findList(wrc);
if (null != clist && clist.size() > 0 ) {
return new ResultData(ErrorCode.MERCHANT_HASRENTCONTRACT.getCode(),"店铺["+osid+"]存在有效的合同,不能解除绑定.");
}
}
//都验证过了之后,先把之前的商铺释放,删除关系
wxShopMapper.updateUnRentByIds(oldShopIds);
wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId(),oldShopIds);
}
}
//都验证过了之后,先把之前的商铺释放,删除关系
if (null != oldShopIds && oldShopIds.size() > 0 ) {
wxShopMapper.updateUnRentByIds(oldShopIds);
}
wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId());
if (null != shopIds) {
shopIds.removeAll(coldShopIds);
List<Long> currSIds = new ArrayList<Long>();
for (Long sid: shopIds) {
if (!currSIds.contains(sid)) {


+ 11
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -2462,7 +2462,17 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wrq.setStatus(EnumRentContractStatus.PERFORMANCE.getCode());
List<WxRentContract> clist = wxRentContractMapper.findList(wrq);
if (null != clist && clist.size() > 0 ) {
return new ResultData(Result.ERROR, "当前存在其他审批中的合同。请先作完成。");
return new ResultData(Result.ERROR, "当前存在其他审批中的租金合同。请先作完成。");
}
//如果该合同是租金+物业合同,则还要判断物业合同
if(rentContract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) {
WxPropertyContract wpc = new WxPropertyContract();
wpc.updateTenantInfo(user);
wpc.setStatus(EnumRentContractStatus.PERFORMANCE.getCode());
List<WxPropertyContract> plist = wxPropertyContractMapper.findList(wpc);
if (null != plist && plist.size() > 0 ) {
return new ResultData(Result.ERROR, "当前存在其他审批中的物业合同。请先作完成。");
}
}
// Integer count = wxRentContractMapper.getCanApplyCount(rentContract.getId());
// if (null != count && count.intValue()>0) {


+ 5
- 2
mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml Просмотреть файл

@@ -83,8 +83,11 @@
</foreach>
</update>
<delete id="realDelByMerchantId" parameterType="Long">
delete from wx_merchant_shop where merchant_id = #{merchantId}
<delete id="realDelByMerchantId" parameterType="java.util.Map">
delete from wx_merchant_shop where merchant_id = #{merchantId} and shop_id in
<foreach collection="shopList" index="index" item="shopItem" open="(" separator="," close=")">
#{shopItem}
</foreach>
</delete>


Загрузка…
Отмена
Сохранить