diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java index 492ca2e03..5fe1c56f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java @@ -30,7 +30,6 @@ public class InvestBaseController extends BaseController { registerEnumEditor(dataBinder, EnumCustomerRatingType.class, "customerRatingType") ; registerEnumEditor(dataBinder, EnumTaskStatus.class, "taskStatus") ; registerEnumEditor(dataBinder, EnumFollowType.class, "type") ; - registerEnumEditor(dataBinder, EnumRemindDateType.class, "dateType") ; } public InvestResultData execute(T params, Function function) { diff --git a/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java b/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java index 0fea283bd..42f1966a1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java +++ b/mallinkAdmin/src/main/java/com/iformall/log/TableOperateAspect.java @@ -100,16 +100,20 @@ public class TableOperateAspect { Map afterMap = getFeildMap(arg); List content = getContent(beforeMap, afterMap); log.debug("operate content: {}", JSON.toJSONString(content)); - InvestOperateRecordEntity recordEntity = new InvestOperateRecordEntity(); if (CollectionUtils.isEmpty(content)) { return; } - recordEntity.setContent(JSON.toJSONString(content)); - recordEntity.setOperateType(operateType); - recordEntity.setTbl(getTbl(signature)); - recordEntity.setTid(tid); - operateRecordService.save(recordEntity); - log.debug("saveRecord: {}", JSON.toJSONString(recordEntity)); + List toSaveRecord = new ArrayList<>() ; + for (Object o : content) { + InvestOperateRecordEntity recordEntity = new InvestOperateRecordEntity(); + recordEntity.setContent(JSON.toJSONString(o)); + recordEntity.setOperateType(operateType); + recordEntity.setTbl(getTbl(signature)); + recordEntity.setTid(tid); + toSaveRecord.add(recordEntity) ; + } + operateRecordService.saveBatch(toSaveRecord); + log.debug("saveRecord: {}", JSON.toJSONString(content)); } private String getTbl(MethodSignature signature) { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java index df6cd49ca..bb692e34f 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/InvestSchedule.java @@ -92,7 +92,8 @@ public class InvestSchedule { //查询跟踪列表 List follows = followRecordService.listByTime(EnumFollowType.DEMAND, start.getTime()); - List demands = customerService.listByIds(InvestHelper.getIds(follows, InvestFollowRecordEntity::getFollowId), Arrays.asList(EnumCustomerType.INTENTIONAL, EnumCustomerType.POTENTIAL)); + List demands = customerService.listByIds(InvestHelper.getIds(follows, InvestFollowRecordEntity::getFollowId), + Arrays.asList(EnumCustomerType.INTENTIONAL.getCode(), EnumCustomerType.POTENTIAL.getCode())); /** * 已经已经提醒过的用户 diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerDao.java b/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java similarity index 87% rename from mallinkService/src/main/java/com/iformall/mapper/InvestCustomerDao.java rename to mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java index 5b6c6e5fc..4081a2050 100755 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerDao.java +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestCustomerMapper.java @@ -18,7 +18,7 @@ import java.util.List; * @date 2019-09-23 18:40:43 */ @Mapper -public interface InvestCustomerDao extends BaseMapper { +public interface InvestCustomerMapper extends BaseMapper { List listByIds(Collection ids, List type) ; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestDemandDao.java b/mallinkService/src/main/java/com/iformall/mapper/InvestDemandMapper.java similarity index 78% rename from mallinkService/src/main/java/com/iformall/mapper/InvestDemandDao.java rename to mallinkService/src/main/java/com/iformall/mapper/InvestDemandMapper.java index 8f4bcced5..ee83462ac 100755 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestDemandDao.java +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestDemandMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2019-09-23 18:40:42 */ @Mapper -public interface InvestDemandDao extends BaseMapper { +public interface InvestDemandMapper extends BaseMapper { } diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestFollowRecordDao.java b/mallinkService/src/main/java/com/iformall/mapper/InvestFollowRecordMapper.java similarity index 76% rename from mallinkService/src/main/java/com/iformall/mapper/InvestFollowRecordDao.java rename to mallinkService/src/main/java/com/iformall/mapper/InvestFollowRecordMapper.java index 5eacc2393..66c54769a 100755 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestFollowRecordDao.java +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestFollowRecordMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2019-09-23 18:40:43 */ @Mapper -public interface InvestFollowRecordDao extends BaseMapper { +public interface InvestFollowRecordMapper extends BaseMapper { } diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestMessageDao.java b/mallinkService/src/main/java/com/iformall/mapper/InvestMessageMapper.java similarity index 78% rename from mallinkService/src/main/java/com/iformall/mapper/InvestMessageDao.java rename to mallinkService/src/main/java/com/iformall/mapper/InvestMessageMapper.java index 10478dcaa..94f1bbbea 100755 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestMessageDao.java +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestMessageMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2019-09-23 18:40:43 */ @Mapper -public interface InvestMessageDao extends BaseMapper { +public interface InvestMessageMapper extends BaseMapper { } diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordDao.java b/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordDao.java deleted file mode 100755 index ff14ccab8..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordDao.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iformall.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.iformall.domain.po.invest.InvestOperateRecordEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 操作记录 - * - * @author - * @email - * @date 2019-09-23 18:40:43 - */ -@Mapper -public interface InvestOperateRecordDao extends BaseMapper { - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordMapper.java new file mode 100755 index 000000000..cf4617218 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestOperateRecordMapper.java @@ -0,0 +1,22 @@ +package com.iformall.mapper; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.iformall.domain.po.invest.InvestOperateRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 操作记录 + * + * @author + * @email + * @date 2019-09-23 18:40:43 + */ +@Mapper +public interface InvestOperateRecordMapper extends BaseMapper { + + long selectCustomerPageCount(Long tid) ; + List selectCustomerPageByTid(Long tid, Integer limitStart, Integer limitSize); +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestRemindDao.java b/mallinkService/src/main/java/com/iformall/mapper/InvestRemindMapper.java similarity index 78% rename from mallinkService/src/main/java/com/iformall/mapper/InvestRemindDao.java rename to mallinkService/src/main/java/com/iformall/mapper/InvestRemindMapper.java index a18ae7eaa..fc8f49518 100755 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestRemindDao.java +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestRemindMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2019-09-23 18:40:43 */ @Mapper -public interface InvestRemindDao extends BaseMapper { +public interface InvestRemindMapper extends BaseMapper { } diff --git a/mallinkService/src/main/java/com/iformall/mapper/InvestTaskDao.java b/mallinkService/src/main/java/com/iformall/mapper/InvestTaskMapper.java similarity index 79% rename from mallinkService/src/main/java/com/iformall/mapper/InvestTaskDao.java rename to mallinkService/src/main/java/com/iformall/mapper/InvestTaskMapper.java index aef2c9230..6cd4681c0 100755 --- a/mallinkService/src/main/java/com/iformall/mapper/InvestTaskDao.java +++ b/mallinkService/src/main/java/com/iformall/mapper/InvestTaskMapper.java @@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2019-09-23 18:40:43 */ @Mapper -public interface InvestTaskDao extends BaseMapper { +public interface InvestTaskMapper extends BaseMapper { } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java index 1cfc2038d..dc1faa4d4 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestOperateRecordService.java @@ -2,9 +2,12 @@ package com.iformall.service.invest; import com.baomidou.mybatisplus.extension.service.IService; import com.iformall.domain.po.invest.InvestOperateRecordEntity; +import com.iformall.domain.vo.invest.InvestOperateRecordQuery; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; +import java.util.List; + /** * 操作记录 * @@ -15,5 +18,7 @@ import com.iformall.domain.vo.invest.InvestPageResult; public interface InvestOperateRecordService extends IService,InvestBaseService { InvestPageResult queryPage(InvestPageQuery params); + + InvestPageResult selectPageByTid(InvestOperateRecordQuery recordQuery); } 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 f99786a85..b1ea7956e 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 @@ -306,7 +306,7 @@ public class InvestBizServiceImpl implements InvestBizService { remindPageQuery.setQueryData(remindQuery); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.ge(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getBeginDate, getDayStart(params.getRemindDate())); - //queryWrapper.le(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); + queryWrapper.ge(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); queryWrapper.orderByDesc(InvestRemindEntity::getCreateDate); InvestPageResult recordPage = remindService.queryPage(remindPageQuery, queryWrapper); if (CollectionUtils.isEmpty(recordPage.getRecords())) { @@ -522,43 +522,28 @@ public class InvestBizServiceImpl implements InvestBizService { public InvestPageResult findOperateListById(InvestOperateRecordQuery params) { InvestHelper.notNull(params, params.getRecordType(), params.getTid()); InvestPageResult investPage = new InvestPageResult<>(); - LambdaQueryWrapper recordQueryWrapper = new LambdaQueryWrapper<>(); - InvestDemandEntity demandEntity; - List demandRecord = new ArrayList<>(); - if (Objects.equals(params.getRecordType(), EnumFollowType.DEMAND)) { - InvestCustomerEntity customerEntity = customerService.getByIdNotNull(params.getTid()); - demandEntity = demandService.getOne(new LambdaQueryWrapper().eq(InvestDemandEntity::getCustomerId, customerEntity.getId())); - buildQueryWrapper(recordQueryWrapper, InvestOperateRecordEntity.TLB_CUSTOMER, customerEntity.getId()); - if (Objects.nonNull(demandEntity)) { - LambdaQueryWrapper demandQueryWrapper = new LambdaQueryWrapper<>(); - buildQueryWrapper(demandQueryWrapper, InvestOperateRecordEntity.TLB_DEMAND, demandEntity.getId()); - demandRecord.addAll(operateRecordService.list(demandQueryWrapper)); - } - } else if (Objects.equals(params.getRecordType(), EnumFollowType.TASK)) { - buildQueryWrapper(recordQueryWrapper, InvestOperateRecordEntity.TLB_TASK, params.getTid()); - } - - Collection resultList = new ArrayList<>(); - List recordPage = operateRecordService.list(recordQueryWrapper); - recordPage.addAll(demandRecord); - if (CollectionUtils.isEmpty(recordPage)) { + InvestPageResult entityPageList = operateRecordService.selectPageByTid(params); + if (entityPageList.getSize() == 0) { return investPage; } - List mixRecordPage = recordPage.parallelStream().sorted((o1, o2) -> { - if (Objects.equals(o1.getCreateDate(), o2.getCreateDate())) { - return 0; - } else if (o1.getCreateDate().after(o2.getCreateDate())) { - return 1; - } else { - return -1; - } - }).collect(Collectors.toList()); - Map usersMap = getMap(userInfoService.getByIds(getIds(mixRecordPage, InvestOperateRecordEntity::getOperator)), MallUserInfo::getId); - for (InvestOperateRecordEntity recordEntity : mixRecordPage) { - List record = JSONArray.parseArray(recordEntity.getContent(), TableTriple.class); - resultList.addAll(getRecordList(recordEntity, record, usersMap.get(recordEntity.getOperator()))); + Collection recordList = entityPageList.getRecords(); + Map usersMap = getMap(userInfoService.getByIds(getIds(recordList, InvestOperateRecordEntity::getOperator)), MallUserInfo::getId); + + List resultList = new ArrayList<>(); + for (InvestOperateRecordEntity recordEntity : recordList) { + InvestOperateRecordVo itemVo = new InvestOperateRecordVo(); + BeanUtils.copyProperties(recordEntity, itemVo); + MallUserInfo userInfo = usersMap.get(recordEntity.getOperator()); + if (Objects.nonNull(userInfo)) { + itemVo.setOperatorName(userInfo.getName()); + } + TableTriple content = JSON.parseObject(recordEntity.getContent(), TableTriple.class); + itemVo.setRecord(content); + resultList.add(itemVo); } + BeanUtils.copyProperties(entityPageList, investPage); + investPage.setRecords(resultList); return investPage; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java index a84af1d59..cfb7558c0 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java @@ -6,7 +6,7 @@ import com.iformall.common.TableLog; import com.iformall.domain.po.invest.InvestCustomerEntity; import com.iformall.domain.vo.invest.InvestCustomerVo; import com.iformall.enums.EnumCustomerType; -import com.iformall.mapper.InvestCustomerDao; +import com.iformall.mapper.InvestCustomerMapper; import com.iformall.service.WxBrandService; import com.iformall.service.WxBusinessService; import com.iformall.service.invest.InvestCustomerService; @@ -21,7 +21,7 @@ import java.util.Objects; import static com.iformall.service.invest.InvestHelper.isTrue; @Service -public class InvestCustomerServiceImpl extends InvestBaseServiceImpl implements InvestCustomerService { +public class InvestCustomerServiceImpl extends InvestBaseServiceImpl implements InvestCustomerService { @Autowired private WxBrandService brandService; @@ -77,6 +77,6 @@ public class InvestCustomerServiceImpl extends InvestBaseServiceImpl listByIds(Collection idList, List type) { - return getBaseMapper().listByIds(idList, type); + return super.baseMapper.listByIds(idList,type); } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java index ea1c6eb0b..7556d2a13 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java @@ -4,11 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.iformall.common.TableLog; import com.iformall.domain.po.invest.InvestDemandEntity; -import com.iformall.enums.EnumCustomerType; -import com.iformall.enums.EnumFollowType; -import com.iformall.enums.EnumInvestMessageTag; -import com.iformall.enums.EnumInvestMessageType; -import com.iformall.mapper.InvestDemandDao; +import com.iformall.mapper.InvestDemandMapper; import com.iformall.service.MallUserInfoService; import com.iformall.service.WxShopService; import com.iformall.service.invest.InvestCustomerService; @@ -16,12 +12,11 @@ import com.iformall.service.invest.InvestDemandService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.io.Serializable; import java.util.*; @Service -public class InvestDemandServiceImpl extends InvestBaseServiceImpl implements InvestDemandService { +public class InvestDemandServiceImpl extends InvestBaseServiceImpl implements InvestDemandService { @Autowired private WxShopService shopService; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java index c9ea2e401..f8f0a72b0 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java @@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.iformall.common.ErrorCode; import com.iformall.domain.po.invest.InvestFollowRecordEntity; -import com.iformall.domain.po.invest.InvestTaskEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.domain.vo.invest.InvestUserContext; import com.iformall.enums.EnumFollowType; -import com.iformall.mapper.InvestFollowRecordDao; +import com.iformall.mapper.InvestFollowRecordMapper; import com.iformall.service.invest.InvestDemandService; import com.iformall.service.invest.InvestFollowRecordService; import com.iformall.service.invest.InvestHelper; @@ -22,7 +21,7 @@ import java.util.List; import java.util.Objects; @Service -public class InvestFollowRecordServiceImpl extends InvestBaseServiceImpl implements InvestFollowRecordService { +public class InvestFollowRecordServiceImpl extends InvestBaseServiceImpl implements InvestFollowRecordService { @Autowired private InvestDemandService demandService ; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java index b6f1b83dc..50ce6d2c1 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestMessageServiceImpl.java @@ -7,7 +7,7 @@ import com.iformall.domain.po.invest.InvestMessageEntity; import com.iformall.domain.vo.invest.InvestUserContext; import com.iformall.enums.EnumFollowType; import com.iformall.enums.EnumInvestMessageTag; -import com.iformall.mapper.InvestMessageDao; +import com.iformall.mapper.InvestMessageMapper; import com.iformall.service.invest.InvestHelper; import com.iformall.service.invest.InvestMessageService; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import java.util.List; @Service -public class InvestMessageServiceImpl extends InvestBaseServiceImpl implements InvestMessageService { +public class InvestMessageServiceImpl extends InvestBaseServiceImpl implements InvestMessageService { @Override public boolean save(InvestMessageEntity entity) { diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestOperateRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestOperateRecordServiceImpl.java index 8eaadda81..fc9c8cbbe 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestOperateRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestOperateRecordServiceImpl.java @@ -2,15 +2,23 @@ package com.iformall.service.invest.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.iformall.domain.po.invest.InvestOperateRecordEntity; +import com.iformall.domain.vo.invest.InvestOperateRecordQuery; +import com.iformall.domain.vo.invest.InvestPageQuery; +import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.domain.vo.invest.InvestUserContext; -import com.iformall.mapper.InvestOperateRecordDao; +import com.iformall.enums.EnumFollowType; +import com.iformall.mapper.InvestOperateRecordMapper; import com.iformall.service.invest.InvestHelper; import com.iformall.service.invest.InvestOperateRecordService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Objects; + @Service -public class InvestOperateRecordServiceImpl extends InvestBaseServiceImpl implements InvestOperateRecordService { +public class InvestOperateRecordServiceImpl extends InvestBaseServiceImpl implements InvestOperateRecordService { @Override public boolean save(InvestOperateRecordEntity entity) { @@ -44,4 +52,29 @@ public class InvestOperateRecordServiceImpl extends InvestBaseServiceImpl selectPageByTid(InvestOperateRecordQuery recordQuery) { + if (Objects.equals(recordQuery.getRecordType(), EnumFollowType.DEMAND)) { + InvestPageResult pageResult = new InvestPageResult<>(); + long count = super.baseMapper.selectCustomerPageCount(recordQuery.getTid()); + if (count == 0) { + return pageResult; + } + pageResult.setTotal(count); + pageResult.setSize(recordQuery.getPageSize()); + pageResult.setCurrent(recordQuery.getPageNum()); + Integer limitStart = (recordQuery.getPageNum() - 1) * recordQuery.getPageSize(); + Integer limitSize = recordQuery.getPageSize(); + List data = super.baseMapper.selectCustomerPageByTid(recordQuery.getTid(), limitStart, limitSize); + pageResult.setRecords(data); + return pageResult; + } else { + InvestOperateRecordEntity params = new InvestOperateRecordEntity(); + params.setTid(recordQuery.getTid()); + params.setTbl(InvestOperateRecordEntity.TLB_TASK); + InvestPageQuery pageQuery = new InvestPageQuery<>(params); + BeanUtils.copyProperties(recordQuery, pageQuery); + return this.queryPage(pageQuery); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java index b12460a69..5312e9808 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java @@ -2,10 +2,9 @@ package com.iformall.service.invest.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.iformall.domain.po.invest.InvestRemindEntity; import com.iformall.domain.vo.invest.InvestUserContext; -import com.iformall.mapper.InvestRemindDao; +import com.iformall.mapper.InvestRemindMapper; import com.iformall.service.invest.InvestRemindService; import org.springframework.stereotype.Service; @@ -13,7 +12,7 @@ import java.util.Objects; @Service -public class InvestRemindServiceImpl extends InvestBaseServiceImpl implements InvestRemindService { +public class InvestRemindServiceImpl extends InvestBaseServiceImpl implements InvestRemindService { @Override public boolean save(InvestRemindEntity entity) { 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 5a97f25c6..bae85d9c9 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 @@ -9,7 +9,7 @@ import com.iformall.enums.EnumFollowType; import com.iformall.enums.EnumInvestMessageTag; import com.iformall.enums.EnumInvestMessageType; import com.iformall.enums.EnumTaskStatus; -import com.iformall.mapper.InvestTaskDao; +import com.iformall.mapper.InvestTaskMapper; import com.iformall.service.MallUserInfoService; import com.iformall.service.WxShopService; import com.iformall.service.invest.InvestTaskService; @@ -21,7 +21,7 @@ import java.util.*; @Service -public class InvestTaskServiceImpl extends InvestBaseServiceImpl implements InvestTaskService { +public class InvestTaskServiceImpl extends InvestBaseServiceImpl implements InvestTaskService { @Autowired private WxShopService shopService; diff --git a/mallinkService/src/main/resources/mapper/InvestCustomerDao.xml b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml similarity index 90% rename from mallinkService/src/main/resources/mapper/InvestCustomerDao.xml rename to mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml index d8498fa40..41b888b62 100644 --- a/mallinkService/src/main/resources/mapper/InvestCustomerDao.xml +++ b/mallinkService/src/main/resources/mapper/InvestCustomerMapper.xml @@ -1,7 +1,7 @@ - + @@ -18,7 +18,7 @@ - select c.*,d.`id` as demandId,d.`owner` as demandOwner from `invest_follow_record` f LEFT JOIN `invest_demand` d ON d.id = f.`follow_id` diff --git a/mallinkService/src/main/resources/mapper/InvestDemandDao.xml b/mallinkService/src/main/resources/mapper/InvestDemandMapper.xml similarity index 92% rename from mallinkService/src/main/resources/mapper/InvestDemandDao.xml rename to mallinkService/src/main/resources/mapper/InvestDemandMapper.xml index b36178de1..c31c890b1 100644 --- a/mallinkService/src/main/resources/mapper/InvestDemandDao.xml +++ b/mallinkService/src/main/resources/mapper/InvestDemandMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/InvestFollowRecordDao.xml b/mallinkService/src/main/resources/mapper/InvestFollowRecordMapper.xml similarity index 92% rename from mallinkService/src/main/resources/mapper/InvestFollowRecordDao.xml rename to mallinkService/src/main/resources/mapper/InvestFollowRecordMapper.xml index 2c4d2bf08..f7edbe4c3 100644 --- a/mallinkService/src/main/resources/mapper/InvestFollowRecordDao.xml +++ b/mallinkService/src/main/resources/mapper/InvestFollowRecordMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/InvestMessageDao.xml b/mallinkService/src/main/resources/mapper/InvestMessageMapper.xml similarity index 91% rename from mallinkService/src/main/resources/mapper/InvestMessageDao.xml rename to mallinkService/src/main/resources/mapper/InvestMessageMapper.xml index 3dfa8e4ae..8af5fb5a9 100644 --- a/mallinkService/src/main/resources/mapper/InvestMessageDao.xml +++ b/mallinkService/src/main/resources/mapper/InvestMessageMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/InvestOperateRecordDao.xml b/mallinkService/src/main/resources/mapper/InvestOperateRecordDao.xml deleted file mode 100644 index 00c2d48e6..000000000 --- a/mallinkService/src/main/resources/mapper/InvestOperateRecordDao.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/mallinkService/src/main/resources/mapper/InvestOperateRecordMapper.xml b/mallinkService/src/main/resources/mapper/InvestOperateRecordMapper.xml new file mode 100644 index 000000000..31bf1341b --- /dev/null +++ b/mallinkService/src/main/resources/mapper/InvestOperateRecordMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mallinkService/src/main/resources/mapper/InvestRemindDao.xml b/mallinkService/src/main/resources/mapper/InvestRemindMapper.xml similarity index 92% rename from mallinkService/src/main/resources/mapper/InvestRemindDao.xml rename to mallinkService/src/main/resources/mapper/InvestRemindMapper.xml index b1ef972f5..215503b91 100644 --- a/mallinkService/src/main/resources/mapper/InvestRemindDao.xml +++ b/mallinkService/src/main/resources/mapper/InvestRemindMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/mallinkService/src/main/resources/mapper/InvestTaskDao.xml b/mallinkService/src/main/resources/mapper/InvestTaskMapper.xml similarity index 92% rename from mallinkService/src/main/resources/mapper/InvestTaskDao.xml rename to mallinkService/src/main/resources/mapper/InvestTaskMapper.xml index e3342b4c1..71ffbd7a6 100644 --- a/mallinkService/src/main/resources/mapper/InvestTaskDao.xml +++ b/mallinkService/src/main/resources/mapper/InvestTaskMapper.xml @@ -1,7 +1,7 @@ - +