Commits · 2608110a0df23bbadab8ef8012c45ed041a3e528 · guanchen / huhu-partner

22 Nov, 2019 7 commits
- 切换db 账号 · 2608110a
  guanchen authored Nov 23, 2019
  
  2608110a
- 切换db 账号 · 773dc825
  guanchen authored Nov 23, 2019
  
  773dc825
- 切换db 账号 · 78caec6f
  guanchen authored Nov 22, 2019
  
  78caec6f
- 修改无限循环小叔bug · f0e91ed6
  guanchen authored Nov 22, 2019
  
  f0e91ed6
- 修改无限循环小叔bug · 5d6fa233
  guanchen authored Nov 22, 2019
  
  5d6fa233
- 修改test DB · 67958483
  guanchen authored Nov 22, 2019
  
  67958483
- 修改结算公式, 代理商不扣税, 合伙人不转银行卡 · a171a611
  guanchen authored Nov 22, 2019
  
  a171a611
24 Oct, 2019 1 commit
- 修复遗留错误数据 · 868a76c7
  guanchen authored Oct 24, 2019
  
  868a76c7
17 Oct, 2019 2 commits
- Merge commit 'a8770582' into finance · dfba251b
  guanchen authored Oct 17, 2019
```
# Conflicts:
#	pom.xml
#	src/main/resources/logback.xml
```
  dfba251b
- 添加美团的支持 · a8770582
  guanchen authored Oct 17, 2019
  
  a8770582
26 Sep, 2019 1 commit
- 优化日志配置, 添加调试信息, 排除死循环隐患, 清缓存接口空跑 · f826c915
  guanchen authored Sep 26, 2019
  
  f826c915
24 Sep, 2019 1 commit
- 更新2--9月份结算合伙人/代理商收入 · 505d9403
  guanchen authored Sep 24, 2019
  
  505d9403
23 Sep, 2019 2 commits
- 添加hash_code方法恢复catalina.out日志 · 4c4a53b2
  guanchen authored Sep 24, 2019
  
  4c4a53b2
- 更新--9月份结算合伙人/代理商收入 · c596bcaa
  guanchen authored Sep 24, 2019
  
  c596bcaa
20 Sep, 2019 1 commit
- 9月份结算合伙人/代理商收入 · d9d3dd0a
  guanchen authored Sep 20, 2019
  
  d9d3dd0a
10 Sep, 2019 1 commit
- 更新agent_income_summary中的content内字段名称 · 61d4e87b
  guanchen authored Sep 10, 2019
```
失效的reward将金额置0
更新fastjson版本
添加结算时间字段
```
  61d4e87b
26 Aug, 2019 1 commit
- 更新代理商和合伙人结算逻辑 · cfc9a1c7
  guanchen authored Aug 26, 2019
  
  cfc9a1c7
19 Aug, 2019 1 commit
- v1.4.5上线 · 07c1474a
  guanchen authored Aug 19, 2019
  
  07c1474a
13 Aug, 2019 1 commit
- 添加不读cache的接口 · 42bf0f18
  guanchen authored Aug 13, 2019
```
修复时间字段bug
```
  42bf0f18
30 Jul, 2019 1 commit
- 添加代理商推荐关系的循环奖励 · e28d883e
  guanchen authored Jul 30, 2019
  
  e28d883e
26 Jul, 2019 1 commit
- 添加修复已结算数据逻辑 · ea68f2c1
  guanchen authored Jul 26, 2019
  
  ea68f2c1
25 Jul, 2019 2 commits
- 取出select * · f4966870
  guanchen authored Jul 25, 2019
  
  f4966870
- 修复结算bug · 15d8f6c4
  guanchen authored Jul 25, 2019
```
去掉所有select *
```
  15d8f6c4
24 Jul, 2019 5 commits

Merge commit '9cde3af1 ' into guanchen · 4b8d344e
guanchen authored Jul 24, 2019

4b8d344e
合伙人代理商收入结算 · 4b4890f9
guanchen authored Jul 24, 2019

4b4890f9
710-740 不限制身份 · 9cde3af1
guanchen authored Jul 24, 2019
```
750-760 需要是城市代理商
```
9cde3af1

Merge commit '' into guanchen · 14660b73

authored Jul 24, 2019

# Conflicts:
#	src/main/java/com/lanren/huhu/partner/controller/UserController.java
#	src/main/java/com/lanren/huhu/partner/dao/PartnerAccountMapper.java
#	src/main/java/com/lanren/huhu/partner/dao/UserAgentMapper.java
#	src/main/java/com/lanren/huhu/partner/service/impl/UserServiceImpl.java
#	src/main/resources/mapper/PartnerAccountMapper.xml
#	src/main/resources/mapper/UserAgentMapper.xml

14660b73

只在userService中保留找上级的方法 · 141b898f
guanchen authored Jul 24, 2019

141b898f

23 Jul, 2019 3 commits
- 平推关系自己是代理商: · b6605338
  guanchen authored Jul 23, 2019
```
如果有上级 剔除自己
没有上级 自己加上
```
  b6605338
- 推平奖励支持非城市代理级别 · 09966542
  guanchen authored Jul 23, 2019
```
奖励到总代 不再往上找
```
  09966542
- 添加代理商结算 · 228eadd4
  guanchen authored Jul 23, 2019
  
  228eadd4
22 Jul, 2019 9 commits
- 合并master代码 · da2cdfa8
  guanchen authored Jul 22, 2019
  
  da2cdfa8
- 找上级BUG修复 · 85eecee3
  guanchen authored Jul 22, 2019
  
  85eecee3
- 修复奖励计数bug · f52e8fe0
  guanchen authored Jul 22, 2019
  
  f52e8fe0
- 添加接口支持按天重跑拓展用户数 · 8e84f6b9
  guanchen authored Jul 22, 2019
  
  8e84f6b9
- BUG修复 · b1787e42
  guanchen authored Jul 22, 2019
  
  b1787e42
- BUG修复 · 4636191d
  guanchen authored Jul 22, 2019
  
  4636191d
- 修改用户用户关系后清除缓存 · 1938e23d
  guanchen authored Jul 22, 2019
  
  1938e23d
- 添加处理合伙人和代理商关系变更 · f8893b57
  guanchen authored Jul 22, 2019
```
用户的 代理商上级改为从自己开始找
```
  f8893b57
- 用户的代理商关系改为从自己开始找 · 0086b85a
  guanchen authored Jul 22, 2019
  
  0086b85a