| @@ -443,7 +443,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill | |||||
| WxAllBill br = new WxAllBill(); | WxAllBill br = new WxAllBill(); | ||||
| br.setRentContractId(rentContract.getId()); | br.setRentContractId(rentContract.getId()); | ||||
| br.updateTenantInfo(rentContract); | br.updateTenantInfo(rentContract); | ||||
| br.setIsPreview(EnumYesOrNo.NO.getCode()); | |||||
| //br.setIsPreview(EnumYesOrNo.NO.getCode()); | |||||
| List<WxAllBill> brList = wxAllBillMapper.findList(br); | List<WxAllBill> brList = wxAllBillMapper.findList(br); | ||||
| List<WxAllBill> realRentList = new ArrayList<WxAllBill>(); | List<WxAllBill> realRentList = new ArrayList<WxAllBill>(); | ||||
| List<WxBillAction> actionList = new ArrayList<WxBillAction>(); | List<WxBillAction> actionList = new ArrayList<WxBillAction>(); | ||||
| @@ -905,6 +905,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| wxBillDeposit.setId(idWorker.nextId()); | wxBillDeposit.setId(idWorker.nextId()); | ||||
| 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()); | |||||
| if (null != fees) { | if (null != fees) { | ||||
| wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName()); | wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName()); | ||||
| } | } | ||||
| @@ -217,7 +217,7 @@ | |||||
| </delete> | </delete> | ||||
| <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxAllBill"> | <delete id="deleteNoNeedPayBill" parameterType="com.iformall.domain.po.WxAllBill"> | ||||
| delete from wx_all_bill where rent_contract_id = #{rentContractId} and is_preview = 0 and status = 2 | |||||
| delete from wx_all_bill where rent_contract_id = #{rentContractId} and status = 2 | |||||
| and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 and IFNULL(`return_pay`,'0') <= 0 | and starttime > #{shopEndtime} and IFNULL(`pay`,'0') <= 0 AND IFNULL(`set_off`,'0') <= 0 and IFNULL(`return_pay`,'0') <= 0 | ||||
| <if test=" null != rentContractId"> | <if test=" null != rentContractId"> | ||||
| and rent_contract_id = #{rentContractId} | and rent_contract_id = #{rentContractId} | ||||