winter 1 год назад
Родитель
Сommit
0523492148
3 измененных файлов: 12 добавлений и 4 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxAllBill.java
  2. +5
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  3. +6
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -282,7 +282,7 @@ public class WxAllBill extends TenantEntity {
private String rentArea; private String rentArea;
@io.swagger.annotations.ApiModelProperty(value = "是否可以编辑", name = "canEdit") @io.swagger.annotations.ApiModelProperty(value = "是否可以编辑", name = "canEdit")
private Integer canEdit = 0;
private Integer canEdit;
@io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building")
@TableField(exist = false) @TableField(exist = false)


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

@@ -541,6 +541,8 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
String needpay = wxPropertyContract.getDeposit(); String needpay = wxPropertyContract.getDeposit();
wxBillDeposit.setNeedPay(needpay); wxBillDeposit.setNeedPay(needpay);
wxBillDeposit.setReceivePay(needpay); wxBillDeposit.setReceivePay(needpay);
wxBillDeposit.setIsPreview(EnumYesOrNo.NO.getCode());
wxBillDeposit.setCanEdit(EnumYesOrNo.NO.getCode());
//wxBillDeposit.setOwe(needpay); //wxBillDeposit.setOwe(needpay);
Date date = new Date(); Date date = new Date();
// Calendar instance = Calendar.getInstance(); // Calendar instance = Calendar.getInstance();
@@ -850,8 +852,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
wxBillProperty.setPay("0"); wxBillProperty.setPay("0");
wxBillProperty.setStarttime(start); wxBillProperty.setStarttime(start);
wxBillProperty.setEndtime(end); wxBillProperty.setEndtime(end);
wxBillProperty.setReceiveDate(receiveDate);;

wxBillProperty.setReceiveDate(receiveDate);
wxBillProperty.setCanEdit(EnumYesOrNo.NO.getCode());
wxBillProperty.setNeedPay(needpay); wxBillProperty.setNeedPay(needpay);
//wxBillProperty.setOwe(needpay); //wxBillProperty.setOwe(needpay);
wxBillProperty.setReceivePay(needpay); wxBillProperty.setReceivePay(needpay);


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

@@ -825,6 +825,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillDeposit.setRentContractId(wxRentContract.getId()); wxBillDeposit.setRentContractId(wxRentContract.getId());
wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode()); wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
wxBillDeposit.setIsPreview(EnumYesOrNo.NO.getCode()); wxBillDeposit.setIsPreview(EnumYesOrNo.NO.getCode());
wxBillDeposit.setCanEdit(EnumYesOrNo.NO.getCode());
if (null != fees) { if (null != fees) {
wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName()); wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName());
} }
@@ -1302,7 +1303,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillRent.setStarttime(billTimeVo.getStartDate()); wxBillRent.setStarttime(billTimeVo.getStartDate());
wxBillRent.setEndtime(billTimeVo.getEndDate()); wxBillRent.setEndtime(billTimeVo.getEndDate());
wxBillRent.setReceiveDate(billTimeVo.getReceiveDate()); wxBillRent.setReceiveDate(billTimeVo.getReceiveDate());
wxBillRent.setCanEdit(EnumYesOrNo.NO.getCode());;
//wxBillRent.setContractNeedPay(needpay); //wxBillRent.setContractNeedPay(needpay);
//wxBillRent.setRentPriceInfo(getRentPriceInfo(wxRentContract,new BigDecimal(needpay))); //wxBillRent.setRentPriceInfo(getRentPriceInfo(wxRentContract,new BigDecimal(needpay)));
wxBillRent.setNeedPay(needpay); wxBillRent.setNeedPay(needpay);
@@ -1389,6 +1390,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
manage.setRentShopType(wxBillRent.getRentShopType()); manage.setRentShopType(wxBillRent.getRentShopType());
manage.setRentArea(wxBillRent.getRentArea()); manage.setRentArea(wxBillRent.getRentArea());
manage.setShopNumber(wxBillRent.getShopNumber()); manage.setShopNumber(wxBillRent.getShopNumber());
manage.setCanEdit(EnumYesOrNo.NO.getCode());
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());
@@ -2749,6 +2751,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setEnergyFeesId(type.getEnergyFeesId()); bmbill.setEnergyFeesId(type.getEnergyFeesId());
bmbill.setRentContractId(rentcontract.getId()); bmbill.setRentContractId(rentcontract.getId());
bmbill.setIsPreview(EnumYesOrNo.NO.getCode()); bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId()); bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType()); bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date()); bmbill.setCreatetime(new Date());
@@ -2795,6 +2798,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setRentContractId(rentcontract.getId()); bmbill.setRentContractId(rentcontract.getId());
bmbill.setPropertyContractId(propertyContractId); bmbill.setPropertyContractId(propertyContractId);
bmbill.setIsPreview(EnumYesOrNo.NO.getCode()); bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId()); bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType()); bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date()); bmbill.setCreatetime(new Date());
@@ -2825,6 +2829,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
bmbill.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId()); bmbill.setEnergyFeesId(EnumBillAllType.RENT.getEnergyFeesId());
bmbill.setRentContractId(rentcontract.getId()); bmbill.setRentContractId(rentcontract.getId());
bmbill.setIsPreview(EnumYesOrNo.NO.getCode()); bmbill.setIsPreview(EnumYesOrNo.NO.getCode());
bmbill.setCanEdit(EnumYesOrNo.NO.getCode());
bmbill.setMerchantId(rentcontract.getMerchantId()); bmbill.setMerchantId(rentcontract.getMerchantId());
bmbill.setRentShopType(rentcontract.getRentShopType()); bmbill.setRentShopType(rentcontract.getRentShopType());
bmbill.setCreatetime(new Date()); bmbill.setCreatetime(new Date());


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