From 2e5c6b46697f7b96460ad0c356740df52bf056d2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 14 八月 2019 09:51:07 +0800
Subject: [PATCH] 金币兑换
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index 303414d..a5ddef1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -406,13 +406,11 @@
object.put("memoName", memoName);
String nickName = "";
- Long workerId= null;
String portrait = "";
Long lastLoginTime = null;
UserInfo worker = threeSale.getWorker();
if (worker != null) {
- workerId = worker.getId();
portrait = worker.getPortrait();
lastLoginTime = worker.getLastLoginTime();
nickName = worker.getNickName();
@@ -505,7 +503,7 @@
@Override
@Transactional
- public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter, String platform, String version) throws ThreeSaleException {
+ public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException {
if (invitee == null || inviter == null)
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -515,6 +513,8 @@
if (threeSale != null) {
// 鏈夋晥鍏崇郴--鐢熸晥
+ threeSale.setBoss(inviter);
+ threeSale.setWorker(invitee);
threeSale.setState(true);
threeSale.setExpire(ThreeSale.EXPIRE_NORMAL);
threeSale.setSucceedTime(java.lang.System.currentTimeMillis());
@@ -590,7 +590,7 @@
@Override
@Transactional
- public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld, String platform, String version) throws ThreeSaleException {
+ public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException {
if (invitee == null || (inviterId == null && threeSaleOld == null))
throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖");
@@ -633,6 +633,7 @@
UserInfo boss = userInfoService.selectByPKey(threeSale.getBoss().getId());
threeSale.setBoss(boss);
+ threeSale.setWorker(invitee);
// 娣诲姞鍒伴槦鍒�
ThreeSaleCMQManager.getInstance().addThreeSaleMsg(threeSale);
--
Gitblit v1.8.0