| @@ -14,6 +14,7 @@ import com.iformall.domain.po.WxAllBill; | |||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.po.WxPropertyContract; | import com.iformall.domain.po.WxPropertyContract; | ||||
| import com.iformall.domain.po.WxRentContract; | import com.iformall.domain.po.WxRentContract; | ||||
| import com.iformall.domain.po.WxShop; | |||||
| import com.iformall.domain.po.WxUserDataRule; | import com.iformall.domain.po.WxUserDataRule; | ||||
| import com.iformall.domain.po.base.BaseEntity.SortField; | import com.iformall.domain.po.base.BaseEntity.SortField; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| @@ -153,6 +154,27 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "adjustPeriod不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "adjustPeriod不能为空"); | ||||
| } | } | ||||
| wxPropertyContract.setShopIds(","+wxPropertyContract.getShopIds()+","); | 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 { | }else { | ||||
| WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); | WxRentContract rentContract = rentContractService.getSimpleDeatil(wxPropertyContract.getRentContractId()); | ||||
| if (null == rentContract) { | if (null == rentContract) { | ||||
| @@ -174,6 +196,7 @@ public class WxPropertyContractController extends WxContractBaseController { | |||||
| wxPropertyContract.setMerchantId(rentContract.getMerchantId()); | wxPropertyContract.setMerchantId(rentContract.getMerchantId()); | ||||
| wxPropertyContract.setSignDate(rentContract.getSignDate()); | wxPropertyContract.setSignDate(rentContract.getSignDate()); | ||||
| wxPropertyContract.setRentInfo(rentContract.getRentInfo()); | wxPropertyContract.setRentInfo(rentContract.getRentInfo()); | ||||
| wxPropertyContract.setShopNumbers(rentContract.getRentInfoShopNumber()); | |||||
| } | } | ||||
| WxMerchant merchant = wxMerchantService.selectById(wxPropertyContract.getMerchantId()); | WxMerchant merchant = wxMerchantService.selectById(wxPropertyContract.getMerchantId()); | ||||
| @@ -43,7 +43,6 @@ public class WxPropertyContract extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="审批流1合同2账单3终止审批",name="businessType") | @io.swagger.annotations.ApiModelProperty(value="审批流1合同2账单3终止审批",name="businessType") | ||||
| private Integer businessType; | private Integer businessType; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @SortColumn(column = "shopNumber") | @SortColumn(column = "shopNumber") | ||||
| private String shopNumber; | private String shopNumber; | ||||
| @@ -851,6 +851,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| wxBillDeposit.updateTenantInfo(wxRentContract); | wxBillDeposit.updateTenantInfo(wxRentContract); | ||||
| //wxBillDeposit.setIsDel(0); | //wxBillDeposit.setIsDel(0); | ||||
| wxBillDeposit.setMerchantId(wxRentContract.getMerchantId()); | wxBillDeposit.setMerchantId(wxRentContract.getMerchantId()); | ||||
| wxBillDeposit.setShopNumber(wxRentContract.getRentInfoShopNumber()); | |||||
| if (null != user) { | if (null != user) { | ||||
| //wxBillDeposit.setUserId(user.getId()); | //wxBillDeposit.setUserId(user.getId()); | ||||
| } | } | ||||
| @@ -1321,6 +1322,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size() == 1) { | if (null != wxRentContract.shopIdsByRentInfo() && wxRentContract.shopIdsByRentInfo().size() == 1) { | ||||
| wxBillRent.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); | wxBillRent.setShopId(wxRentContract.shopIdsByRentInfo().get(0)); | ||||
| } | } | ||||
| wxBillRent.setShopNumber(wxRentContract.getRentInfoShopNumber()); | |||||
| wxBillRent.setRentArea(wxRentContract.getRentArea()); | wxBillRent.setRentArea(wxRentContract.getRentArea()); | ||||
| wxBillRent.setCreatetime(date); | wxBillRent.setCreatetime(date); | ||||
| wxBillRent.setCreateBy(user.getId()); | wxBillRent.setCreateBy(user.getId()); | ||||
| @@ -1384,6 +1386,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| manage.setUpdateByName(wxBillRent.getUpdateByName()); | manage.setUpdateByName(wxBillRent.getUpdateByName()); | ||||
| manage.setRentShopType(wxBillRent.getRentShopType()); | manage.setRentShopType(wxBillRent.getRentShopType()); | ||||
| manage.setRentArea(wxBillRent.getRentArea()); | manage.setRentArea(wxBillRent.getRentArea()); | ||||
| manage.setShopNumber(wxBillRent.getShopNumber()); | |||||
| if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode().intValue()){ | if (feeType.getCode().intValue() == EnumRentContractManageFeeType.RENT_BUSSINESS_MANAGE_FEE.getCode().intValue()){ | ||||
| manage.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId()); | manage.setEnergyFeesId(EnumBillAllType.RENT_BUSSINESS_MANAGE.getEnergyFeesId()); | ||||
| manage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | manage.setBillType(EnumBillAllType.RENT_BUSSINESS_MANAGE.getCode()); | ||||