Commit 1a141efa by guanchen

更新汇总拓展用户

parent b5d62299
...@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; ...@@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope;
import org.springframework.data.redis.cache.RedisCacheConfiguration; import org.springframework.data.redis.cache.RedisCacheConfiguration;
import org.springframework.data.redis.cache.RedisCacheManager; import org.springframework.data.redis.cache.RedisCacheManager;
import org.springframework.data.redis.cache.RedisCacheWriter; import org.springframework.data.redis.cache.RedisCacheWriter;
...@@ -19,7 +20,6 @@ import org.springframework.data.redis.connection.lettuce.LettucePoolingClientCon ...@@ -19,7 +20,6 @@ import org.springframework.data.redis.connection.lettuce.LettucePoolingClientCon
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.RedisSerializationContext; import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.StringRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer;
import org.springframework.util.ObjectUtils;
/** /**
* @author houseme * @author houseme
...@@ -47,6 +47,7 @@ public class RedisConfiguration { ...@@ -47,6 +47,7 @@ public class RedisConfiguration {
} }
@Bean @Bean
@Scope("prototype")
public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) { public RedisTemplate redisTemplate(RedisConnectionFactory redisConnectionFactory) {
RedisTemplate redisTemplate = new RedisTemplate(); RedisTemplate redisTemplate = new RedisTemplate();
redisTemplate.setConnectionFactory(redisConnectionFactory); redisTemplate.setConnectionFactory(redisConnectionFactory);
...@@ -68,6 +69,7 @@ public class RedisConfiguration { ...@@ -68,6 +69,7 @@ public class RedisConfiguration {
} }
@Bean @Bean
@Scope("prototype")
public RedisTemplate redisTemplatePush(@Value("${spring.redis.database2}") int pushDb, public RedisTemplate redisTemplatePush(@Value("${spring.redis.database2}") int pushDb,
@Value("${spring.redis.host}") String host, @Value("${spring.redis.host}") String host,
@Value("${spring.redis.port}") int port, @Value("${spring.redis.port}") int port,
......
...@@ -35,7 +35,6 @@ public class Constants { ...@@ -35,7 +35,6 @@ public class Constants {
public static final int AGENT_LEVEL_2 = 2; public static final int AGENT_LEVEL_2 = 2;
public static final int AGENT_LEVEL_3 = 3; public static final int AGENT_LEVEL_3 = 3;
public static final int AGENT_LEVEL_4 = 4; public static final int AGENT_LEVEL_4 = 4;
public static final String DATE_FORMAT = "yyyy-MM-dd hh:mm:ss";
public static final String DISTRIBUTE_REDIS_LOCK_KEY = "huhu:partner:distribute:redis:key"; public static final String DISTRIBUTE_REDIS_LOCK_KEY = "huhu:partner:distribute:redis:key";
public static final String PARENT_COLUMN_NAME_CENGJI = "parent_agent_id"; public static final String PARENT_COLUMN_NAME_CENGJI = "parent_agent_id";
public static final String PARENT_COLUMN_NAME_PINGTUI = "presenter_id"; public static final String PARENT_COLUMN_NAME_PINGTUI = "presenter_id";
......
package com.lanren.huhu.partner.dao; package com.lanren.huhu.partner.dao;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lanren.huhu.partner.domain.PartnerInviteRelation; import com.lanren.huhu.partner.domain.PartnerInviteRelation;
import java.util.List;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.SelectProvider; import java.util.List;
@Mapper @Mapper
public interface PartnerInviteRelationMapper extends BaseMapper<PartnerInviteRelation> { public interface PartnerInviteRelationMapper extends BaseMapper<PartnerInviteRelation> {
...@@ -18,6 +19,14 @@ public interface PartnerInviteRelationMapper extends BaseMapper<PartnerInviteRel ...@@ -18,6 +19,14 @@ public interface PartnerInviteRelationMapper extends BaseMapper<PartnerInviteRel
int insertOrUpdateSelective(PartnerInviteRelation record); int insertOrUpdateSelective(PartnerInviteRelation record);
@SelectProvider(type = PartnerInviteRelationSqlProvider.class, method = "getPartnerInviteRelationListByRegDay") /**
List<PartnerInviteRelation> getPartnerInviteRelationListByRegDay(String datStr); * <p>
* 查询 : 根据state状态查询用户列表,分页显示
* 注意!!: 如果入参是有多个,需要加注解指定参数名才能在xml中取值
* </p>
*
* @param page 分页对象,xml中可以从里面进行取值,传递参数 Page 即自动分页,必须放在第一位(你可以继承Page实现自己的分页对象)
* @return 分页对象
*/
IPage<PartnerInviteRelation> selectPageByTs(Page<PartnerInviteRelation> page, @Param("beginTs") Long beginTs, @Param("endTs") Long endTs);
} }
\ No newline at end of file
package com.lanren.huhu.partner.dao;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
* @author chen
* @title: PartnerInviteRelationSqlProvider
* @projectName partner
* @description: TODO
* @package com.lanren.huhu.partner.dao
* @date 2019-07-08 17:57
*/
public class PartnerInviteRelationSqlProvider {
public String getPartnerInviteRelationListByRegDay(@Param("datStr") String datStr) {
return "SELECT * " +
"FROM partner_invite_relation " +
"WHERE regiter_time " +
"BETWEEN UNIX_TIMESTAMP('" + datStr + " 00:00:00') " +
"AND UNIX_TIMESTAMP('" + datStr + " 23:59:59');";
}
}
...@@ -39,7 +39,7 @@ public interface UserAgentMapper extends BaseMapper<UserAgent> { ...@@ -39,7 +39,7 @@ public interface UserAgentMapper extends BaseMapper<UserAgent> {
// @Select("SELECT b.* " + // @Select("SELECT b.* " +
// "FROM user_agent a " + // "FROM user_agent a " +
// "JOIN user_agent b on a.#{parentColumnName}=b.agent_id " + // "JOIN user_agent b on a.#{parentColumnName}=b.agent_id " +
// "WHERE a.user_id=#{userId}") // "WHERE b.user_id=#{userId}")
// List<UserAgent> getChildListByUserId(Integer userId, String parentColumnName); // List<UserAgent> getChildListByUserId(Integer userId, String parentColumnName);
@SelectProvider(type = UserAgentSqlProvider.class, method = "getChildListByUserId") @SelectProvider(type = UserAgentSqlProvider.class, method = "getChildListByUserId")
......
...@@ -71,6 +71,7 @@ public class AgentManager { ...@@ -71,6 +71,7 @@ public class AgentManager {
agentRewardMessage.setOrderSn("507596802910534728"); agentRewardMessage.setOrderSn("507596802910534728");
agentRewardMessage.setSubOrderSn("507596802910534728"); agentRewardMessage.setSubOrderSn("507596802910534728");
agentRewardMessage.setOrderCommission(new BigDecimal("35.400000")); agentRewardMessage.setOrderCommission(new BigDecimal("35.400000"));
agentRewardMessage.setSourceOrder("8888");
logger.info("写入队列"); logger.info("写入队列");
ops.leftPush(AGENT_REWARD_QUEUE_KEY, JSON.toJSONString(agentRewardMessage)); ops.leftPush(AGENT_REWARD_QUEUE_KEY, JSON.toJSONString(agentRewardMessage));
return new Result<>(); return new Result<>();
......
...@@ -31,6 +31,7 @@ public class AgentRewardMessage extends BaseModel { ...@@ -31,6 +31,7 @@ public class AgentRewardMessage extends BaseModel {
String orderTitle; String orderTitle;
String rewardTypeChild; String rewardTypeChild;
String orderRateArray; String orderRateArray;
String sourceOrder;
// public AgentRewardMessage(int rewardType, String rechargeTime, int sourceUserId, String referenceId, int agentId, BigDecimal agentReward, int settleState, String orderType, String orderSn, String subOrderSn, BigDecimal orderCommission) { // public AgentRewardMessage(int rewardType, String rechargeTime, int sourceUserId, String referenceId, int agentId, BigDecimal agentReward, int settleState, String orderType, String orderSn, String subOrderSn, BigDecimal orderCommission) {
// this.rewardType = rewardType; // this.rewardType = rewardType;
// this.rechargeTime = rechargeTime; // this.rechargeTime = rechargeTime;
......
package com.lanren.huhu.partner.schedule; package com.lanren.huhu.partner.schedule;
import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.lanren.huhu.partner.constants.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.lanren.huhu.partner.domain.AgentExpandDaily;
import com.lanren.huhu.partner.domain.AgentExpandDetail; import com.lanren.huhu.partner.domain.AgentExpandDetail;
import com.lanren.huhu.partner.domain.PartnerInviteRelation; import com.lanren.huhu.partner.domain.PartnerInviteRelation;
import com.lanren.huhu.partner.domain.UserAgent; import com.lanren.huhu.partner.model.ParentAgent;
import com.lanren.huhu.partner.model.User;
import com.lanren.huhu.partner.service.AgentExpandDailyService; import com.lanren.huhu.partner.service.AgentExpandDailyService;
import com.lanren.huhu.partner.service.AgentExpandDetailService; import com.lanren.huhu.partner.service.AgentExpandDetailService;
import com.lanren.huhu.partner.service.PartnerInviteRelationService; import com.lanren.huhu.partner.service.PartnerInviteRelationService;
import com.lanren.huhu.partner.service.UserService; import com.lanren.huhu.partner.service.UserService;
import com.lanren.huhu.partner.util.DateUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -18,9 +17,6 @@ import org.springframework.scheduling.annotation.Async; ...@@ -18,9 +17,6 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -37,6 +33,8 @@ import static com.lanren.huhu.partner.constants.Constants.PARENT_COLUMN_NAME_CEN ...@@ -37,6 +33,8 @@ import static com.lanren.huhu.partner.constants.Constants.PARENT_COLUMN_NAME_CEN
@Component @Component
public class AgentDailyExpandTask { public class AgentDailyExpandTask {
private static Logger logger = LoggerFactory.getLogger(AgentDailyExpandTask.class); private static Logger logger = LoggerFactory.getLogger(AgentDailyExpandTask.class);
private static final int PAGE_SIZE = 1000;
private static final long DELAY = 2 * 60 * 60 * 1000L;
@Autowired @Autowired
PartnerInviteRelationService partnerInviteRelationService; PartnerInviteRelationService partnerInviteRelationService;
...@@ -46,41 +44,56 @@ public class AgentDailyExpandTask { ...@@ -46,41 +44,56 @@ public class AgentDailyExpandTask {
AgentExpandDetailService agentExpandDetailService; AgentExpandDetailService agentExpandDetailService;
@Autowired @Autowired
AgentExpandDailyService agentExpandDailyService; AgentExpandDailyService agentExpandDailyService;
@Autowired
MybatisPlusProperties mybatisPlusProperties;
// @Scheduled(cron="0 5 */2 * * *") @Scheduled(fixedDelay = DELAY)
@Scheduled(fixedDelay = 10000L)
public void runScheduledTask() { public void runScheduledTask() {
logger.info("MapperLocations is: {}", mybatisPlusProperties.getMapperLocations()); try {
// logger.info("run AgentDailyExpandTask"); Date dat = new Date(System.currentTimeMillis() - DELAY);
// runSummary(); String datStr = DateUtils.format(dat, DateUtils.FORMAT_SHORT);
logger.info("run AgentDailyExpandTask {}", datStr);
runSummary(datStr);
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
} }
@Async @Async
public void runSummary() { public void runSummary(String datStr) {
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); try {
int now = (int)(System.currentTimeMillis() / 1000L); Date dat = DateUtils.parse(datStr, DateUtils.FORMAT_SHORT);
Date dat = new Date(System.currentTimeMillis() - 10 * 60 * 1000L); int now = (int)(System.currentTimeMillis() / 1000L);
String datStr = df.format(dat); int pageNo = 1;
datStr = "2019-07-06"; long beginTs = DateUtils.parse(datStr, DateUtils.FORMAT_SHORT).getTime() / 1000L;
List<PartnerInviteRelation> partnerInviteRelationList = partnerInviteRelationService.getPartnerInviteRelationListByRegDay(datStr); long endTs = beginTs + 24 * 60 * 60L - 1L;
for (PartnerInviteRelation partnerInviteRelation : partnerInviteRelationList) { while (true) {
List<UserAgent> userAgentList = userService.getUserAgentChildListByUserId(partnerInviteRelation.getUserId(), PARENT_COLUMN_NAME_CENGJI); Page<PartnerInviteRelation> page = new Page<PartnerInviteRelation>(pageNo, PAGE_SIZE);
for (UserAgent userAgent : userAgentList) { IPage<PartnerInviteRelation> ipage = partnerInviteRelationService.selectPageByTs(page, beginTs, endTs);
AgentExpandDetail detail = new AgentExpandDetail(); List<PartnerInviteRelation> partnerInviteRelationList = ipage.getRecords();
detail.setDat(dat); if (partnerInviteRelationList != null && partnerInviteRelationList.size() > 0) {
detail.setAgentId(userAgent.getAgentId()); for (PartnerInviteRelation partnerInviteRelation : partnerInviteRelationList) {
detail.setUserId(userAgent.getUserId()); List<ParentAgent> parentAgentList = userService.getAgentListByUserId(partnerInviteRelation.getUserId(), PARENT_COLUMN_NAME_CENGJI);
detail.setExpandUserId(partnerInviteRelation.getUserId()); for (ParentAgent parentAgent : parentAgentList) {
detail.setExpandUserRegTime(new Date(partnerInviteRelation.getRegiterTime() * 1000L)); AgentExpandDetail detail = new AgentExpandDetail();
detail.setCreatedAt(now); detail.setDat(dat);
detail.setUpdatedAt(now); detail.setAgentId(parentAgent.getAgentId());
agentExpandDetailService.insertOrUpdate(detail); detail.setUserId(parentAgent.getUserId());
detail.setExpandUserId(partnerInviteRelation.getUserId());
detail.setExpandUserRegTime(new Date(partnerInviteRelation.getRegiterTime() * 1000L));
detail.setCreatedAt(now);
detail.setUpdatedAt(now);
agentExpandDetailService.insertOrUpdate(detail);
}
}
if (partnerInviteRelationList.size() > 0) {
agentExpandDailyService.updateByDatByDetail(datStr);
}
pageNo++;
} else {
break;
}
} }
} } catch (Exception e) {
if (partnerInviteRelationList.size() > 0) { logger.error(e.getMessage(), e);
agentExpandDailyService.updateByDatByDetail(datStr);
} }
} }
} }
...@@ -25,8 +25,7 @@ import org.springframework.scheduling.annotation.Scheduled; ...@@ -25,8 +25,7 @@ import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils;
import sun.management.resources.agent;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -240,7 +239,11 @@ public class AgentRewardQueueTask { ...@@ -240,7 +239,11 @@ public class AgentRewardQueueTask {
agentReward.setAgentLevel(agent.getLevel()); agentReward.setAgentLevel(agent.getLevel());
agentReward.setUserId(agent.getUserId()); agentReward.setUserId(agent.getUserId());
agentReward.setRewardRemark(AGENT_REWARD_REMARK.get(message.getRewardType())); agentReward.setRewardRemark(AGENT_REWARD_REMARK.get(message.getRewardType()));
agentReward.setSourceOrder(message.getReferenceId()); if (StringUtils.isEmpty(message.getSourceOrder())) {
agentReward.setSourceOrder(message.getReferenceId());
} else {
agentReward.setSourceOrder(message.getSourceOrder());
}
agentReward.setSourceUserLevel(sourceUserLevel); agentReward.setSourceUserLevel(sourceUserLevel);
agentReward.setCreatedAt(System.currentTimeMillis() / 1000L); agentReward.setCreatedAt(System.currentTimeMillis() / 1000L);
agentReward.setCommissionRate(commissionRate); agentReward.setCommissionRate(commissionRate);
......
...@@ -2,7 +2,6 @@ package com.lanren.huhu.partner.schedule; ...@@ -2,7 +2,6 @@ package com.lanren.huhu.partner.schedule;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
/** /**
* @author chen * @author chen
...@@ -12,7 +11,7 @@ import org.springframework.stereotype.Component; ...@@ -12,7 +11,7 @@ import org.springframework.stereotype.Component;
* @package com.lanren.huhu.partner.schedule * @package com.lanren.huhu.partner.schedule
* @date 2019-07-02 15:45 * @date 2019-07-02 15:45
*/ */
@Component //@Component
public class PartnerSettleTask { public class PartnerSettleTask {
private static Logger logger = LoggerFactory.getLogger(PartnerSettleTask.class); private static Logger logger = LoggerFactory.getLogger(PartnerSettleTask.class);
......
package com.lanren.huhu.partner.service; package com.lanren.huhu.partner.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lanren.huhu.partner.domain.PartnerInviteRelation; import com.lanren.huhu.partner.domain.PartnerInviteRelation;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @title: ${NAME} * @title: ${NAME}
* @projectName partner * @projectName partner
...@@ -22,10 +25,5 @@ public interface PartnerInviteRelationService extends IService<PartnerInviteRela ...@@ -22,10 +25,5 @@ public interface PartnerInviteRelationService extends IService<PartnerInviteRela
int insertOrUpdateSelective(PartnerInviteRelation record); int insertOrUpdateSelective(PartnerInviteRelation record);
/** IPage<PartnerInviteRelation> selectPageByTs(Page<PartnerInviteRelation> page, Long beginTs, Long endTs);
* 根据日期查找新增用户
* @param datStr
* @return
*/
List<PartnerInviteRelation> getPartnerInviteRelationListByRegDay(String datStr);
} }
package com.lanren.huhu.partner.service.impl; package com.lanren.huhu.partner.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lanren.huhu.partner.dao.PartnerInviteRelationMapper;
import com.lanren.huhu.partner.domain.PartnerInviteRelation;
import com.lanren.huhu.partner.service.PartnerInviteRelationService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.lanren.huhu.partner.domain.PartnerInviteRelation;
import java.util.List; import java.util.List;
import com.lanren.huhu.partner.dao.PartnerInviteRelationMapper;
import com.lanren.huhu.partner.service.PartnerInviteRelationService;
/** /**
* @title: ${NAME} * @title: ${NAME}
* @projectName partner * @projectName partner
...@@ -41,8 +41,11 @@ public class PartnerInviteRelationServiceImpl extends ServiceImpl<PartnerInviteR ...@@ -41,8 +41,11 @@ public class PartnerInviteRelationServiceImpl extends ServiceImpl<PartnerInviteR
} }
@Override @Override
public List<PartnerInviteRelation> getPartnerInviteRelationListByRegDay(String datStr) { public IPage<PartnerInviteRelation> selectPageByTs(Page<PartnerInviteRelation> page, Long beginTs, Long endTs) {
logger.info("datStr is: {}", datStr); // 不进行 count sql 优化,解决 MP 无法自动优化 SQL 问题,这时候你需要自己查询 count 部分
return baseMapper.getPartnerInviteRelationListByRegDay(datStr); // page.setOptimizeCountSql(false);
// 当 total 为非 0 时(默认为 0),分页插件不会进行 count 查询
// 要点!! 分页返回的对象与传入的对象是同一个
return baseMapper.selectPageByTs(page, beginTs, endTs);
} }
} }
...@@ -102,7 +102,7 @@ mybatis-plus: ...@@ -102,7 +102,7 @@ mybatis-plus:
logging: logging:
level: level:
#打印SQL信息 #打印SQL信息
com.lanren.huhu.partner.dao: debug com.lanren.huhu.partner.dao: info
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<configuration> <configuration>
<property name="pattern" value="[%level] %d{yy-MM-dd HH:mm:ss.SSS} [%thread] %logger{50}:%line - %msg%n"/> <property name="pattern" value="[%level] %d{yy-MM-dd HH:mm:ss.SSS} [%thread] %logger{50}:%line - %msg%n"/>
<property name="log_file" value="@logfile_path@/@profiles.active@/@artifactId@-@profiles.active@"/> <property name="log_file" value="@logfile_path@/@profiles.active@/@artifactId@-@profiles.active@"/>
<property name="MaxHistory" value="15"/><!--日志保留天数--> <property name="MaxHistory" value="7"/><!--日志保留天数-->
<property name="MaxFileSize" value="1024MB"/><!--单个文件大小--> <property name="MaxFileSize" value="256MB"/><!--单个文件大小-->
<property name="totalSizeCap" value="1024MB"/><!--单个文件大小--> <property name="totalSizeCap" value="256MB"/><!--单个文件大小-->
<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender"> <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
......
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
id, user_id, direct_num, indirect_num, partner_level, invite_type, regiter_time, id, user_id, direct_num, indirect_num, partner_level, invite_type, regiter_time,
agent_id, parent_agent_list, active_order_id, invite_user_id, invite_partner_level, agent_id, parent_agent_list, active_order_id, invite_user_id, invite_partner_level,
amount, reward_type, coupon_id, indirect_invite_uid, indirect_partner_level, indirect_amount, amount, reward_type, coupon_id, indirect_invite_uid, indirect_partner_level, indirect_amount,
indirect_reward_type, indirect_coupon_id, `state`, active_time, settle_time, created_at, indirect_reward_type, indirect_coupon_id, `state`, active_time, settle_time, created_at,
updated_at, last_active_order_id, agent_level_one, agent_level_two, agent_level_three, updated_at, last_active_order_id, agent_level_one, agent_level_two, agent_level_three,
agent_level_four, agent_level_five agent_level_four, agent_level_five
</sql> </sql>
<update id="updateBatch" parameterType="java.util.List"> <update id="updateBatch" parameterType="java.util.List">
...@@ -207,22 +207,22 @@ ...@@ -207,22 +207,22 @@
<insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true"> <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
<!--@mbg.generated--> <!--@mbg.generated-->
insert into partner_invite_relation insert into partner_invite_relation
(user_id, direct_num, indirect_num, partner_level, invite_type, regiter_time, agent_id, (user_id, direct_num, indirect_num, partner_level, invite_type, regiter_time, agent_id,
parent_agent_list, active_order_id, invite_user_id, invite_partner_level, amount, parent_agent_list, active_order_id, invite_user_id, invite_partner_level, amount,
reward_type, coupon_id, indirect_invite_uid, indirect_partner_level, indirect_amount, reward_type, coupon_id, indirect_invite_uid, indirect_partner_level, indirect_amount,
indirect_reward_type, indirect_coupon_id, `state`, active_time, settle_time, created_at, indirect_reward_type, indirect_coupon_id, `state`, active_time, settle_time, created_at,
updated_at, last_active_order_id, agent_level_one, agent_level_two, agent_level_three, updated_at, last_active_order_id, agent_level_one, agent_level_two, agent_level_three,
agent_level_four, agent_level_five) agent_level_four, agent_level_five)
values values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
(#{item.userId}, #{item.directNum}, #{item.indirectNum}, #{item.partnerLevel}, #{item.inviteType}, (#{item.userId}, #{item.directNum}, #{item.indirectNum}, #{item.partnerLevel}, #{item.inviteType},
#{item.regiterTime}, #{item.agentId}, #{item.parentAgentList}, #{item.activeOrderId}, #{item.regiterTime}, #{item.agentId}, #{item.parentAgentList}, #{item.activeOrderId},
#{item.inviteUserId}, #{item.invitePartnerLevel}, #{item.amount}, #{item.rewardType}, #{item.inviteUserId}, #{item.invitePartnerLevel}, #{item.amount}, #{item.rewardType},
#{item.couponId}, #{item.indirectInviteUid}, #{item.indirectPartnerLevel}, #{item.indirectAmount}, #{item.couponId}, #{item.indirectInviteUid}, #{item.indirectPartnerLevel}, #{item.indirectAmount},
#{item.indirectRewardType}, #{item.indirectCouponId}, #{item.state}, #{item.activeTime}, #{item.indirectRewardType}, #{item.indirectCouponId}, #{item.state}, #{item.activeTime},
#{item.settleTime}, #{item.createdAt}, #{item.updatedAt}, #{item.lastActiveOrderId}, #{item.settleTime}, #{item.createdAt}, #{item.updatedAt}, #{item.lastActiveOrderId},
#{item.agentLevelOne}, #{item.agentLevelTwo}, #{item.agentLevelThree}, #{item.agentLevelFour}, #{item.agentLevelOne}, #{item.agentLevelTwo}, #{item.agentLevelThree}, #{item.agentLevelFour},
#{item.agentLevelFive}) #{item.agentLevelFive})
</foreach> </foreach>
</insert> </insert>
<insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.lanren.huhu.partner.domain.PartnerInviteRelation" useGeneratedKeys="true"> <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.lanren.huhu.partner.domain.PartnerInviteRelation" useGeneratedKeys="true">
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
#{agentLevelFour}, #{agentLevelFour},
#{agentLevelFive}, #{agentLevelFive},
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id = #{id}, id = #{id},
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
#{agentLevelFive}, #{agentLevelFive},
</if> </if>
</trim> </trim>
on duplicate key update on duplicate key update
<trim suffixOverrides=","> <trim suffixOverrides=",">
<if test="id != null"> <if test="id != null">
id = #{id}, id = #{id},
...@@ -627,4 +627,7 @@ ...@@ -627,4 +627,7 @@
</if> </if>
</trim> </trim>
</insert> </insert>
<select id="selectPageByTs" resultType="com.lanren.huhu.partner.domain.PartnerInviteRelation">
SELECT * FROM partner_invite_relation WHERE regiter_time BETWEEN #{beginTs} AND #{endTs}
</select>
</mapper> </mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment