Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
huhu-partner
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guanchen
huhu-partner
Commits
b8246889
Commit
b8246889
authored
Dec 05, 2019
by
guanchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
上线美团酒店,途牛,饿了么平推奖励
parent
1a9bd326
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
36 additions
and
107 deletions
+36
-107
Constants.java
...ain/java/com/lanren/huhu/partner/constants/Constants.java
+22
-65
AgentController.java
...a/com/lanren/huhu/partner/controller/AgentController.java
+0
-24
PartnerController.java
...com/lanren/huhu/partner/controller/PartnerController.java
+2
-2
AgentManager.java
...in/java/com/lanren/huhu/partner/manager/AgentManager.java
+0
-13
PartnerManager.java
.../java/com/lanren/huhu/partner/manager/PartnerManager.java
+2
-2
AgentRewardQueueTask.java
...om/lanren/huhu/partner/schedule/AgentRewardQueueTask.java
+10
-1
AgentSettleTask.java
...ava/com/lanren/huhu/partner/schedule/AgentSettleTask.java
+0
-0
PartnerSettleTask.java
...a/com/lanren/huhu/partner/schedule/PartnerSettleTask.java
+0
-0
No files found.
src/main/java/com/lanren/huhu/partner/constants/Constants.java
View file @
b8246889
...
...
@@ -29,8 +29,13 @@ public class Constants {
public
static
final
String
AGENT_REWARD_TYPE_SELF_ORDER_REMARK
=
"推荐奖励-自购省"
;
public
static
final
int
AGENT_REWARD_TYPE_SHARE_ORDER
=
760
;
public
static
final
String
AGENT_REWARD_TYPE_SHARE_ORDER_REMARK
=
"推荐奖励-分享赚"
;
public
static
final
int
AGENT_REWARD_TYPE_VIP_PACKAGE
=
780
;
public
static
final
String
AGENT_REWARD_TYPE_VIP_PACKAGE_REMARK
=
"推荐奖励-VIP礼包"
;
public
static
final
int
JD_OFFSET
=
1000
;
//用于查找京东的平推奖励比例
public
static
final
int
MT_OFFSET
=
2000
;
//用于查找美团的平推奖励比例
public
static
final
int
TN_OFFSET
=
3000
;
//用于查找途牛的平推奖励比例
public
static
final
int
MTJD_OFFSET
=
4000
;
//用于查找美团酒店的平推奖励比例
public
static
final
int
ELM_OFFSET
=
5000
;
//用于查找饿了么的平推奖励比例
public
static
Map
<
Integer
,
Map
<
Integer
,
BigDecimal
>>
AGENT_RATE_MAP
=
new
HashMap
<
Integer
,
Map
<
Integer
,
BigDecimal
>>();
public
static
Map
<
Integer
,
String
>
AGENT_REWARD_REMARK
=
new
HashMap
<
Integer
,
String
>();
public
static
final
int
AGENT_LEVEL_1
=
1
;
...
...
@@ -42,6 +47,9 @@ public class Constants {
public
static
final
String
PARENT_COLUMN_NAME_PINGTUI
=
"presenter_id"
;
public
static
final
String
ORDER_TYPE_JD
=
"jd"
;
public
static
final
String
ORDER_TYPE_MT
=
"mt"
;
public
static
final
String
ORDER_TYPE_TN
=
"tuniu"
;
public
static
final
String
ORDER_TYPE_MTJD
=
"mt_jd"
;
public
static
final
String
ORDER_TYPE_ELM
=
"elm"
;
/**
* 回扣类型
*/
...
...
@@ -66,12 +74,7 @@ public class Constants {
public
static
final
int
SETTLE_STATE_PRE
=
200
;
public
static
final
int
SETTLE_STATE_DONE
=
300
;
public
static
final
int
SETTLE_STATE_FAILED
=
-
300
;
/**
* 财务结算状态
*/
public
static
final
int
REWARD_STATUS_UNSETTLE
=
100
;
public
static
final
int
REWARD_STATUS_SETTLE
=
120
;
// public static final int REWARD_STATUS_FAILED = 99;
/**
* 最小奖励金额 小于此不写入
*/
...
...
@@ -82,63 +85,12 @@ public class Constants {
*/
public
static
final
String
AGENT_REWARD_PUSH_KEY
=
"agent:reward:queue"
;
/**
* 合伙人
*/
public
static
final
int
PARTNER_REWARD_TYPE_REDPACK
=
60
;
public
static
final
String
PARTNER_REWARD_TYPE_REDPACK_REMARK
=
"用户在线充值"
;
public
static
final
int
PARTNER_REWARD_TYPE_VIP
=
70
;
public
static
final
String
PARTNER_REWARD_TYPE_VIP_REMARK
=
"升高开户充值"
;
public
static
final
int
PARTNER_REWARD_TYPE_INVITE
=
80
;
public
static
final
String
PARTNER_REWARD_TYPE_INVITE_REMARK
=
"邀请奖励"
;
public
static
final
int
PARTNER_REWARD_TYPE_ORDER_ACTIVE
=
90
;
public
static
final
String
PARTNER_REWARD_TYPE_ORDER_ACTIVE_REMARK
=
"下单奖励"
;
public
static
final
int
PARTNER_REWARD_TYPE_SVIP
=
100
;
public
static
final
String
PARTNER_REWARD_TYPE_SVIP_REMARK
=
"购买超级VIP会员"
;
public
static
final
int
PARTNER_REWARD_TYPE_PURCHASE
=
110
;
public
static
final
String
PARTNER_REWARD_TYPE_PURCHASE_REMARK
=
"购物奖励"
;
public
static
final
int
PARTNER_REWARD_TYPE_SHARE
=
120
;
public
static
final
String
PARTNER_REWARD_TYPE_SHARE_REMARK
=
"分享赚奖励"
;
/**
* 订单状态
*/
public
static
final
int
ORDER_STATE_FAILED
=
-
3
;
public
static
final
int
ORDER_STATE_PAID
=
1
;
public
static
final
int
ORDER_STATE_SETTLED
=
3
;
/**
* 阶梯算税
*/
public
static
final
BigDecimal
TAX_STAGE_FREE_BASE
=
new
BigDecimal
(
"800"
);
public
static
final
BigDecimal
TAX_STAGE_1
=
new
BigDecimal
(
"4000"
);
public
static
final
BigDecimal
TAX_STAGE_1_RATE1
=
new
BigDecimal
(
"0.2"
);
//800-4000
public
static
final
BigDecimal
TAX_STAGE_1_RATE2
=
new
BigDecimal
(
"0.76"
);
public
static
final
BigDecimal
TAX_STAGE_WX_MAX
=
new
BigDecimal
(
"17076.5"
);
//4000-17076.5
public
static
final
BigDecimal
TAX_STAGE_WX_MAX_RATE1
=
new
BigDecimal
(
"0.8"
);
//
public
static
final
BigDecimal
TAX_STAGE_WX_MAX_RATE2
=
new
BigDecimal
(
"0.2"
);
//
public
static
final
BigDecimal
TAX_STAGE_WX_MAX_RATE3
=
new
BigDecimal
(
"0.76"
);
//
public
static
final
BigDecimal
BANK_RATE
=
new
BigDecimal
(
"0.1"
);
/**
* 合伙人变更记录
*/
public
static
final
int
PARTNER_ACCOUNT_LOG_TYPE_SETTLE
=
50
;
public
static
final
String
PARTNER_ACCOUNT_LOG_TYPE_SETTLE_REMARK
=
"月结发钱"
;
public
static
final
int
PARTNER_ACCOUNT_LOG_TYPE_TECH_CHARGE
=
80
;
public
static
final
String
PARTNER_ACCOUNT_LOG_TYPE_TECH_CHARGE_REMARK
=
"平台技术服务费"
;
public
static
final
int
PARTNER_ACCOUNT_LOG_TYPE_TAX
=
70
;
public
static
final
String
PARTNER_ACCOUNT_LOG_TYPE_TAX_REMARK
=
"代扣个人所得税"
;
/**
* 代理商奖励类型
*/
public
static
final
int
AGENT_REWARD_TYPE_PURCHASE
=
300
;
public
static
final
int
AGENT_REWARD_TYPE_SHARE
=
60
;
static
{
/**
* 代理商平推奖励比例配置
*/
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_YEAR_VIP
,
new
HashMap
<
Integer
,
BigDecimal
>());
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_VIP_PACKAGE
,
new
HashMap
<
Integer
,
BigDecimal
>());
// AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_HALF_YEAR_VIP, new HashMap<Integer, BigDecimal>());
// AGENT_RATE_MAP.put(AGENT_REWARD_TYPE_SVIP, new HashMap<Integer, BigDecimal>());
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_REDPACK
,
new
HashMap
<
Integer
,
BigDecimal
>());
...
...
@@ -147,17 +99,15 @@ public class Constants {
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_SELF_ORDER
+
JD_OFFSET
,
new
HashMap
<
Integer
,
BigDecimal
>());
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_SHARE_ORDER
+
JD_OFFSET
,
new
HashMap
<
Integer
,
BigDecimal
>());
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_SELF_ORDER
+
MT_OFFSET
,
new
HashMap
<
Integer
,
BigDecimal
>());
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_SELF_ORDER
+
TN_OFFSET
,
new
HashMap
<
Integer
,
BigDecimal
>());
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_SELF_ORDER
+
MTJD_OFFSET
,
new
HashMap
<
Integer
,
BigDecimal
>());
AGENT_RATE_MAP
.
put
(
AGENT_REWARD_TYPE_SELF_ORDER
+
ELM_OFFSET
,
new
HashMap
<
Integer
,
BigDecimal
>());
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_YEAR_VIP
).
put
(
0
,
new
BigDecimal
(
"0.02512563"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_YEAR_VIP
).
put
(
1
,
new
BigDecimal
(
"0.01507538"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_VIP_PACKAGE
).
put
(
0
,
new
BigDecimal
(
"0.02512563"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_VIP_PACKAGE
).
put
(
1
,
new
BigDecimal
(
"0.01507538"
));
// AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_HALF_YEAR_VIP).put(0, new BigDecimal("0.03015075"));
// AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_HALF_YEAR_VIP).put(1, new BigDecimal("0.01256281"));
// AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_HALF_YEAR_VIP).put(2, new BigDecimal("0.00753769"));
//
// AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SVIP).put(0, new BigDecimal("0.02500000"));
// AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SVIP).put(1, new BigDecimal("0.01111111"));
// AGENT_RATE_MAP.get(AGENT_REWARD_TYPE_SVIP).put(2, new BigDecimal("0.00555556"));
/**
* 红包
*/
...
...
@@ -172,6 +122,12 @@ public class Constants {
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
JD_OFFSET
).
put
(
1
,
new
BigDecimal
(
"0.0087"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
MT_OFFSET
).
put
(
0
,
new
BigDecimal
(
"0.01"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
MT_OFFSET
).
put
(
1
,
new
BigDecimal
(
"0.01"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
TN_OFFSET
).
put
(
0
,
new
BigDecimal
(
"0.01"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
TN_OFFSET
).
put
(
1
,
new
BigDecimal
(
"0.01"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
MTJD_OFFSET
).
put
(
0
,
new
BigDecimal
(
"0.01"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
MTJD_OFFSET
).
put
(
1
,
new
BigDecimal
(
"0.01"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
ELM_OFFSET
).
put
(
0
,
new
BigDecimal
(
"0.01"
));
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SELF_ORDER
+
ELM_OFFSET
).
put
(
1
,
new
BigDecimal
(
"0.01"
));
/**
* 分享赚
*/
...
...
@@ -181,6 +137,7 @@ public class Constants {
AGENT_RATE_MAP
.
get
(
AGENT_REWARD_TYPE_SHARE_ORDER
+
JD_OFFSET
).
put
(
1
,
new
BigDecimal
(
"0.0087"
));
AGENT_REWARD_REMARK
.
put
(
AGENT_REWARD_TYPE_YEAR_VIP
,
AGENT_REWARD_TYPE_YEAR_VIP_REMARK
);
AGENT_REWARD_REMARK
.
put
(
AGENT_REWARD_TYPE_VIP_PACKAGE
,
AGENT_REWARD_TYPE_VIP_PACKAGE_REMARK
);
// AGENT_REWARD_REMARK.put(AGENT_REWARD_TYPE_HALF_YEAR_VIP, AGENT_REWARD_TYPE_HALF_YEAR_VIP_REMARK);
// AGENT_REWARD_REMARK.put(AGENT_REWARD_TYPE_SVIP, AGENT_REWARD_TYPE_SVIP_REMARK);
AGENT_REWARD_REMARK
.
put
(
AGENT_REWARD_TYPE_REDPACK
,
AGENT_REWARD_TYPE_REDPACK_REMARK
);
...
...
src/main/java/com/lanren/huhu/partner/controller/AgentController.java
View file @
b8246889
...
...
@@ -6,7 +6,6 @@ import com.lanren.huhu.partner.model.AgentResponse;
import
com.lanren.huhu.partner.model.ParentAgent
;
import
com.lanren.huhu.partner.result.Result
;
import
com.lanren.huhu.partner.schedule.AgentDailyExpandTask
;
import
com.lanren.huhu.partner.schedule.AgentSettleTask
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -29,8 +28,6 @@ public class AgentController {
AgentManager
agentManager
;
@Autowired
AgentDailyExpandTask
agentDailyExpandTask
;
@Autowired
AgentSettleTask
agentSettleTask
;
@RequestMapping
(
value
=
"/level"
,
method
=
RequestMethod
.
POST
)
public
Result
<
AgentResponse
>
getAgentLevel
(
@RequestBody
@Valid
Agent
agent
,
@RequestHeader
HttpHeaders
headers
)
{
...
...
@@ -69,25 +66,4 @@ public class AgentController {
result
.
setData
(
"异步,正在执行刷新......"
);
return
result
;
}
/**
* 测试使用 结算单个代理商
*/
@RequestMapping
(
value
=
"/finance"
,
method
=
RequestMethod
.
POST
)
public
Result
<
String
>
doFinanceSettle
(
@RequestBody
@Valid
Agent
agent
,
@RequestHeader
HttpHeaders
headers
)
{
if
(
logger
.
isInfoEnabled
())
{
logger
.
info
(
"doFinanceSettle userId:{},header:{},time:{}"
,
agent
.
getAgentId
(),
headers
.
keySet
().
toArray
(),
LocalDateTime
.
now
());
}
return
agentManager
.
doFinanceSettle
(
agent
.
getAgentId
());
}
/**
* 结算全部代理商
*/
@RequestMapping
(
value
=
"/finance"
,
method
=
RequestMethod
.
GET
)
public
Result
<
String
>
doFinanceSettle
(
@RequestHeader
HttpHeaders
headers
)
{
agentSettleTask
.
runScheduledTask
();
logger
.
info
(
"============>"
+
Thread
.
currentThread
().
getName
());
Result
<
String
>
result
=
new
Result
<
String
>();
result
.
setData
(
"异步,正在执行刷新......"
);
return
result
;
}
}
src/main/java/com/lanren/huhu/partner/controller/PartnerController.java
View file @
b8246889
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
com.lanren.huhu.partner.schedule.PartnerSettleTask
;
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
(
"/v1/partner"
)
public
class
PartnerController
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
PartnerController
.
class
);
@Autowired
private
PartnerManager
partnerManager
;
@Autowired
private
PartnerSettleTask
partnerSettleTask
;
@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
());
}
/** * 测试使用 结算单个用户 */
@RequestMapping
(
value
=
"/finance"
,
method
=
RequestMethod
.
POST
)
public
Result
<
String
>
doFinanceSettle
(
@RequestBody
@Valid
Partner
partner
,
@RequestHeader
HttpHeaders
headers
)
{
if
(
logger
.
isInfoEnabled
())
{
logger
.
info
(
"doFinanceSettle userId:{},header:{},time:{}"
,
partner
.
getUserId
(),
headers
.
keySet
().
toArray
(),
LocalDateTime
.
now
());
}
return
partnerManager
.
doFinanceSettle
(
partner
.
getUserId
());
}
/** * 结算全部用户 */
@RequestMapping
(
value
=
"/finance"
,
method
=
RequestMethod
.
GET
)
public
Result
<
String
>
doFinanceSettle
(
@RequestHeader
HttpHeaders
headers
)
{
partnerSettleTask
.
runSettle
();
logger
.
info
(
"============>"
+
Thread
.
currentThread
().
getName
());
Result
<
String
>
result
=
new
Result
<
String
>();
result
.
setData
(
"异步,正在执行刷新......"
);
return
result
;
}
// /** // * 汇总合伙人已结算数据 // */ // @RequestMapping(value = "/summary/{dateStr}/{uid}", method = RequestMethod.GET) // public Result<String> doSummarySettled(@PathVariable("dateStr") String dateStr, @PathVariable("uid") int uid, @RequestHeader HttpHeaders headers) { // return partnerManager.runSummary(dateStr, uid); // } }
\ No newline at end of file
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
(
"/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
...
...
src/main/java/com/lanren/huhu/partner/manager/AgentManager.java
View file @
b8246889
...
...
@@ -6,7 +6,6 @@ import com.lanren.huhu.partner.model.AgentResponse;
import
com.lanren.huhu.partner.model.AgentRewardMessage
;
import
com.lanren.huhu.partner.model.ParentAgent
;
import
com.lanren.huhu.partner.result.Result
;
import
com.lanren.huhu.partner.schedule.AgentSettleTask
;
import
com.lanren.huhu.partner.service.UserAgentService
;
import
com.lanren.huhu.partner.service.UserService
;
import
org.slf4j.Logger
;
...
...
@@ -34,8 +33,6 @@ public class AgentManager {
@Autowired
StringRedisTemplate
redisTemplate
;
@Autowired
AgentSettleTask
agentSettleTask
;
@Autowired
UserService
userService
;
/***
...
...
@@ -106,14 +103,4 @@ public class AgentManager {
result
.
setData
(
parentAgents
);
return
result
;
}
public
Result
<
String
>
doFinanceSettle
(
int
agentId
)
{
Result
<
String
>
result
=
new
Result
<
String
>();
if
(
agentSettleTask
.
doOneAgentSettle
(
agentId
))
{
result
.
setCode
(
0
);
}
else
{
result
.
setCode
(
500
);
}
return
result
;
}
}
src/main/java/com/lanren/huhu/partner/manager/PartnerManager.java
View file @
b8246889
package
com
.
lanren
.
huhu
.
partner
.
manager
;
import
com.lanren.huhu.partner.domain.PartnerAccount
;
import
com.lanren.huhu.partner.model.PartnerResponse
;
import
com.lanren.huhu.partner.result.Result
;
import
com.lanren.huhu.partner.schedule.PartnerSettleTask
;
import
com.lanren.huhu.partner.service.PartnerAccountService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.time.LocalDateTime
;
/** * @author houseme * @date 2019-06-26 10:56 * @Project partner * @Package com.lanren.huhu.partner.manager * @File: PartnerAccountManager */
@Component
public
class
PartnerManager
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
PartnerManager
.
class
);
@Autowired
private
PartnerAccountService
partnerAccountService
;
@Autowired
private
PartnerSettleTask
partnerSettleTask
;
/*** * 获取合伙人账户信息 * @param userId * @return */
public
Result
<
PartnerAccount
>
findByUserId
(
Integer
userId
)
{
Result
<
PartnerAccount
>
result
=
new
Result
<>();
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager findByUserId userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
PartnerAccount
partnerAccount
=
partnerAccountService
.
getOneByUserId
(
userId
);
result
.
setData
(
partnerAccount
);
return
result
;
}
/*** * 获取合伙人等级 10 普通, 20 高级, 30 超级 * @param userId * @return */
public
Result
<
PartnerResponse
>
getPartnerLevel
(
Integer
userId
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager getPartnerLevel userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
Result
<
PartnerResponse
>
result
=
new
Result
<>();
PartnerAccount
partnerAccount
=
partnerAccountService
.
getOneByUserId
(
userId
);
if
(
null
!=
partnerAccount
)
{
int
partnerLevel
;
if
(
partnerAccount
.
getIsSuperPartner
()
==
1
)
{
partnerLevel
=
30
;
}
else
{
partnerLevel
=
partnerAccount
.
getPartnerLevel
();
}
result
.
setData
(
new
PartnerResponse
(
partnerLevel
));
}
else
{
result
.
setCode
(
601
);
}
return
result
;
}
public
Result
<
String
>
doFinanceSettle
(
int
userId
)
{
Result
<
String
>
result
=
new
Result
<>();
if
(
partnerSettleTask
.
doOneUserSettle
(
userId
))
{
result
.
setCode
(
0
);
}
else
{
result
.
setCode
(
500
);
}
return
result
;
}
// public Result<String> runSummary(String dateStr, int userId) { // Result<String> result = new Result<>(); // if (partnerSettleTask.runSummary(dateStr, userId)) { // result.setCode(0); // } else { // result.setCode(500); // } // return result; // } }
\ No newline at end of file
package
com
.
lanren
.
huhu
.
partner
.
manager
;
import
com.lanren.huhu.partner.domain.PartnerAccount
;
import
com.lanren.huhu.partner.model.PartnerResponse
;
import
com.lanren.huhu.partner.result.Result
;
import
com.lanren.huhu.partner.service.PartnerAccountService
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
java.time.LocalDateTime
;
/** * @author houseme * @date 2019-06-26 10:56 * @Project partner * @Package com.lanren.huhu.partner.manager * @File: PartnerAccountManager */
@Component
public
class
PartnerManager
{
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
PartnerManager
.
class
);
@Autowired
private
PartnerAccountService
partnerAccountService
;
/*** * 获取合伙人账户信息 * @param userId * @return */
public
Result
<
PartnerAccount
>
findByUserId
(
Integer
userId
)
{
Result
<
PartnerAccount
>
result
=
new
Result
<>();
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager findByUserId userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
PartnerAccount
partnerAccount
=
partnerAccountService
.
getOneByUserId
(
userId
);
result
.
setData
(
partnerAccount
);
return
result
;
}
/*** * 获取合伙人等级 10 普通, 20 高级, 30 超级 * @param userId * @return */
public
Result
<
PartnerResponse
>
getPartnerLevel
(
Integer
userId
)
{
if
(
logger
.
isDebugEnabled
())
{
logger
.
info
(
"PartnerAccountManager getPartnerLevel userId:{},time:{}"
,
userId
,
LocalDateTime
.
now
());
}
Result
<
PartnerResponse
>
result
=
new
Result
<>();
PartnerAccount
partnerAccount
=
partnerAccountService
.
getOneByUserId
(
userId
);
if
(
null
!=
partnerAccount
)
{
int
partnerLevel
;
if
(
partnerAccount
.
getIsSuperPartner
()
==
1
)
{
partnerLevel
=
30
;
}
else
{
partnerLevel
=
partnerAccount
.
getPartnerLevel
();
}
result
.
setData
(
new
PartnerResponse
(
partnerLevel
));
}
else
{
result
.
setCode
(
601
);
}
return
result
;
}
}
\ No newline at end of file
...
...
src/main/java/com/lanren/huhu/partner/schedule/AgentRewardQueueTask.java
View file @
b8246889
...
...
@@ -113,6 +113,15 @@ public class AgentRewardQueueTask {
}
else
if
(
rewardType
==
AGENT_REWARD_TYPE_SELF_ORDER
&&
message
.
getOrderType
().
equals
(
ORDER_TYPE_MT
)
)
{
rateMap
=
AGENT_RATE_MAP
.
get
(
rewardType
+
MT_OFFSET
);
}
else
if
(
rewardType
==
AGENT_REWARD_TYPE_SELF_ORDER
&&
message
.
getOrderType
().
equals
(
ORDER_TYPE_TN
)
)
{
rateMap
=
AGENT_RATE_MAP
.
get
(
rewardType
+
TN_OFFSET
);
}
else
if
(
rewardType
==
AGENT_REWARD_TYPE_SELF_ORDER
&&
message
.
getOrderType
().
equals
(
ORDER_TYPE_MTJD
)
)
{
rateMap
=
AGENT_RATE_MAP
.
get
(
rewardType
+
MTJD_OFFSET
);
}
else
if
(
rewardType
==
AGENT_REWARD_TYPE_SELF_ORDER
&&
message
.
getOrderType
().
equals
(
ORDER_TYPE_ELM
)
)
{
rateMap
=
AGENT_RATE_MAP
.
get
(
rewardType
+
ELM_OFFSET
);
}
else
{
rateMap
=
AGENT_RATE_MAP
.
get
(
rewardType
);
}
...
...
@@ -318,7 +327,7 @@ public class AgentRewardQueueTask {
*/
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_REDPACK
)
{
if
(
rewardType
==
AGENT_REWARD_TYPE_YEAR_VIP
||
rewardType
==
AGENT_REWARD_TYPE_REDPACK
||
rewardType
==
AGENT_REWARD_TYPE_VIP_PACKAGE
)
{
rewardBasement
=
message
.
getSourceUserPayment
();
}
else
{
/**
...
...
src/main/java/com/lanren/huhu/partner/schedule/AgentSettleTask.java
deleted
100644 → 0
View file @
1a9bd326
This diff is collapsed.
Click to expand it.
src/main/java/com/lanren/huhu/partner/schedule/PartnerSettleTask.java
deleted
100644 → 0
View file @
1a9bd326
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment