|
|
|
@@ -14,6 +14,7 @@ import com.iformall.domain.po.WxAllBill; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxPropertyContract; |
|
|
|
import com.iformall.domain.po.WxRentContract; |
|
|
|
import com.iformall.domain.po.WxShop; |
|
|
|
import com.iformall.domain.po.WxUserDataRule; |
|
|
|
import com.iformall.domain.po.base.BaseEntity.SortField; |
|
|
|
import com.iformall.enums.*; |
|
|
|
@@ -153,6 +154,27 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "adjustPeriod不能为空"); |
|
|
|
} |
|
|
|
wxPropertyContract.setShopIds(","+wxPropertyContract.getShopIds()+","); |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(wxPropertyContract.getShopIds())) { |
|
|
|
String[] sids = wxPropertyContract.getShopIds().split(","); |
|
|
|
if (null != sids && sids.length > 0 ) { |
|
|
|
List<Long> shopIdList = new ArrayList<Long>(); |
|
|
|
for (int i = 0 ; i < sids.length ; i++) { |
|
|
|
if (StringUtils.isNotBlank(sids[i])) { |
|
|
|
shopIdList.add(Long.parseLong(sids[i])); } |
|
|
|
} |
|
|
|
if (shopIdList.size() > 0) { |
|
|
|
WxShop wxShop = new WxShop(); |
|
|
|
wxShop.updateTenantInfo(wxPropertyContract); |
|
|
|
wxShop.setIds(shopIdList); |
|
|
|
List<String> sunumbers = wxShopService.getShopNumberList(wxShop); |
|
|
|
if (null != sunumbers && sunumbers.size() > 0 ) { |
|
|
|
wxPropertyContract.setShopNumbers(StringUtils.join(sunumbers)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}else { |
|
|
|
WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); |
|
|
|
if (null == rentContract) { |
|
|
|
@@ -174,6 +196,7 @@ public class WxPropertyContractController extends WxContractBaseController { |
|
|
|
wxPropertyContract.setMerchantId(rentContract.getMerchantId()); |
|
|
|
wxPropertyContract.setSignDate(rentContract.getSignDate()); |
|
|
|
wxPropertyContract.setRentInfo(rentContract.getRentInfo()); |
|
|
|
wxPropertyContract.setShopNumbers(rentContract.getRentInfoShopNumber()); |
|
|
|
} |
|
|
|
|
|
|
|
WxMerchant merchant = wxMerchantService.selectById(wxPropertyContract.getMerchantId()); |
|
|
|
|