diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index c4f85dada..c8179a9da 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -86,6 +86,8 @@ public class WxFlowServiceImpl implements WxFlowService { private WxCouponMapper wxCouponMapper; @Autowired private WxCouponService wxCouponService; + @Autowired + private WxRentContractMapper wxRentContractMapper; /** * 获取流程key @@ -113,7 +115,6 @@ public class WxFlowServiceImpl implements WxFlowService { Long businessId = Long.parseLong(mapInfo.get("businessId").toString()); Integer flowType = (Integer)mapInfo.get("flowType"); List> variables = (List)mapInfo.get("variables"); - Boolean supplement = (Boolean)mapInfo.get("supplement"); Integer contractType = 0; String str = (String)getVariableByKey(variables,"contractType"); Integer operateType = (Integer)getVariableByKey(variables,"approvalType"); @@ -141,8 +142,9 @@ public class WxFlowServiceImpl implements WxFlowService { rent.setBusinessType(flowType); wxRentContractService.updateApplyStatus(rent); - // 如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约) - if(supplement!=null && supplement && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { + //如果审批完成,而且是补录直接改为已签约状态(普通需要绑定商户才是已签约) + WxRentContract record = wxRentContractMapper.selectByPrimaryKey(businessId); + if(record.getMerchantId()!=null && EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { wxRentContractService.updateRentContractStatus(businessId); } }else if(EnumFlowContractType.PROPERTY.getCode().equals(contractType) || EnumFlowContractType.PROPERTY_POINT.getCode().equals(contractType)){ @@ -325,7 +327,6 @@ public class WxFlowServiceImpl implements WxFlowService { Long businessId = Long.parseLong(params.get("businessId").toString()); Integer flowType = getIngeter(params.get("businessType")); List> variables = (List)params.get("variables"); - Boolean supplement = (Boolean)params.get("supplement"); WxFlowModel flowModel = getModelByType(flowType,tenantId); if(flowModel== null || StringUtils.isBlank(flowModel.getFlowId())){ @@ -343,7 +344,6 @@ public class WxFlowServiceImpl implements WxFlowService { map.put("businessId",businessId+""); map.put("flowType",flowType); map.put("variables",variables); - map.put("supplement",supplement); map.put("taskAssignee",flowModel.getFlow()); setSignAssignee(map,flowModel.getFlow()); map.put("tenantId",tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 2bbcd18ec..9198828cb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -451,7 +451,9 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService wxPropertyContractMapper.updateByPrimaryKeySelective(wxPropertyContract); //建立账单 if (record.getMerchantId() != null - && record.getReceivePeriod() != null && record.getPrice() > 0) { + && record.getReceivePeriod() != null && + record.getPrice() > 0 && + record.getDeposit() > 0) { //预览账单改为正式,并写入商户id updatePropertyPreviewBill(record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 3794ccce8..8d80835a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1461,7 +1461,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { if (record != null && record.getMerchantId() != null && record.getReceivePeriod() != null && - record.getPrice() > 0) { + record.getPrice() > 0 && + record.getDeposit() > 0) { //预览账单改为正式,并写入商户id WxBillRent billRent = new WxBillRent(); billRent.setRentContractId(id); diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index e1e88d7e7..d88036f06 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -138,8 +138,10 @@ - update wx_bill_property set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and status != 6 and DATEDIFF(now(),receive_date)>0 + update wx_bill_property b set b.status=#{notPaid},b.expired_day= + DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`property_contract_id`) day)) + where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and + DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`property_contract_id`) day)) >0 diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index dc2ae32bd..cd5307bad 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -146,8 +146,10 @@ - update wx_bill_rent set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and status!=6 and DATEDIFF(now(),receive_date)>0 + update wx_bill_rent b set b.status=#{notPaid},b.expired_day= + DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`rent_contract_id`) day)) + where b.tenant_id=#{tenantId} and b.status!=#{paid} and b.status!=6 and + DATEDIFF(now(), date_add(b.receive_date,interval(select late_pay_day from wx_rent_contract where id = b.`rent_contract_id`) day)) >0