Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!728

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxListVO.java

@@ -127,6 +127,6 @@ public class TicketBoxListVO {
     if (Objects.isNull(this.saleCommRate) || Objects.isNull(this.salePrice) || Objects.isNull(this.channelCommRate)) {
       return 0;
     }
-    return BigDecimal.valueOf(this.salePrice).multiply(this.saleCommRate).multiply(this.channelCommRate).divide(BigDecimal.valueOf(10000), 0, RoundingMode.HALF_UP).intValue();
+    return BigDecimal.valueOf(this.salePrice).multiply(this.saleCommRate).multiply(this.channelCommRate).divide(BigDecimal.valueOf(10000), 0).intValue();
   }
 }

mp-service/src/main/java/com/qs/mp/admin/domain/vo/TicketBoxVO.java

@@ -45,7 +45,7 @@ public class TicketBoxVO extends TicketBox {
     if (Objects.isNull(super.getSaleCommRate()) || Objects.isNull(super.getSalePrice()) || Objects.isNull(this.channelCommRate)) {
       return 0;
     }
-    return BigDecimal.valueOf(super.getSalePrice()).multiply(super.getSaleCommRate()).multiply(this.channelCommRate).divide(BigDecimal.valueOf(10000), 0, RoundingMode.HALF_UP).intValue();
+    return BigDecimal.valueOf(super.getSalePrice()).multiply(super.getSaleCommRate()).multiply(this.channelCommRate).divide(BigDecimal.valueOf(10000), 0).intValue();
 
   }
 }