修改订单金额计算

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1747,13 +1747,18 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         ComputedOrderPriceResponse priceResponse = new ComputedOrderPriceResponse();
         SRoom room = roomService.getById(request.getRoomId());
         BigDecimal totalPrice = computeTotalPrice(room.getPrice(), request.getPreStartDate(), request.getPreEndDate());
-        BigDecimal payPrice;
-        RoomLabel roomLabel = roomLabelService.selectRoomLabelById(request.getRoomLabelId());
-        if (ObjectUtils.isEmpty(roomLabel.getPackId())) {
-            payPrice = totalPrice;
-        } else {
-            payPrice = computeTotalPrice(roomLabel.getPackId(), totalPrice);
-       }
+        BigDecimal payPrice = new BigDecimal(0);
+        if (!ObjectUtils.isEmpty(request.getRoomLabelId())) {
+            RoomLabel roomLabel = roomLabelService.selectRoomLabelById(request.getRoomLabelId());
+            if (ObjectUtils.isEmpty(roomLabel.getPackId())) {
+                payPrice = totalPrice;
+            } else {
+                payPrice = computeTotalPrice(roomLabel.getPackId(), totalPrice);
+            }
+        } else if (!ObjectUtils.isEmpty(request.getPackId())) {
+            payPrice = computeTotalPrice(request.getPackId(), totalPrice);
+        }
+        
         priceResponse.setTotalFee(payPrice);
         // 计算优惠券金额
         if (ObjectUtil.isNull(request.getCouponId()) || request.getCouponId() <= 0) {
@@ -1811,11 +1816,16 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 if (consumerCoupon.getMinPrice().compareTo(priceResponse.getTotalFee()) > 0) {
                     throw new BaseException("总金额小于优惠券最小使用金额");
                 }
-                RoomLabel roomLabel = roomLabelService.selectRoomLabelById(request.getRoomLabelId());
-                //（促销价-优惠券促销价）+（（时长-促销时长）*单价）
-                SRoom room = roomService.getById(request.getRoomId());
-                BigDecimal subtract = (roomLabel.getPromotionAmount().subtract(consumerCoupon.getSalePrice())).
-                        add(((DateUtils.differentHour(request.getPreStartDate(), request.getPreEndDate()).subtract(new BigDecimal(roomLabel.getPromotionDuration()))).multiply(room.getPrice())));
+                BigDecimal subtract = new BigDecimal(0);
+                if (!ObjectUtils.isEmpty(request.getRoomLabelId())) {
+                    RoomLabel roomLabel = roomLabelService.selectRoomLabelById(request.getRoomLabelId());
+                    SRoom room = roomService.getById(request.getRoomId());
+                    subtract = (roomLabel.getPromotionAmount().subtract(consumerCoupon.getSalePrice())).
+                            add(((DateUtils.differentHour(request.getPreStartDate(), request.getPreEndDate()).subtract(new BigDecimal(roomLabel.getPromotionDuration()))).multiply(room.getPrice())));
+                } else if (!ObjectUtils.isEmpty(request.getPackId())) {
+                    SPack byId = packService.getById(request.getPackId());
+                    subtract = byId.getPrice().subtract(consumerCoupon.getSalePrice());
+                }
                 //判断是否为负数
                 if (subtract.compareTo(BigDecimal.ZERO) < 0) {
                     priceResponse.setPayFee(BigDecimal.ZERO);