winter 1 год назад
Родитель
Сommit
018f392e5e
3 измененных файлов: 3 добавлений и 2 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxAllBillServiceImpl.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxAllBillMapper.xml

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

@@ -443,7 +443,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill
WxAllBill br = new WxAllBill();
br.setRentContractId(rentContract.getId());
br.updateTenantInfo(rentContract);
br.setIsPreview(EnumYesOrNo.NO.getCode());
//br.setIsPreview(EnumYesOrNo.NO.getCode());
List<WxAllBill> brList = wxAllBillMapper.findList(br);
List<WxAllBill> realRentList = new ArrayList<WxAllBill>();
List<WxBillAction> actionList = new ArrayList<WxBillAction>();


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

@@ -905,6 +905,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
wxBillDeposit.setId(idWorker.nextId());
wxBillDeposit.setRentContractId(wxRentContract.getId());
wxBillDeposit.setBillType(EnumBillAllType.RENT_DEPOSIT.getCode());
wxBillDeposit.setIsPreview(EnumYesOrNo.NO.getCode());
if (null != fees) {
wxBillDeposit.setPriceDetail("合同押金项["+fees.getName()+"]"+depositFee.getPrice()+"元"+"/"+fees.getCalcuteUnitName());
}


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

@@ -217,7 +217,7 @@
</delete>
<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 &gt; #{shopEndtime} and IFNULL(`pay`,'0') &lt;= 0 AND IFNULL(`set_off`,'0') &lt;= 0 and IFNULL(`return_pay`,'0') &lt;= 0
<if test=" null != rentContractId">
and rent_contract_id = #{rentContractId}


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