去掉计算订单金额购买方式

share-system/src/main/java/share/system/request/OrderComputedPriceRequest.java

@@ -38,7 +38,6 @@ public class OrderComputedPriceRequest {
     private Integer orderType;
 
     @ApiModelProperty(value = "购买方式(1：小时，2：套餐)", required = true)
-    @NotNull(message = "购买方式不能为空")
     private Integer buyType;
 
     /** 预约开始时间 */

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

@@ -1771,16 +1771,20 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             RoomLabel roomLabel = roomLabelService.selectRoomLabelById(request.getRoomLabelId());
             if (ObjectUtils.isEmpty(roomLabel.getPackId())) {
                 payPrice = totalPrice;
+                request.setBuyType(BuyTypeEnum.TIME.getCode());
             } else {
                 SPack byId = packService.getById(roomLabel.getPackId());
                 if (!ObjectUtils.isEmpty(byId) && byId.getIsOpen().equals(YesNoEnum.yes.getIndex())) {
                     payPrice = computeTotalPrice(roomLabel.getPackId(), totalPrice);
+                    request.setBuyType(BuyTypeEnum.PACK.getCode());
                 } else {
                     payPrice = totalPrice;
+                    request.setBuyType(BuyTypeEnum.TIME.getCode());
                 }
             }
         } else if (!ObjectUtils.isEmpty(request.getPackId())) {
             payPrice = computeTotalPrice(request.getPackId(), totalPrice);
+            request.setBuyType(BuyTypeEnum.PACK.getCode());
         }
         
         priceResponse.setTotalFee(payPrice);