Просмотр исходного кода

[修改][结算单][修改状态]

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
04db92a4a4
2 измененных файлов: 19 добавлений и 1 удалений
  1. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
  2. +13
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

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

@@ -477,6 +477,11 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
//选择的账单改为已结清 //选择的账单改为已结清
updateFreezeOrStatus(record.getReceiveBillIds(), null,EnumBillRentStatus.PAID.getCode()); updateFreezeOrStatus(record.getReceiveBillIds(), null,EnumBillRentStatus.PAID.getCode());
updateFreezeOrStatus(record.getPayBillIds(), null,EnumBillRentStatus.PAID.getCode()); updateFreezeOrStatus(record.getPayBillIds(), null,EnumBillRentStatus.PAID.getCode());

//刚好结清
if(record.getReceiveMoney().equals(record.getPayMoney())){
record.setStatus(EnumSettleStatus.FINISH.getCode());
}
} }
if (record.getId() == null) { if (record.getId() == null) {
record.setId(idWorker.nextId()); record.setId(idWorker.nextId());
@@ -543,3 +548,4 @@ public class WxBillSettleServiceImpl implements WxBillSettleService {
} }
} }




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

@@ -309,11 +309,17 @@ public class WxFlowServiceImpl implements WxFlowService {
wxBillSettle.setStatus(EnumSettleStatus.NOT_FINISH.getCode()); wxBillSettle.setStatus(EnumSettleStatus.NOT_FINISH.getCode());
wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode());
wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode()); wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),EnumBillRentStatus.PAID.getCode());

//刚好结清
if(settle.getReceiveMoney().equals(settle.getPayMoney())){
wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode());
}
}else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) { }else if(EnumRentContractAppStatus.SETBACK.getCode().intValue() == applyStatus.intValue() || EnumRentContractAppStatus.REJECT.getCode().intValue() == applyStatus.intValue()) {
//解冻 //解冻
wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),null); wxBillSettleService.updateFreezeOrStatus(settle.getReceiveBillIds(), EnumFreezeType.DEF.getCode(),null);
wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),null); wxBillSettleService.updateFreezeOrStatus(settle.getPayBillIds(),EnumFreezeType.DEF.getCode(),null);
} }

wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle);
} }
} }
@@ -549,7 +555,7 @@ public class WxFlowServiceImpl implements WxFlowService {
public boolean isBill(Integer flowType){ public boolean isBill(Integer flowType){
if(EnumFlowKey.BILL.getCode().equals(flowType) if(EnumFlowKey.BILL.getCode().equals(flowType)
||EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)){ ||EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)){
return true;
return true;
} }
return false; return false;
} }
@@ -1516,4 +1522,10 @@ public class WxFlowServiceImpl implements WxFlowService {
public List<WxFlowModel> getModelBybusiness(WxFlowModel wxFlowModel) { public List<WxFlowModel> getModelBybusiness(WxFlowModel wxFlowModel) {
return wxFlowModelMapper.getModelBybusiness(wxFlowModel); return wxFlowModelMapper.getModelBybusiness(wxFlowModel);
} }

public static void main(String[] args) {
new Thread(() -> System.out.println(1 + "hello world")).start();

}
} }


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