Merge remote-tracking branch 'origin/master'

yami-shop-api/src/main/java/com/yami/shop/api/controller/MyOrderController.java

@@ -124,7 +124,8 @@ public class MyOrderController {
         }
 
         List<OrderItemDto> orderItemDtoList = mapperFacade.mapAsList(orderItems, OrderItemDto.class);
-        orderShopDto.setOrderScore(score);
+        //加上运费
+        orderShopDto.setOrderScore((int) (score+order.getFreightAmount()));
         orderShopDto.setShopId(shopDetail.getShopId());
 //        orderShopDto.setShopId(0L);
         orderShopDto.setDvyType(order.getDvyType());