Merge branch 'master' into dev

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -1661,7 +1661,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
                             if (useScore > 0) {
                                 //退的积分不一定等于下单的数量
-                                totalRefundScore = (int) (totalRefundScore + Arith.mul(productCount * orderItem.getPrice(), 100));
+                                totalRefundScore = (totalRefundScore + productCount * ((int) Arith.mul(orderItem.getPrice(), 100)));
                             }
                             if (actualTotal > 0) {
                                 totalRefundActual = Arith.add(totalRefundActual, productCount * orderItem.getPrice());