增加订单详情积分的计算

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

@@ -122,10 +122,13 @@ public class MyOrderController {
         for (OrderItem orderItem : orderItems) {
             score += orderItem.getUseScore();
         }
+        if (score > 0) {
+            score = (int) (score + order.getFreightAmount());
+        }
 
         List<OrderItemDto> orderItemDtoList = mapperFacade.mapAsList(orderItems, OrderItemDto.class);
         //加上运费
-        orderShopDto.setOrderScore((int) (score+order.getFreightAmount()));
+        orderShopDto.setOrderScore(score);
         orderShopDto.setShopId(shopDetail.getShopId());
 //        orderShopDto.setShopId(0L);
         orderShopDto.setDvyType(order.getDvyType());
@@ -214,7 +217,7 @@ public class MyOrderController {
                                                      @RequestParam(value = "dvyType", required = false) Integer dvyType
     ) {
         String userId = SecurityUtils.getUser().getUserId();
-        IPage<MyOrderDto> myOrderDtoIpage = myOrderService.pageMyOrderByUserIdAndStatus(page, userId, status,dvyType);
+        IPage<MyOrderDto> myOrderDtoIpage = myOrderService.pageMyOrderByUserIdAndStatus(page, userId, status, dvyType);
         return ResponseEntity.ok(myOrderDtoIpage);
     }
 
@@ -328,10 +331,10 @@ public class MyOrderController {
     public ResponseEntity<String> receipt(@PathVariable("orderNumber") String orderNumber) {
         String userId = SecurityUtils.getUser().getUserId();
         Order order = orderService.getOrderByOrderNumberAndUserId(orderNumber, userId, true);
-        if (Objects.equals(order.getDvyType(), 1)){
-            CullenUtils.validateDataThrowException(Objects.equals(order.getHbOrderStatus(), 0),"订单未支付");
-            CullenUtils.validateDataThrowException(Objects.equals(order.getHbOrderStatus(), 1),"订单未发货，无法确认收货");
-        }else {
+        if (Objects.equals(order.getDvyType(), 1)) {
+            CullenUtils.validateDataThrowException(Objects.equals(order.getHbOrderStatus(), 0), "订单未支付");
+            CullenUtils.validateDataThrowException(Objects.equals(order.getHbOrderStatus(), 1), "订单未发货，无法确认收货");
+        } else {
             if (!Objects.equals(order.getHbOrderStatus(), OrderStatus.CONSIGNMENT.value())) {
                 throw new GlobalException("订单未发货，无法确认收货");
             }