Merge branch 'master' into dev

src/main/java/com/izouma/nineth/repo/MintActivityRepo.java

@@ -30,7 +30,7 @@ public interface MintActivityRepo extends JpaRepository<MintActivity, Long>, Jpa
     @Query("select c.stock from MintActivity c where c.id = ?1")
     Integer getStock(Long id);
 
-    @Query("update Collection c set c.stock = ?2 where c.id = ?1")
+    @Query("update MintActivity c set c.stock = ?2 where c.id = ?1")
     @Transactional
     @Modifying
     int updateStock(Long id, int stock);

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

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