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

Merge commit '7946b8842e5d463afa573a98a685b425a3f0f221' into release

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

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

@@ -111,11 +111,11 @@ public class WxFlowServiceImpl implements WxFlowService {
@Override
public void updateBusinessStatus(Map<String, Object> mapInfo,Integer applyStatus){
Long businessId = Long.parseLong(mapInfo.get("businessId").toString());
Integer flowType = (Integer)mapInfo.get("flowType");
Integer flowType = getIngeter(mapInfo.get("flowType"));
List<Map<String,Object>> variables = (List)mapInfo.get("variables");
Integer contractType = 0;
String str = (String)getVariableByKey(variables,"contractType");
Integer operateType = (Integer)getVariableByKey(variables,"approvalType");
Integer operateType = getIngeter(getVariableByKey(variables,"approvalType"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(StringUtils.isNotBlank(str)){
contractType = Integer.parseInt(str);
@@ -179,7 +179,7 @@ public class WxFlowServiceImpl implements WxFlowService {
rent.setStatus(EnumRentContractStatus.CONTRACT_TERMINATE.getCode());

//终止租赁合同,同时终止物业合同
Integer endProperty = (Integer)getVariableByKey(variables,"endProperty");
Integer endProperty = getIngeter(getVariableByKey(variables,"endProperty"));
rent.setEndProperty(endProperty);
wxRentContractService.endContract(rent);
}
@@ -201,9 +201,9 @@ public class WxFlowServiceImpl implements WxFlowService {
} else if (EnumFlowKey.BILL.getCode().equals(flowType) || EnumFlowKey.NEW_BILL_CHANGE.getCode().equals(flowType)) {
if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) {
//账单审批
Integer billType = (Integer) getVariableByKey(variables, "billType");
Integer billType = getIngeter(getVariableByKey(variables, "billType"));
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession");
Integer billUpdateType = (Integer) getVariableByKey(variables, "billUpdateType");
Integer billUpdateType = getIngeter(getVariableByKey(variables, "billUpdateType"));
Long oldPrice = Long.parseLong(getVariableByKey(variables, "oldPrice").toString());
Long newPrice = Long.parseLong(getVariableByKey(variables, "newPrice").toString());
WxBillAll wxBillAll = new WxBillAll();


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