Skip to content

H
huhu-partner
Commit aeff05da by guanchen
Options

平推奖励只奖励一级

parent 112ad4b3
Showing with 87 additions and 101 deletions
src/main/java/com/lanren/huhu/partner/controller/AgentController.java
...@@ -20,8 +20,7 @@ import java.util.ArrayList; ...@@ -20,8 +20,7 @@ import java.util.ArrayList;
* @author chen * @author chen
*/ */
@RestController @RestController
@RequestMapping("/partner/v1/agent") //线上 @RequestMapping("/partner/v1/agent")
//@RequestMapping("/v1/agent") //测试
public class AgentController { public class AgentController {
private static Logger logger = LoggerFactory.getLogger(AgentController.class); private static Logger logger = LoggerFactory.getLogger(AgentController.class);
......
src/main/java/com/lanren/huhu/partner/controller/PartnerController.java
package com.lanren.huhu.partner.controller; import com.lanren.huhu.partner.manager.PartnerManager;import com.lanren.huhu.partner.model.Partner;import com.lanren.huhu.partner.model.PartnerResponse;import com.lanren.huhu.partner.result.Result;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.http.HttpHeaders;import org.springframework.web.bind.annotation.*; import javax.validation.Valid;import java.time.LocalDateTime; /** * @Author houseme * @Date 2019-06-26 11:00 * @Project partner * @Package com.lanren.huhu.partner.controller * @File: PartnerController */@RestController@RequestMapping("/partner/v1/partner") //线上 //@RequestMapping("/v1/partner") //测试 public class PartnerController { private static Logger logger = LoggerFactory.getLogger(PartnerController.class); @Autowired private PartnerManager partnerManager; @RequestMapping(value = "/level", method = RequestMethod.POST) public Result<PartnerResponse> getPartnerLevel(@RequestBody @Valid Partner partner, @RequestHeader HttpHeaders headers) { if (logger.isInfoEnabled()) { logger.info("getPartnerLevel userId:{},header:{},time:{}", partner.getUserId(), headers.keySet().toArray(), LocalDateTime.now()); } return partnerManager.getPartnerLevel(partner.getUserId()); } } package com.lanren.huhu.partner.controller; import com.lanren.huhu.partner.manager.PartnerManager;import com.lanren.huhu.partner.model.Partner;import com.lanren.huhu.partner.model.PartnerResponse;import com.lanren.huhu.partner.result.Result;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.http.HttpHeaders;import org.springframework.web.bind.annotation.*; import javax.validation.Valid;import java.time.LocalDateTime; /** * @Author houseme * @Date 2019-06-26 11:00 * @Project partner * @Package com.lanren.huhu.partner.controller * @File: PartnerController */@RestController@RequestMapping("/partner/v1/partner")public class PartnerController { private static Logger logger = LoggerFactory.getLogger(PartnerController.class); @Autowired private PartnerManager partnerManager; @RequestMapping(value = "/level", method = RequestMethod.POST) public Result<PartnerResponse> getPartnerLevel(@RequestBody @Valid Partner partner, @RequestHeader HttpHeaders headers) { if (logger.isInfoEnabled()) { logger.info("getPartnerLevel userId:{},header:{},time:{}", partner.getUserId(), headers.keySet().toArray(), LocalDateTime.now()); } return partnerManager.getPartnerLevel(partner.getUserId()); }}
\ No newline at end of file \ No newline at end of file
......
src/main/java/com/lanren/huhu/partner/controller/UserController.java
...@@ -19,8 +19,7 @@ import java.time.LocalDateTime; ...@@ -19,8 +19,7 @@ import java.time.LocalDateTime;
*/ */
@RestController @RestController
@EnableAsync @EnableAsync
@RequestMapping("/partner/v1/user") //线上 @RequestMapping("/partner/v1/user")
//@RequestMapping("/v1/user") //测试
public class UserController { public class UserController {
private static Logger logger = LoggerFactory.getLogger(UserController.class); private static Logger logger = LoggerFactory.getLogger(UserController.class);
......
src/main/java/com/lanren/huhu/partner/schedule/AgentRewardQueueTask.java
...@@ -151,37 +151,39 @@ public class AgentRewardQueueTask { ...@@ -151,37 +151,39 @@ public class AgentRewardQueueTask {
*/ */
ArrayList<ParentAgent> parentList = (ArrayList<ParentAgent>) userService.getAgentListByUserId(userAgent.getUserId(), PARENT_COLUMN_NAME_PINGTUI); ArrayList<ParentAgent> parentList = (ArrayList<ParentAgent>) userService.getAgentListByUserId(userAgent.getUserId(), PARENT_COLUMN_NAME_PINGTUI);
if (parentList.size() > 0) { if (parentList.size() > 0) {
// 此逻辑废弃, 平推奖励只找一个人, 比例只有一个
/** /**
* 扫描agentlist中的平推城市代理 * 扫描agentlist中的平推城市代理
* 最多只需要找2个 * 最多只需要找2个
*/ */
int rewardCnt = 0; // int rewardCnt = 0;
ArrayList<ParentAgent> rewardList = new ArrayList<ParentAgent>(); ArrayList<ParentAgent> rewardList = new ArrayList<ParentAgent>();
for (ParentAgent agent : parentList) { rewardList.add(parentList.get(0));
/** // for (ParentAgent agent : parentList) {
* 奖励次数不够2, 写到rewardList // /**
*/ // * 奖励次数不够2, 写到rewardList
if (rewardCnt < 2){ // */
rewardList.add(agent); // if (rewardCnt < 2){
rewardCnt++; // rewardList.add(agent);
/** // rewardCnt++;
* 如果找到总代 就不再往上找了 都给总代 // /**
*/ // * 如果找到总代 就不再往上找了 都给总代
if (agent.getLevel() == AGENT_LEVEL_1) { // */
break; // if (agent.getLevel() == AGENT_LEVEL_1) {
} // break;
/** // }
* 如果是AGENT_LEVEL_2 奖励类型 750 或 760, 只奖励1个人 并且只拿1份 // /**
*/ // * 如果是AGENT_LEVEL_2 奖励类型 750 或 760, 只奖励1个人 并且只拿1份
if (userAgent.getAgentLevel() == AGENT_LEVEL_2 && (rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER)) { // */
break; // if (userAgent.getAgentLevel() == AGENT_LEVEL_2 && (rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER)) {
} // break;
} else { // }
break; // } else {
} // break;
} // }
if (rewardList.size() > 2) { // }
logger.error("代理商推荐奖励处理异常 奖励人数超出2人, 奖励消息: {}", message); if (rewardList.size() > 1) {
logger.error("代理商推荐奖励处理异常 奖励人数超出1人, 奖励消息: {}", message);
return; return;
} }
/** /**
...@@ -189,25 +191,25 @@ public class AgentRewardQueueTask { ...@@ -189,25 +191,25 @@ public class AgentRewardQueueTask {
* 决定比例怎么分: 1个人-拿2份; 2个人-各1份 * 决定比例怎么分: 1个人-拿2份; 2个人-各1份
*/ */
List<BigDecimal> rateList = new ArrayList<BigDecimal>(); List<BigDecimal> rateList = new ArrayList<BigDecimal>();
if (rewardList.size() == 1) { rateList.add(rateMap.get(0));
/** // if (rewardList.size() == 1) {
* 如果直属层级代理商是AGENT_LEVEL_2 奖励类型 750 或 760 只拿1份 // /**
*/ // * 如果直属层级代理商是AGENT_LEVEL_2 奖励类型 750 或 760 只拿1份
if (userAgent.getAgentLevel() == AGENT_LEVEL_2 && // */
(rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER) ) { // if (userAgent.getAgentLevel() == AGENT_LEVEL_2 &&
rateList.add(rateMap.get(0)); // (rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER) ) {
} else { // rateList.add(rateMap.get(0));
rateList.add(rateMap.get(0).add(rateMap.get(1))); // } else {
} // rateList.add(rateMap.get(0).add(rateMap.get(1)));
} else if (rewardList.size() == 2) { // }
if (userAgent.getAgentLevel() == AGENT_LEVEL_2 && // } else if (rewardList.size() == 2) {
(rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER) ) { // if (userAgent.getAgentLevel() == AGENT_LEVEL_2 &&
logger.error("代理商推荐奖励逻辑处理错误, 直属代理商id: {}, rewardList[1]: {}", userAgent.getAgentId(), rewardList.get(1)); // (rewardType == AGENT_REWARD_TYPE_SELF_ORDER || rewardType == AGENT_REWARD_TYPE_SHARE_ORDER) ) {
} // logger.error("代理商推荐奖励逻辑处理错误, 直属代理商id: {}, rewardList[1]: {}", userAgent.getAgentId(), rewardList.get(1));
rateList.add(rateMap.get(0)); // }
rateList.add(rateMap.get(1)); // rateList.add(rateMap.get(0));
} // rateList.add(rateMap.get(1));
// }
TransactionStatus transactionStatus = null; TransactionStatus transactionStatus = null;
List<AgentReward> pushList = new ArrayList<AgentReward>(); List<AgentReward> pushList = new ArrayList<AgentReward>();
// List<AgentReward> pushRewardList = new ArrayList<AgentReward>(); // List<AgentReward> pushRewardList = new ArrayList<AgentReward>();
...@@ -331,7 +333,7 @@ public class AgentRewardQueueTask { ...@@ -331,7 +333,7 @@ public class AgentRewardQueueTask {
*/ */
BigDecimal rewardBasement; BigDecimal rewardBasement;
if (rewardType == AGENT_REWARD_TYPE_YEAR_VIP || rewardType == AGENT_REWARD_TYPE_HALF_YEAR_VIP || rewardType == AGENT_REWARD_TYPE_SVIP if (rewardType == AGENT_REWARD_TYPE_YEAR_VIP || rewardType == AGENT_REWARD_TYPE_HALF_YEAR_VIP || rewardType == AGENT_REWARD_TYPE_SVIP
|| rewardType == AGENT_REWARD_TYPE_REDPACK || rewardType == AGENT_REWARD_TYPE_VIP_PACKAGE || rewardType == AGENT_REWARD_TYPE_PACKAGE_WITH_VIP || rewardType == AGENT_REWARD_TYPE_VIP_PACKAGE || rewardType == AGENT_REWARD_TYPE_PACKAGE_WITH_VIP
|| rewardType == AGENT_REWARD_TYPE_VIP_CARD || rewardType == AGENT_REWARD_TYPE_SVIP_CARD) { || rewardType == AGENT_REWARD_TYPE_VIP_CARD || rewardType == AGENT_REWARD_TYPE_SVIP_CARD) {
rewardBasement = message.getSourceUserPayment(); rewardBasement = message.getSourceUserPayment();
} else { } else {
......
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