From 4def04c6885af581f0272cdcda92fc576d277bbf Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 28 May 2019 18:06:37 +0800 Subject: [PATCH] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][1001671]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxOrderQueryVo.java | 3 ++ .../service/impl/WxFlowServiceImpl.java | 42 ++++++++++++------- .../impl/WxPropertyContractServiceImpl.java | 5 +-- .../impl/WxRentContractServiceImpl.java | 21 ++++------ .../main/resources/mapper/WxBillAllMapper.xml | 4 +- .../resources/mapper/WxBillPropertyMapper.xml | 4 +- 6 files changed, 45 insertions(+), 34 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java index 129b92c9e..3a7243731 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderQueryVo.java @@ -33,6 +33,9 @@ public class WxOrderQueryVo extends BaseEntity { @Transient private Integer orderStatus; + @Transient + private Date createDate; + @Override public String getSortColumns() { super.setSortColumns(this.sortColumns); 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 b422d8acd..fdd38381a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -470,22 +470,28 @@ public class WxFlowServiceImpl implements WxFlowService { } } msgReplaceMap.put("taskList", taskListHtml); - MailMsg mailMsg = new MailMsg(); - mailMsg.setSubject("待办通知"); - mailMsg.setHtml(true); - mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); - mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); - mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); - mailMsg.setTo(new String[]{email}); - mailMsg.setTenantId(tenantId); - if(1 == flowType.intValue() || 3 == flowType.intValue()){ - msgReplaceMap.put("bustype","合同"); - }else if(2 == flowType.intValue()){ - msgReplaceMap.put("bustype","账单"); - msgReplaceMap.put("contract", businessId.toString()); + + if(StringUtils.isBlank(email)){ + logger.info("phone:{},userName:{}邮件地址为空,不发送代办邮件",phone,userName); + }else{ + MailMsg mailMsg = new MailMsg(); + mailMsg.setSubject("待办通知"); + mailMsg.setHtml(true); + mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); + mailMsg.setModelType(EnumMailMsgModel.MAIL_ASSIGNEE_NODIFY.getCode()); + mailMsg.setModelId(EnumMsgModelId.MAIL_MSG_FLOW.getCode()); + mailMsg.setTo(new String[]{email}); + mailMsg.setTenantId(tenantId); + if(1 == flowType.intValue() || 3 == flowType.intValue()){ + msgReplaceMap.put("bustype","合同"); + }else if(2 == flowType.intValue()){ + msgReplaceMap.put("bustype","账单"); + msgReplaceMap.put("contract", businessId.toString()); + } + mailMsg.setDynamicContentMap(msgReplaceMap); + mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } - mailMsg.setDynamicContentMap(msgReplaceMap); - mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + } public String variablesToJson(List> variables){ @@ -765,6 +771,8 @@ public class WxFlowServiceImpl implements WxFlowService { } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else{ + logger.info("邮件地址为空,不发送审批通知邮件"); } return false; }else{ @@ -811,6 +819,8 @@ public class WxFlowServiceImpl implements WxFlowService { } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else{ + logger.info("邮件地址为空,不发送通过邮件"); } return true; } @@ -931,6 +941,8 @@ public class WxFlowServiceImpl implements WxFlowService { } mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); + }else{ + logger.info("邮件地址为空,不发送驳回邮件"); } return new ResultData(); } 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 099d0a612..b1d8a193d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -95,10 +95,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService //init dateDiff if(wxPropertyContract.getRentalStartDate() != null && wxPropertyContract.getRentalEndDate() != null){ - Calendar instance = Calendar.getInstance(); - instance.setTime(wxPropertyContract.getRentalEndDate()); - instance.add(Calendar.DATE, 1); - int[] array = DateUtils.getDiff(wxPropertyContract.getRentalStartDate(),instance.getTime()); + int[] array = DateUtils.getDiff(wxPropertyContract.getRentalStartDate(),wxPropertyContract.getRentalEndDate()); result.put("totalPeriodMonth",array[0]); result.put("totalPeriodDay",array[1]); } 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 9f523149f..8b3e645bd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -118,10 +118,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { //init dateDiff if(wxRentContract.getRentalStartDate() != null && wxRentContract.getRentalEndDate() != null){ - Calendar instance = Calendar.getInstance(); - instance.setTime(wxRentContract.getRentalEndDate()); - instance.add(Calendar.DATE, 1); - int[] array = DateUtils.getDiff(wxRentContract.getRentalStartDate(),instance.getTime()); + int[] array = DateUtils.getDiff(wxRentContract.getRentalStartDate(),wxRentContract.getRentalEndDate()); result.put("totalPeriodMonth",array[0]); result.put("totalPeriodDay",array[1]); } @@ -381,8 +378,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { } if(CollectionUtils.isEmpty(record.getPreviewBillRentList())) { - if (record.getReceivePeriod() != null && record.getLease() != null && record.getPrice() != null - && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0) && !record.getPrice().equals(0l)) { + if (record.getReceivePeriod() != null && record.getLease() != null + && !record.getReceivePeriod().equals(0) && !record.getLease().equals(0)) { //删除预账单,重新生成 wxBillRentMapper.deletePreviewBill(record); resultList = buildRent(new WxMerchant(), null, record, EnumIsPreview.YES.getCode()); @@ -659,6 +656,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { Long id = record.getId(); //审核流程中止 try { + // 修改合同审核状态 + WxRentContract rentContract = record; + rentContract.setId(id); + rentContract.setApplyStatus(EnumRentContractAppStatus.CANCLE.getCode()); + updateApplyStatus(rentContract); + logger.info("合同id:{},开始停止...", id); //结束审批流 by luozukai List tasks = taskService.createTaskQuery().processDefinitionKey(WxFlowServiceImpl.getFlowKeyByType(1)) @@ -668,12 +671,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("合同id:{},taskid:{}", id, task.getId()); runtimeService.deleteProcessInstance(task.getProcessInstanceId(), "合同作废"); - // 修改合同审核状态 - WxRentContract rentContract = record; - rentContract.setId(id); - rentContract.setApplyStatus(EnumRentContractAppStatus.CANCLE.getCode()); - updateApplyStatus(rentContract); - // 保存审批历史入 MallUserInfo mallUserInfo = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute("userSession"); WxFlowRecord updateRecord = new WxFlowRecord(); diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index d51f0b0a5..14f6230ba 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -316,7 +316,7 @@