Merge branch 'dev2' into dev

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

src/main/java/com/izouma/nineth/domain/User.java

@@ -34,7 +34,7 @@ import java.util.Set;
 @ApiModel(value = "用户", description = "用户")
 public class User extends BaseEntity implements Serializable {
 
-    @Pattern(regexp = Constants.Regex.USERNAME)
+//    @Pattern(regexp = Constants.Regex.USERNAME)
     @Size(min = 1, max = 50)
     @Column(nullable = false, unique = true)
     @Searchable

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) {