| @@ -8,7 +8,8 @@ import com.iformall.common.InvestResultData; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.InvestDemandEntity; | |||
| import com.iformall.domain.vo.invest.InvestDemandVo; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.service.invest.InvestDemandService; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| @@ -40,9 +41,9 @@ public class InvestDemandController { | |||
| @SystemServiceLog | |||
| @ApiOperation(value = "分页列表接口") | |||
| @GetMapping("/list") | |||
| public InvestResultData<InvestPage<InvestDemandVo>> list(@ModelAttribute InvestDemandEntity params) { | |||
| public InvestResultData<InvestPageResult<InvestDemandVo>> list(InvestPageQuery<InvestDemandEntity> params) { | |||
| try { | |||
| InvestPage<InvestDemandVo> page = investDemandService.queryPage(params); | |||
| InvestPageResult<InvestDemandVo> page = investDemandService.queryPage(params); | |||
| return new InvestResultData(page); | |||
| } catch (MallinkException e) { | |||
| log.error("list error", e); | |||
| @@ -6,7 +6,8 @@ import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.InvestResultData; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.InvestFollowRecordEntity; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.service.invest.InvestFollowRecordService; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| @@ -37,9 +38,9 @@ public class InvestFollowRecordController { | |||
| */ | |||
| @ApiOperation("分页列表接口") | |||
| @GetMapping("/list") | |||
| public InvestResultData<InvestPage<InvestFollowRecordEntity>> list(InvestFollowRecordEntity params) { | |||
| public InvestResultData<InvestPageResult<InvestFollowRecordEntity>> list(InvestPageQuery<InvestFollowRecordEntity> params) { | |||
| try { | |||
| InvestPage<InvestFollowRecordEntity> page = investFollowRecordService.queryPage(params); | |||
| InvestPageResult<InvestFollowRecordEntity> page = investFollowRecordService.queryPage(params); | |||
| return new InvestResultData(page); | |||
| } catch (MallinkException e) { | |||
| log.error("list error", e); | |||
| @@ -5,6 +5,7 @@ import java.util.List; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.InvestOperateRecordEntity; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.service.invest.InvestOperateRecordService; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| @@ -34,7 +35,7 @@ public class InvestOperateRecordController { | |||
| */ | |||
| @ApiOperation("分页列表接口") | |||
| @GetMapping("/list") | |||
| public ResultData list(@RequestBody InvestOperateRecordEntity params){ | |||
| public ResultData list(InvestPageQuery<InvestOperateRecordEntity> params){ | |||
| List page = investOperateRecordService.queryPage(params); | |||
| return new ResultData(page); | |||
| @@ -5,6 +5,7 @@ import java.util.List; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.InvestRemindEntity; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.service.invest.InvestRemindService; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| @@ -35,7 +36,7 @@ public class InvestRemindController { | |||
| */ | |||
| @ApiOperation("分页列表接口") | |||
| @GetMapping("/list") | |||
| public ResultData list(@RequestBody InvestRemindEntity params){ | |||
| public ResultData list(InvestPageQuery<InvestRemindEntity> params){ | |||
| List page = investRemindService.queryPage(params); | |||
| return new ResultData(page); | |||
| @@ -7,7 +7,8 @@ import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.InvestResultData; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.InvestTaskEntity; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.domain.vo.invest.InvestTaskVo; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.service.invest.InvestTaskService; | |||
| @@ -40,9 +41,9 @@ public class InvestTaskController { | |||
| @SystemServiceLog | |||
| @ApiOperation("分页列表接口") | |||
| @GetMapping("/list") | |||
| public InvestResultData<InvestPage<InvestTaskVo>> list(@ModelAttribute InvestTaskEntity params){ | |||
| public InvestResultData<InvestPageResult<InvestTaskVo>> list(InvestPageQuery<InvestTaskEntity> params){ | |||
| try { | |||
| InvestPage<InvestTaskVo> page = investTaskService.queryPage(params); | |||
| InvestPageResult<InvestTaskVo> page = investTaskService.queryPage(params); | |||
| return new InvestResultData(page); | |||
| } catch (MallinkException e) { | |||
| log.error("list error", e); | |||
| @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; | |||
| import com.google.common.collect.Lists; | |||
| import com.google.common.collect.Maps; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.enums.*; | |||
| import com.iformall.mapper.WxBrandMapper; | |||
| import com.iformall.service.MallUserInfoService; | |||
| @@ -255,7 +255,7 @@ public class InvestTests { | |||
| ObjectMapper mapper = objectMapper(); | |||
| List operates = operateRecordService.queryPage(null); | |||
| InvestPage follows = followRecordService.queryPage(null); | |||
| InvestPageResult follows = followRecordService.queryPage(null); | |||
| List customers = customerService.list(null); | |||
| List tasks = taskService.list(null); | |||
| List reminds = remindService.list(null); | |||
| @@ -284,7 +284,7 @@ public class InvestTests { | |||
| InvestDemandEntity demandQuery = new InvestDemandEntity(); | |||
| demandQuery.setPageNum(1); | |||
| demandQuery.setPageSize(10); | |||
| InvestPage page = demandService.queryPage(demandQuery); | |||
| InvestPageResult page = demandService.queryPage(demandQuery); | |||
| log.debug("page : {}", objectMapper().writeValueAsString(page)); | |||
| } | |||
| } | |||
| @@ -1,260 +0,0 @@ | |||
| package com.iformall.schedule.test; | |||
| import com.alibaba.fastjson.JSON; | |||
| import com.alibaba.fastjson.JSONObject; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.domain.dto.WxCUserBasicInfoDto; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.enums.EnumCouponSendSendType; | |||
| import com.iformall.mapper.WxCUserBasicInfoMapper; | |||
| import com.iformall.mapper.WxCUserMapper; | |||
| import com.iformall.mapper.WxCouponActionLogMapper; | |||
| import com.iformall.mapper.WxLevelConfigMapper; | |||
| import com.iformall.schedule.CouponSendSchedule; | |||
| import com.iformall.service.*; | |||
| import com.iformall.utils.CreditUtil; | |||
| import com.iformall.utils.DateUtils; | |||
| import lombok.extern.slf4j.Slf4j; | |||
| import org.junit.Test; | |||
| import org.junit.runner.RunWith; | |||
| import org.springframework.beans.factory.annotation.Autowired; | |||
| import org.springframework.boot.test.context.SpringBootTest; | |||
| import org.springframework.test.context.ActiveProfiles; | |||
| import org.springframework.test.context.junit4.SpringRunner; | |||
| import org.springframework.util.CollectionUtils; | |||
| import javax.annotation.Resource; | |||
| import java.text.DateFormat; | |||
| import java.text.SimpleDateFormat; | |||
| import java.time.LocalDateTime; | |||
| import java.time.LocalTime; | |||
| import java.time.ZoneId; | |||
| import java.time.temporal.TemporalAdjusters; | |||
| import java.util.*; | |||
| @Slf4j | |||
| @RunWith(SpringRunner.class) | |||
| @SpringBootTest | |||
| @ActiveProfiles("dev") | |||
| public class ScheduleTest { | |||
| private static final String TENANT_ID = "456"; | |||
| private static final int PAGE_INDEX = 1; | |||
| private static final int PAGE_SIZE = 10; | |||
| @Autowired | |||
| CouponSendSchedule couponSendSchedule; | |||
| @Autowired | |||
| WxCouponSendService wxCouponSendService; | |||
| @Autowired | |||
| WxScoreRulesService scoreRulesService; | |||
| @Resource | |||
| WxCUserBasicInfoMapper cUserBasicInfoMapper; | |||
| @Resource | |||
| WxCUserMapper cUserMapper; | |||
| @Resource | |||
| WxLevelConfigMapper levelConfigMapper; | |||
| @Resource | |||
| WxCouponActionLogMapper wxCouponActionLogMapper; | |||
| @Autowired | |||
| private WxCouponService couponService; | |||
| @Autowired | |||
| WxCreditHistoryService wxCreditHistoryService; | |||
| /** | |||
| * 添加会员生日券 | |||
| */ | |||
| //@Test | |||
| public void couponSend() { | |||
| //获取配置 | |||
| WxCouponSend config = wxCouponSendService.getConfig(EnumCouponSendSendType.BIRTHDAY.getCode(), TENANT_ID); | |||
| log.info("会员权益配置 config -> {}", JSON.toJSONString(config)); | |||
| //配置不存在,保存配置 | |||
| JSONObject couponSendJo = JSONObject.parseObject(config.getConditions()); | |||
| if (Objects.nonNull(couponSendJo)) { | |||
| wxCouponSendService.saveOrUpdateConfig(0, EnumCouponSendSendType.BIRTHDAY.getCode(), TENANT_ID); | |||
| } | |||
| WxCoupon couponQuery = new WxCoupon(); | |||
| couponQuery.setTenantId(TENANT_ID); | |||
| PageInfo<WxCoupon> pageInfo = couponService.listAsPage(couponQuery, PAGE_INDEX, PAGE_SIZE); | |||
| if (CollectionUtils.isEmpty(pageInfo.getList())) { | |||
| return; | |||
| } | |||
| WxCoupon coupon = pageInfo.getList().get(0); | |||
| WxCouponSend record = new WxCouponSend(); | |||
| record.setCouponId(coupon.getCouponId()); | |||
| record.setSendType(EnumCouponSendSendType.BIRTHDAY.getCode()); | |||
| record.setTenantId(TENANT_ID); | |||
| record.setTitle(coupon.getTitle()); | |||
| record.setCreateDate(new Date()); | |||
| wxCouponSendService.saveOrUpdate(record); | |||
| log.info("会员生日券 record -> {}", JSON.toJSONString(record)); | |||
| } | |||
| /** | |||
| * 获取列表 | |||
| */ | |||
| @Test | |||
| public void couponsendList() { | |||
| //生日券列表 | |||
| WxCouponSend birthQuery = new WxCouponSend(); | |||
| //birthQuery.setSendType(EnumCouponSendSendType.BIRTHDAY.getCode()); | |||
| //birthQuery.setTenantId(TENANT_ID); | |||
| //PageInfo birthPageInfo = wxCouponSendService.listAsPage(birthQuery, PAGE_INDEX, PAGE_SIZE); | |||
| //log.info(EnumCouponSendSendType.BIRTHDAY.getMessage() + "列表 -> {}", JSON.toJSONString(birthPageInfo)); | |||
| //商户注券列表 | |||
| WxCouponSend merchantQuery = new WxCouponSend(); | |||
| merchantQuery.setSendType(EnumCouponSendSendType.MERCHANT.getCode()); | |||
| merchantQuery.setTenantId(TENANT_ID); | |||
| merchantQuery.setSortColumn("createDate"); | |||
| merchantQuery.setSortOrder("desc"); | |||
| PageInfo merchantPageInfo = wxCouponSendService.listAsPage(merchantQuery, PAGE_INDEX, PAGE_SIZE); | |||
| log.info(EnumCouponSendSendType.BIRTHDAY.getMessage() + "列表 -> {}", JSON.toJSONString(merchantPageInfo)); | |||
| } | |||
| /** | |||
| * 生日券定时任务 | |||
| */ | |||
| @Test | |||
| public void birthdaySchedule() { | |||
| couponSendSchedule.birthdayCouponSendSchedule(); | |||
| } | |||
| @Test | |||
| public void findBirdayUser() { | |||
| DateFormat df = new SimpleDateFormat("MM-dd"); | |||
| int before = 10; | |||
| //未来10天时间 | |||
| Calendar today = Calendar.getInstance(); | |||
| Date begin = today.getTime(); | |||
| today.add(Calendar.DAY_OF_YEAR, before); | |||
| Date end = today.getTime(); | |||
| log.info("begin:{},end:{}", df.format(begin), df.format(end)); | |||
| List<WxCUserBasicInfo> users = cUserBasicInfoMapper.findBirthdayList("456", df.format(begin.getTime()), df.format(end.getTime())); | |||
| log.info("users -> {}", JSON.toJSONString(users)); | |||
| } | |||
| /** | |||
| * 会员积分倍率 | |||
| */ | |||
| @Test | |||
| public void scoreScale() { | |||
| //用户信息 | |||
| WxCUser cUserQuery = new WxCUser(); | |||
| cUserQuery.setPhone("15811234898"); | |||
| cUserQuery.setTenantId(TENANT_ID); | |||
| WxCUser cUser = cUserMapper.selectOne(cUserQuery); | |||
| WxCUserBasicInfo toUpdate = new WxCUserBasicInfo(); | |||
| toUpdate.setId(cUser.getId()); | |||
| //Calendar calendar = Calendar.getInstance() ; | |||
| //calendar.add(Calendar.DAY_OF_YEAR,2); | |||
| //toUpdate.setBirthdate(calendar.getTime()); | |||
| //cUserBasicInfoMapper.updateByPrimaryKeySelective(toUpdate) ; | |||
| WxCUserBasicInfo wxCUserBasicInfo = cUserBasicInfoMapper.selectByPrimaryKey(cUser.getId()); | |||
| //原始积分 | |||
| int creditOrigin = 1; | |||
| //获取等级倍率 | |||
| Integer levelScale = levelConfigMapper.getScale(cUser.getTenantId(), cUser.getScore()); | |||
| Integer score = CreditUtil.calUserCredit(creditOrigin, cUser, levelScale, wxCUserBasicInfo, scoreRulesService); | |||
| log.info("计算后积分 score {}", score); | |||
| ////如果享受了生日积分倍率,记录日期 | |||
| if (Objects.equals(CreditUtil.getIsBirthDayScale(), cUser.getId())) { | |||
| toUpdate.setScoreDate(new Date()); | |||
| cUserBasicInfoMapper.updateByPrimaryKeySelective(toUpdate); | |||
| CreditUtil.clear(); | |||
| } | |||
| } | |||
| /** | |||
| * 积分兑换 | |||
| */ | |||
| @Test | |||
| public void findByMerchantIdAndSpend() { | |||
| Long[] userIds = {291844648098332672L, 313534271008804864L, 321555911759462400L}; | |||
| for (Long id : userIds) { | |||
| Map<String, Integer> data = wxCreditHistoryService.findByMerchantIdAndSpend(264943049975529472L, "1", id, TENANT_ID); | |||
| log.info("data -> {}", JSON.toJSONString(data)); | |||
| } | |||
| } | |||
| /** | |||
| * 计算用户积分 | |||
| */ | |||
| @Test | |||
| public void usersScore() { | |||
| Date startTime = Date.from(LocalDateTime.now() | |||
| .with(TemporalAdjusters.firstDayOfYear()) | |||
| .with(LocalTime.MIN) | |||
| .atZone(ZoneId.systemDefault()) | |||
| .toInstant()); | |||
| Date endTime = Date.from(LocalDateTime.now() | |||
| .with(TemporalAdjusters.lastDayOfYear()) | |||
| .with(LocalTime.MAX) | |||
| .atZone(ZoneId.systemDefault()) | |||
| .toInstant()); | |||
| WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | |||
| wxCUserBasicInfoDto.setTenantId(TENANT_ID); | |||
| List<WxCUserBasicInfo> wxCUserBasicInfoList = null; | |||
| //cUserBasicInfoMapper.findBirthdayList(wxCUserBasicInfoDto); | |||
| if (!CollectionUtils.isEmpty(wxCUserBasicInfoList)) { | |||
| int beforeDays = 2; | |||
| wxCUserBasicInfoList.forEach(cu -> { | |||
| Map<String, Object> params = new HashMap<>(); | |||
| params.put("tenantId", cu.getTenantId()); | |||
| params.put("cUserId", cu.getId()); | |||
| params.put("couponId", null); | |||
| params.put("startTime", startTime); | |||
| params.put("endTime", endTime); | |||
| params.put("channelType", EnumCouponSendSendType.BIRTHDAY.getCode()); | |||
| int count = wxCouponActionLogMapper.getCountByUserAndCouponAndDate(params); | |||
| if (count > 0) { | |||
| log.info("会员{}已经发送过生日券, 本次不再发送", cu.getNickName()); | |||
| return; | |||
| } | |||
| int diffBithday = DateUtils.birthdaysBetween(cu.getBirthdate()); | |||
| StringBuilder tips = new StringBuilder(); | |||
| if (diffBithday > 0) { | |||
| tips.append("距离生日还有").append(diffBithday).append("天"); | |||
| } else if (diffBithday < 0) { | |||
| tips.append("生日已过").append(Math.abs(diffBithday)).append("天"); | |||
| } else { | |||
| tips.append("生日当天"); | |||
| } | |||
| //计算积分 | |||
| WxCUser cUserQuery = new WxCUser(); | |||
| cUserQuery.setTenantId(TENANT_ID); | |||
| cUserQuery.setPhone(cu.getPhone()); | |||
| WxCUser cUser = cUserMapper.selectOne(cUserQuery); | |||
| //消费奖励原始积分 | |||
| //calScore(cu, tips, cUser); | |||
| if (diffBithday < 0 && Math.abs(diffBithday) > beforeDays || diffBithday > beforeDays) { | |||
| log.info("[会员={},手机={},生日={} ,{}],不发短信", cu.getNickName(), cu.getPhone(), DateUtils.format(cu.getBirthdate()), tips); | |||
| return; | |||
| } | |||
| //发送生日券时更新生日标志 | |||
| //WxCUserBasicInfo toUpdate = new WxCUserBasicInfo(); | |||
| //toUpdate.setId(cu.getId()); | |||
| //toUpdate.setScoreDate(cu.getBirthdate()); | |||
| //cUserBasicInfoMapper.updateByPrimaryKeySelective(toUpdate); | |||
| log.error("[会员={},手机={},生日={} ,{}],发送短信", cu.getNickName(), cu.getPhone(), DateUtils.format(cu.getBirthdate()), tips); | |||
| }); | |||
| } | |||
| } | |||
| private void calScore(WxCUserBasicInfo cu, StringBuilder tips, WxCUser cUser) { | |||
| int creditOrigin = 1; | |||
| Integer levelScale = levelConfigMapper.getScale(cUser.getTenantId(), cUser.getScore()); | |||
| int score = CreditUtil.calUserCredit(creditOrigin, cUser, levelScale, cu, scoreRulesService); | |||
| log.info("[会员={},手机={},birthday={} , {} , 原始积分:{},计数后积分:{}]", cu.getNickName(), cu.getPhone(), DateUtils.format(cu.getBirthdate()), tips, creditOrigin, score); | |||
| } | |||
| } | |||
| @@ -52,25 +52,4 @@ public class BaseInvestEntity implements Serializable { | |||
| @JsonProperty(access = JsonProperty.Access.READ_ONLY) | |||
| @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||
| private Date updateDate; | |||
| @io.swagger.annotations.ApiModelProperty(value = "倒序字段集合", name = "descs") | |||
| @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) | |||
| @TableField(exist = false) | |||
| private List<String> descs; | |||
| @io.swagger.annotations.ApiModelProperty(value = "升序字段集合", name = "ascs") | |||
| @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) | |||
| @TableField(exist = false) | |||
| private List<String> ascs; | |||
| @io.swagger.annotations.ApiModelProperty(value = "当前页", name = "pageNum",example = "1") | |||
| @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) | |||
| @TableField(exist = false) | |||
| private Integer pageNum; | |||
| @io.swagger.annotations.ApiModelProperty(value = "每页数据", name = "pageSize",example = "10") | |||
| @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) | |||
| @TableField(exist = false) | |||
| private Integer pageSize ; | |||
| } | |||
| @@ -6,7 +6,7 @@ import java.util.Collections; | |||
| import java.util.List; | |||
| @Data | |||
| public class InvestPage<T> { | |||
| public class InvestPageResult<T> { | |||
| /** | |||
| * 查询数据列表 | |||
| @@ -2,6 +2,8 @@ package com.iformall.service.invest; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| import com.iformall.domain.po.InvestCustomerEntity; | |||
| import com.iformall.domain.po.InvestFollowRecordEntity; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import java.util.List; | |||
| @@ -14,6 +16,6 @@ import java.util.List; | |||
| */ | |||
| public interface InvestCustomerService extends IService<InvestCustomerEntity> { | |||
| List queryPage(InvestCustomerEntity params); | |||
| List queryPage(InvestPageQuery<InvestCustomerEntity> params); | |||
| } | |||
| @@ -1,9 +1,11 @@ | |||
| package com.iformall.service.invest; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| import com.iformall.domain.po.InvestCustomerEntity; | |||
| import com.iformall.domain.po.InvestDemandEntity; | |||
| import com.iformall.domain.vo.invest.InvestDemandVo; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| /** | |||
| * 客户需求 | |||
| @@ -14,7 +16,7 @@ import com.iformall.domain.vo.invest.InvestPage; | |||
| */ | |||
| public interface InvestDemandService extends IService<InvestDemandEntity> { | |||
| InvestPage<InvestDemandVo> queryPage(InvestDemandEntity params) throws Exception; | |||
| InvestPageResult<InvestDemandVo> queryPage(InvestPageQuery<InvestDemandEntity> params) throws Exception; | |||
| boolean saveCustomerAndDemand(InvestDemandVo customerDemandVo) ; | |||
| @@ -2,7 +2,8 @@ package com.iformall.service.invest; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| import com.iformall.domain.po.InvestFollowRecordEntity; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| /** | |||
| * 跟踪记录 | |||
| @@ -13,6 +14,6 @@ import com.iformall.domain.vo.invest.InvestPage; | |||
| */ | |||
| public interface InvestFollowRecordService extends IService<InvestFollowRecordEntity> { | |||
| InvestPage<InvestFollowRecordEntity> queryPage(InvestFollowRecordEntity params); | |||
| InvestPageResult<InvestFollowRecordEntity> queryPage(InvestPageQuery<InvestFollowRecordEntity> params); | |||
| } | |||
| @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray; | |||
| import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.enums.EnumInvestType; | |||
| import com.iformall.enums.EnumShopStatus; | |||
| import com.iformall.exception.MallinkException; | |||
| @@ -103,12 +104,12 @@ public class InvestHelper { | |||
| } | |||
| } | |||
| public static Page buildQueryPage(BaseInvestEntity entity) { | |||
| public static Page buildQueryPage(InvestPageQuery pageQuery) { | |||
| Page page = new Page(); | |||
| page.setCurrent(entity.getPageNum()); | |||
| page.setSize(entity.getPageSize()); | |||
| page.setAscs(entity.getAscs()); | |||
| page.setDescs(entity.getDescs()); | |||
| page.setCurrent(pageQuery.getPageNum()); | |||
| page.setSize(pageQuery.getPageSize()); | |||
| page.setAscs(pageQuery.getAscs()); | |||
| page.setDescs(pageQuery.getDescs()); | |||
| page.setOptimizeCountSql(true); | |||
| page.setSearchCount(true); | |||
| return page; | |||
| @@ -2,6 +2,7 @@ package com.iformall.service.invest; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| import com.iformall.domain.po.InvestOperateRecordEntity; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import java.util.List; | |||
| @@ -14,6 +15,6 @@ import java.util.List; | |||
| */ | |||
| public interface InvestOperateRecordService extends IService<InvestOperateRecordEntity> { | |||
| List queryPage(InvestOperateRecordEntity params); | |||
| List queryPage(InvestPageQuery<InvestOperateRecordEntity> params); | |||
| } | |||
| @@ -2,6 +2,7 @@ package com.iformall.service.invest; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| import com.iformall.domain.po.InvestRemindEntity; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import java.util.List; | |||
| import java.util.Map; | |||
| @@ -15,6 +16,6 @@ import java.util.Map; | |||
| */ | |||
| public interface InvestRemindService extends IService<InvestRemindEntity> { | |||
| List queryPage(InvestRemindEntity params); | |||
| List queryPage(InvestPageQuery<InvestRemindEntity> params); | |||
| } | |||
| @@ -2,7 +2,8 @@ package com.iformall.service.invest; | |||
| import com.baomidou.mybatisplus.extension.service.IService; | |||
| import com.iformall.domain.po.InvestTaskEntity; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.domain.vo.invest.InvestTaskVo; | |||
| /** | |||
| @@ -14,6 +15,6 @@ import com.iformall.domain.vo.invest.InvestTaskVo; | |||
| */ | |||
| public interface InvestTaskService extends IService<InvestTaskEntity> { | |||
| InvestPage<InvestTaskVo> queryPage(InvestTaskEntity params); | |||
| InvestPageResult<InvestTaskVo> queryPage(InvestPageQuery<InvestTaskEntity> params); | |||
| } | |||
| @@ -7,6 +7,7 @@ import com.iformall.common.TableLog; | |||
| import com.iformall.domain.po.InvestCustomerEntity; | |||
| import com.iformall.domain.po.WxBrand; | |||
| import com.iformall.domain.po.WxBusiness; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.mapper.InvestCustomerDao; | |||
| import com.iformall.service.WxBrandService; | |||
| @@ -27,7 +28,7 @@ public class InvestCustomerServiceImpl extends ServiceImpl<InvestCustomerDao, In | |||
| private WxBusinessService businessService ; | |||
| @Override | |||
| public List queryPage(InvestCustomerEntity params) { | |||
| public List queryPage(InvestPageQuery<InvestCustomerEntity> params) { | |||
| return this.list(); | |||
| } | |||
| @@ -1,12 +1,14 @@ | |||
| package com.iformall.service.invest.impl; | |||
| import com.baomidou.mybatisplus.core.conditions.Wrapper; | |||
| import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||
| import com.baomidou.mybatisplus.core.metadata.IPage; | |||
| import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||
| import com.iformall.common.TableLog; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.domain.vo.invest.InvestDemandVo; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.mapper.InvestDemandDao; | |||
| import com.iformall.service.MallUserInfoService; | |||
| import com.iformall.service.WxBrandService; | |||
| @@ -38,12 +40,14 @@ public class InvestDemandServiceImpl extends ServiceImpl<InvestDemandDao, Invest | |||
| private WxBrandService brandService; | |||
| @Override | |||
| public InvestPage<InvestDemandVo> queryPage(InvestDemandEntity params) { | |||
| public InvestPageResult<InvestDemandVo> queryPage(InvestPageQuery<InvestDemandEntity> params) { | |||
| InvestHelper.checkAllNotNull(params); | |||
| Page page = InvestHelper.buildQueryPage(params); | |||
| InvestPage<InvestDemandVo> investPage = new InvestPage<>(); | |||
| InvestPageResult<InvestDemandVo> investPage = new InvestPageResult<>(); | |||
| //1、客户需求 | |||
| IPage<InvestDemandEntity> demandPage = this.page(page); | |||
| InvestDemandEntity queryTask = params.getQueryData(); | |||
| LambdaQueryWrapper<InvestDemandEntity> queryWrapper = new LambdaQueryWrapper<>(queryTask); | |||
| IPage<InvestDemandEntity> demandPage = this.page(page,queryWrapper); | |||
| if (CollectionUtils.isEmpty(demandPage.getRecords())) { | |||
| return investPage; | |||
| } | |||
| @@ -1,13 +1,15 @@ | |||
| package com.iformall.service.invest.impl; | |||
| import com.baomidou.mybatisplus.core.conditions.Wrapper; | |||
| import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||
| import com.baomidou.mybatisplus.core.metadata.IPage; | |||
| import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.TableLog; | |||
| import com.iformall.domain.po.InvestFollowRecordEntity; | |||
| import com.iformall.domain.po.InvestTaskEntity; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.enums.EnumFollowType; | |||
| import com.iformall.exception.MallinkException; | |||
| import com.iformall.mapper.InvestFollowRecordDao; | |||
| @@ -32,11 +34,13 @@ public class InvestFollowRecordServiceImpl extends ServiceImpl<InvestFollowRecor | |||
| private InvestTaskService taskService ; | |||
| @Override | |||
| public InvestPage<InvestFollowRecordEntity> queryPage(InvestFollowRecordEntity params) { | |||
| public InvestPageResult<InvestFollowRecordEntity> queryPage(InvestPageQuery<InvestFollowRecordEntity> params) { | |||
| InvestHelper.checkAllNotNull(params); | |||
| Page page = InvestHelper.buildQueryPage(params); | |||
| InvestPage<InvestFollowRecordEntity> investPage = new InvestPage<>(); | |||
| IPage<InvestFollowRecordEntity> records = this.page(page) ; | |||
| InvestPageResult<InvestFollowRecordEntity> investPage = new InvestPageResult<>(); | |||
| InvestFollowRecordEntity queryTask = params.getQueryData(); | |||
| LambdaQueryWrapper<InvestFollowRecordEntity> queryWrapper = new LambdaQueryWrapper<>(queryTask); | |||
| IPage<InvestFollowRecordEntity> records = this.page(page,queryWrapper) ; | |||
| BeanUtils.copyProperties(records, investPage); | |||
| return investPage; | |||
| } | |||
| @@ -3,6 +3,7 @@ package com.iformall.service.invest.impl; | |||
| import com.baomidou.mybatisplus.core.conditions.Wrapper; | |||
| import com.iformall.common.TableLog; | |||
| import com.iformall.domain.po.InvestOperateRecordEntity; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.mapper.InvestOperateRecordDao; | |||
| import com.iformall.service.invest.InvestOperateRecordService; | |||
| import org.springframework.stereotype.Service; | |||
| @@ -15,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||
| public class InvestOperateRecordServiceImpl extends ServiceImpl<InvestOperateRecordDao, InvestOperateRecordEntity> implements InvestOperateRecordService { | |||
| @Override | |||
| public List queryPage(InvestOperateRecordEntity params) { | |||
| public List queryPage(InvestPageQuery<InvestOperateRecordEntity> params) { | |||
| return this.list() ; | |||
| } | |||
| @@ -3,6 +3,7 @@ package com.iformall.service.invest.impl; | |||
| import com.baomidou.mybatisplus.core.conditions.Wrapper; | |||
| import com.iformall.common.TableLog; | |||
| import com.iformall.domain.po.InvestRemindEntity; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.mapper.InvestRemindDao; | |||
| import com.iformall.service.invest.InvestRemindService; | |||
| import org.springframework.stereotype.Service; | |||
| @@ -15,7 +16,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||
| public class InvestRemindServiceImpl extends ServiceImpl<InvestRemindDao, InvestRemindEntity> implements InvestRemindService { | |||
| @Override | |||
| public List queryPage(InvestRemindEntity params) { | |||
| public List queryPage(InvestPageQuery<InvestRemindEntity> params) { | |||
| return this.list() ; | |||
| } | |||
| @@ -1,12 +1,15 @@ | |||
| package com.iformall.service.invest.impl; | |||
| import com.baomidou.mybatisplus.core.conditions.Wrapper; | |||
| import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||
| import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; | |||
| import com.baomidou.mybatisplus.core.metadata.IPage; | |||
| import com.baomidou.mybatisplus.core.toolkit.LambdaUtils; | |||
| import com.baomidou.mybatisplus.extension.plugins.pagination.Page; | |||
| import com.iformall.common.TableLog; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.domain.vo.invest.InvestDemandVo; | |||
| import com.iformall.domain.vo.invest.InvestPage; | |||
| import com.iformall.domain.vo.invest.InvestPageQuery; | |||
| import com.iformall.domain.vo.invest.InvestPageResult; | |||
| import com.iformall.domain.vo.invest.InvestTaskVo; | |||
| import com.iformall.mapper.InvestTaskDao; | |||
| import com.iformall.service.MallUserInfoService; | |||
| @@ -33,12 +36,16 @@ public class InvestTaskServiceImpl extends ServiceImpl<InvestTaskDao, InvestTask | |||
| private MallUserInfoService userInfoService; | |||
| @Override | |||
| public InvestPage<InvestTaskVo> queryPage(InvestTaskEntity params) { | |||
| public InvestPageResult<InvestTaskVo> queryPage(InvestPageQuery<InvestTaskEntity> params) { | |||
| InvestHelper.checkAllNotNull(params); | |||
| Page page = InvestHelper.buildQueryPage(params); | |||
| InvestPage<InvestTaskVo> investPage = new InvestPage<>(); | |||
| Page queryPage = InvestHelper.buildQueryPage(params); | |||
| //1、任务信息 | |||
| IPage<InvestTaskEntity> taskPage = this.page(page); | |||
| InvestTaskEntity queryTask = params.getQueryData(); | |||
| LambdaQueryWrapper<InvestTaskEntity> queryWrapper = new LambdaQueryWrapper<>(queryTask); | |||
| IPage<InvestTaskEntity> taskPage = this.page(queryPage, queryWrapper); | |||
| InvestPageResult<InvestTaskVo> investPage = new InvestPageResult<>(); | |||
| if (CollectionUtils.isEmpty(taskPage.getRecords())) { | |||
| return investPage; | |||
| } | |||