拍卖二级分销

src/main/java/com/izouma/nineth/service/UserService.java

@@ -1247,7 +1247,18 @@ public class UserService {
         user.setCollectionInvitor(invitor);
 //            user.setCollectionId(collectionId)
         user.setInviteType(type);
-        update(user);
+        User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
+        ObjUtils.merge(orig, user);
+        orig = save(orig);
+        userRepo.updateAssetMinter(orig.getId());
+        userRepo.updateAssetOwner(orig.getId());
+        userRepo.updateCollectionMinter(orig.getId());
+        userRepo.updateCollectionOwner(orig.getId());
+        userRepo.updateOrderMinter(orig.getId());
+        userRepo.updateHistoryFromUser(orig.getId());
+        userRepo.updateHistoryToUser(orig.getId());
+        userRepo.updateShowroomToUser(orig.getId());
+        cacheService.clearCollection();
 
     }
 }

src/main/java/com/izouma/nineth/web/AuthenticationController.java

@@ -66,8 +66,14 @@ public class AuthenticationController {
     public String phoneLogin(String phone, String code, @RequestParam(required = false) Long invitor) {
         User user = userService.loginByPhone(phone, code);
         InviteType userInviteType = user.getInviteType();
-        if (invitor != null & userInviteType != InviteType.AUCTION) {
-            userService.bindAuctionInvitor(user.getId(), invitor);
+        if (invitor != null) {
+            if (userInviteType != null) {
+                if (!userInviteType.equals(InviteType.AUCTION)) {
+                    userService.bindAuctionInvitor(user.getId(), invitor);
+                }
+            } else {
+                userService.bindAuctionInvitor(user.getId(), invitor);
+            }
         }
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }
@@ -85,8 +91,14 @@ public class AuthenticationController {
     public String phonePwdLogin(String phone, String password, @RequestParam(required = false) Long invitor) {
         User user = userService.loginByPhonePwd(phone, password);
         InviteType userInviteType = user.getInviteType();
-        if (invitor != null & userInviteType != InviteType.AUCTION) {
-            userService.bindAuctionInvitor(user.getId(), invitor);
+        if (invitor != null) {
+            if (userInviteType != null) {
+                if (!userInviteType.equals(InviteType.AUCTION)) {
+                    userService.bindAuctionInvitor(user.getId(), invitor);
+                }
+            } else {
+                userService.bindAuctionInvitor(user.getId(), invitor);
+            }
         }
         return jwtTokenUtil.generateToken(JwtUserFactory.create(user));
     }