Merge branch 'dev'

# Conflicts:
#	src/main/java/com/izouma/nineth/dto/UserRegister.java

src/main/java/com/izouma/nineth/dto/UserRegister.java

@@ -49,4 +49,6 @@ public class UserRegister {
 
     @ApiModelProperty("藏品Id")
     private Long collectionId;
+
+    private String intro;
 }

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

@@ -395,9 +395,9 @@ public class OrderService {
             if (collection.getServiceCharge() + collection.getRoyalties() > 0) {
                 // 扣除手续费、服务费、GAS费
                 restAmount = divMoney(totalAmount, restAmount, divMembers, owner.getMemberId(),
-                        100 - (collection.getServiceCharge() + collection.getRoyalties()), false);
+                        100 - (collection.getServiceCharge() + collection.getRoyalties()), true);
             }
-            restAmount = divMoney(restAmount, divMembers, "0", restAmount, true);
+            restAmount = divMoney(restAmount, divMembers, "0", restAmount, false);
         } else {
             if (invitor != null && invitor.getShareRatio() != null
                     && invitor.getShareRatio().compareTo(BigDecimal.ZERO) > 0) {

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

@@ -6,6 +6,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.izouma.nineth.TokenHistory;
 import com.izouma.nineth.config.Constants;
+import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.Follow;
 import com.izouma.nineth.domain.IdentityAuth;
 import com.izouma.nineth.domain.Invite;
@@ -46,6 +47,7 @@ import org.springframework.stereotype.Service;
 import javax.persistence.criteria.Predicate;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -72,6 +74,7 @@ public class UserService {
     private CacheService       cacheService;
     private ApplicationContext context;
     private TokenHistoryRepo   tokenHistoryRepo;
+    private CollectionRepo     collectionRepo;
 
     public User update(User user) {
         User orig = userRepo.findById(user.getId()).orElseThrow(new BusinessException("无记录"));
@@ -156,6 +159,16 @@ public class UserService {
             invite = inviteRepo.findFirstByCode(inviteCode).orElse(null);
         }
         smsService.verify(phone, code);
+        if (collectionId != null) {
+            Collection collection = collectionRepo.findById(collectionId).orElseThrow(new BusinessException("无藏品"));
+            if (!collection.isOnShelf() || !collection.isSalable()) {
+                collectionId = null;
+            } else if (collection.isScheduleSale()) {
+                if (collection.getStartTime().isAfter(LocalDateTime.now())){
+                    collectionId = null;
+                }
+            }
+        }
         User user = create(UserRegister.builder()
                 .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
                 .username(name)