From eafd2ce1e287cb2d74f917002feba224d92b3e15 Mon Sep 17 00:00:00 2001 From: Burce Date: Fri, 25 Oct 2019 18:34:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86][=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=8F=90=E9=86=92]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/schedule/InvestSchedule.java | 4 +- .../service/invest/InvestBaseService.java | 2 +- .../invest/impl/InvestBaseServiceImpl.java | 4 +- .../invest/impl/InvestBizServiceImpl.java | 44 ++++++++++--------- .../invest/impl/InvestTaskServiceImpl.java | 4 +- .../resources/mapper/InvestCustomerMapper.xml | 4 +- 6 files changed, 32 insertions(+), 30 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index 2659dca0d..e43508093 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -99,7 +99,7 @@ public class InvestSchedule { private void addTaskMessage(InvestTaskEntity task, List ownerArray) { String message = String.format(EnumInvestMessageType.TASK_REMIND.getInfo(), task.getId(), DateUtils.format(task.getLastTime())); - messageService.saveBatchMessage(ownerArray, message, EnumInvestMessageTag.TASK_MONTH, EnumFollowType.TASK, task.getId()); + messageService.saveBatchMessage(ownerArray, message, EnumInvestMessageTag.TASK_MONTH, EnumFollowType.TASK, task.getId(),task.getTenantId()); log.info("{}:taskID:{} 为用户{}创建消息提醒", PREFIX, task.getId(), task.getOwner()); } @@ -155,7 +155,7 @@ public class InvestSchedule { private void addCustomerMessage(InvestCustomerVo customerVo, Long owner) { String message = String.format(EnumInvestMessageType.COSTOMER_REMIND.getInfo(), customerVo.getId()); - messageService.saveBatchMessage(Arrays.asList(owner), message, EnumInvestMessageTag.CUSTOMER_WEEK, EnumFollowType.DEMAND, customerVo.getId()); + messageService.saveBatchMessage(Arrays.asList(owner), message, EnumInvestMessageTag.CUSTOMER_WEEK, EnumFollowType.DEMAND, customerVo.getId(),customerVo.getTenantId()); log.info("{}:customerID:{} 为用户{}创建消息提醒", PREFIX, customerVo.getId(), customerVo.getDemandOwner()); } } \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java index 98b5544f0..1ad68489d 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestBaseService.java @@ -33,7 +33,7 @@ public interface InvestBaseService { * @param tid * @return */ - default boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid) { + default boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid,String tenantId) { return false; } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index fbecc043f..9d4f7f736 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -104,7 +104,7 @@ public class InvestBaseServiceImpl, T> extends ServiceIm } @Override - public boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid) { + public boolean saveBatchMessage(List ownerArray, String message, EnumInvestMessageTag tag, EnumFollowType type, Long tid,String tenantId) { if (CollectionUtils.isEmpty(ownerArray)) { return false; } @@ -124,7 +124,7 @@ public class InvestBaseServiceImpl, T> extends ServiceIm messageEntity.setOwner(aLong); messageEntity.setTid(tid); messageEntity.setType(type); - messageEntity.setTenantId(InvestUserContext.getUser().getTenantId()); + messageEntity.setTenantId(tenantId); messageEntity.setMessage(message); messageEntity.setTag(tag); messageEntityList.add(messageEntity); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 2063e943a..97bd1eb37 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -758,7 +758,8 @@ public class InvestBizServiceImpl implements InvestBizService { Long owner = demandEntity.getOwner(); if (Objects.nonNull(owner) && !Objects.equals(owner, 0L)) { List ownerArray = Collections.singletonList(owner); - demandService.saveBatchMessage(ownerArray, EnumInvestMessageType.CUSTOMER_CREATE.getInfo(), EnumInvestMessageTag.CUSTOMER_CREATE, EnumFollowType.DEMAND, customerEntity.getId()); + demandService.saveBatchMessage(ownerArray, EnumInvestMessageType.CUSTOMER_CREATE.getInfo(), + EnumInvestMessageTag.CUSTOMER_CREATE, EnumFollowType.DEMAND, customerEntity.getId(),customerEntity.getTenantId()); } } @@ -948,28 +949,29 @@ public class InvestBizServiceImpl implements InvestBizService { } private void syncTargetStatus(InvestTaskEntity investTaskEntity) { - if (!Objects.equals(investTaskEntity.getTargetType(), EnumInvestType.RENT)) { - return; - } - WxShop shop = shopService.getById(investTaskEntity.getTargetId()); - Map shopContractMap = getWxRentContractMap(shop); - WxRentContract contract = shopContractMap.get(shop.getId()); - if (Objects.nonNull(contract)) { - InvestHelper.addContractId(investTaskEntity.getContent(), contract.getId(), null); - } else { - WxRentContract contractQuery = new WxRentContract(); - contractQuery.setTenantId(InvestUserContext.getUser().getTenantId()); - contractQuery.setShopId(investTaskEntity.getTargetId()); - contractQuery.setStatus(EnumRentContractStatus.INTENTION.getCode()); - //获取意向合同 - int count = rentContractService.selectContractCountByShopId(contractQuery); - if (count > 0) { - investTaskEntity.setStatus(EnumTaskStatus.INTENTION); - } - } + //if (!Objects.equals(investTaskEntity.getTargetType(), EnumInvestType.RENT)) { + // return; + //} - if (StringUtils.isNotBlank(investTaskEntity.getOwner()) && Objects.equals(EnumTaskStatus.CREATED, investTaskEntity.getStatus())) { + if (StringUtils.isNotBlank(investTaskEntity.getOwner())) { investTaskEntity.setStatus(EnumTaskStatus.NEGOTIATING); + } else { + WxShop shop = shopService.getById(investTaskEntity.getTargetId()); + Map shopContractMap = getWxRentContractMap(shop); + WxRentContract contract = shopContractMap.get(shop.getId()); + if (Objects.nonNull(contract)) { + InvestHelper.addContractId(investTaskEntity.getContent(), contract.getId(), null); + } else { + WxRentContract contractQuery = new WxRentContract(); + contractQuery.setTenantId(InvestUserContext.getUser().getTenantId()); + contractQuery.setShopId(investTaskEntity.getTargetId()); + contractQuery.setStatus(EnumRentContractStatus.INTENTION.getCode()); + //获取意向合同 + int count = rentContractService.selectContractCountByShopId(contractQuery); + if (count > 0) { + investTaskEntity.setStatus(EnumTaskStatus.INTENTION); + } + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java index 385187ae6..9bef2e11b 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java @@ -3,7 +3,6 @@ package com.iformall.service.invest.impl; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.iformall.common.TableLog; import com.iformall.domain.po.invest.InvestTaskEntity; import com.iformall.enums.EnumFollowType; import com.iformall.enums.EnumInvestMessageTag; @@ -56,7 +55,8 @@ public class InvestTaskServiceImpl extends InvestBaseServiceImpl ownerArray = JSONArray.parseArray(owner, Long.class); - this.saveBatchMessage(ownerArray, EnumInvestMessageType.TASK_CREATE.getInfo(), EnumInvestMessageTag.TASK_CREATE, EnumFollowType.TASK, entity.getId()); + this.saveBatchMessage(ownerArray, EnumInvestMessageType.TASK_CREATE.getInfo(), + EnumInvestMessageTag.TASK_CREATE, EnumFollowType.TASK, entity.getId(),entity.getTenantId()); } } diff --git a/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml index 53ea1daba..e968a5624 100644 --- a/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml +++ b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml @@ -25,13 +25,13 @@ LEFT JOIN `invest_demand` d ON d.id = f.`follow_id` LEFT JOIN invest_customer c ON d.`customer_id` = c.id where 1=1 - + AND c.type in #{idItem} - + AND d.id in #{idItem}