From dfb4d35c57c5f42921b20a5239f5d0b72a1437f1 Mon Sep 17 00:00:00 2001 From: API Changelog Bot Date: Tue, 31 Mar 2026 12:18:36 +0800 Subject: [PATCH] =?UTF-8?q?changelog:=20e53397ea=20-=20fix:=20=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E8=A2=AB=E8=AF=AF=E4=BF=AE=E6=94=B9=E7=9A=84main?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=88=E4=BF=9D=E7=95=994=E7=A7=8D?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=B1=BB=E5=9E=8B=E5=8E=9F=E6=9C=89=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2026-03-31_1218_e53397ea_fix_main.md | 228 ++++++++++++++++++ 1 file changed, 228 insertions(+) create mode 100644 changelogs/2026-03/2026-03-31_1218_e53397ea_fix_main.md diff --git a/changelogs/2026-03/2026-03-31_1218_e53397ea_fix_main.md b/changelogs/2026-03/2026-03-31_1218_e53397ea_fix_main.md new file mode 100644 index 0000000..a411484 --- /dev/null +++ b/changelogs/2026-03/2026-03-31_1218_e53397ea_fix_main.md @@ -0,0 +1,228 @@ +# 接口变更记录 — 2026-03-31 12:18 + +> **提交** `e53397ea` · **作者** wx · **时间** 2026-03-31 12:18:36 +0800 +> +> fix: 恢复被误修改的main代码（保留4种人员类型原有逻辑） + +## 变更总览 + +- **产品服务** + - InternalProduct (改1) + +--- + +## 产品服务 + +### InternalProduct + +> 📖 **接口文档**: [http://192.168.100.236:8085/doc.html](http://192.168.100.236:8085/doc.html) → 标签 **「【内部接口】产品（Feign调用）」** + +### ✏️ `GET` /internal/product/{productId}/simple-quote — 简单报价（内部） + +- 参数: childNeedBed(boolean) → productId(Long), childNeedBed(boolean) + +--- + +## 📦 其他数据对象变更 + +> 以下变更未直接关联到本次接口变更，但可能影响现有接口的请求/响应 + +### 产品服务 + +#### ✏️ FamilySaveRequest + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +#### ✏️ PricingRequest + + - 🆕 `babyPrice` (`BigDecimal`) — 婴儿固定价格（不随日期变化） + - 🆕 `childDiscountPercent` (`BigDecimal`) — 小童折扣百分比（小童价=儿童价×此百分比/100，如70表示打7折） + +#### ✏️ ProductCreateRequest + + - 🆕 `youngChildCount` (`Integer`) — 小童人数 + - 🆕 `babyCount` (`Integer`) — 婴儿人数 + +#### ✏️ ProductFamilyVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +#### ✏️ ProductListVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数（私人定制/路书） + - 🆕 `babyCount` (`Integer`) — 幼童数（私人定制/路书） + +#### ✏️ ProductPricingVO + + - 🆕 `babyPrice` (`BigDecimal`) — 婴儿价 + - 🆕 `childDiscountPercent` (`BigDecimal`) — 儿童折扣百分比 + +#### ✏️ ProductSaveRequest + + - 🆕 `youngChildCount` (`Integer`) — 小童人数 + - 🆕 `babyCount` (`Integer`) — 婴儿人数 + +#### ✏️ ProductUpdateRequest + + - 🆕 `youngChildCount` (`Integer`) — 小童人数 + - 🆕 `babyCount` (`Integer`) — 婴儿人数 + +#### ✏️ ProductVO + + - 🆕 `youngChildCount` (`Integer`) — 小童人数 + - 🆕 `babyCount` (`Integer`) — 婴儿人数 + +#### ✏️ QuoteResultVO + + - 🆕 `totalYoungChildCost` (`BigDecimal`) — 小童总成本 + - 🆕 `totalYoungChildSellPrice` (`BigDecimal`) — 小童总售价 + - 🆕 `totalBabyCost` (`BigDecimal`) — 婴儿总成本 + - 🆕 `totalBabySellPrice` (`BigDecimal`) — 婴儿总售价 + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + - 🆕 `babyCost` (`BigDecimal`) — 婴儿固定成本 + - ✏️ `personType`: 说明 "人员类型：ADULT/CHILD" → "人员类型：ADULT/CHILD/YOUNG_CHILD/BABY" + +### 小程序聚合服务 + +#### ✏️ MpCreateOrderRequest + + - ✏️ `travelerType`: 说明 "出行人类型（ADULT/CHILD）" → "出行人类型（ADULT/CHILD/YOUNG_CHILD/BABY）" + +#### ✏️ MpCustomProductDetailVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + - 🆕 `babyPrice` (`BigDecimal`) — 婴儿价 + - 🆕 `childDiscountPercent` (`BigDecimal`) — 儿童折扣百分比 + +#### ✏️ MpOrderDetailVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +#### ✏️ MpOrderListItemVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +#### ✏️ MpPriceCalendarDayVO + + - 🆕 `youngChildPrice` (`BigDecimal`) — 幼儿价格 + - 🆕 `babyPrice` (`BigDecimal`) — 婴儿价格 + +#### ✏️ MpProductQuoteRequest + + - 🆕 `youngChildCount` (`Integer`) — 幼儿数量 + - 🆕 `babyCount` (`Integer`) — 婴儿数量 + +#### ✏️ MpProductQuoteVO + + - 🆕 `youngChildSellPrice` (`BigDecimal`) — 小童单价（儿童价×折扣比例） + - 🆕 `babySellPrice` (`BigDecimal`) — 幼童单价（固定价） + - 🆕 `totalYoungChildSellPrice` (`BigDecimal`) — 小童小计 + - 🆕 `totalBabySellPrice` (`BigDecimal`) — 幼童小计 + +#### ✏️ MpTravelerRequest + + - ✏️ `travelerType`: 说明 "出行人类型: ADULT/CHILD" → "出行人类型: ADULT/CHILD/YOUNG_CHILD/BABY" + +#### ✏️ MpTravelerVO + + - ✏️ `travelerType`: 说明 "出行人类型: ADULT/CHILD" → "出行人类型: ADULT/CHILD/YOUNG_CHILD/BABY" + +### 用户服务 + +#### ✏️ TravelerRequest + + - ✏️ `travelerType`: 说明 "出行人类型，关联字典traveler_type：ADULT=成人, CHILD=儿童（无需传入，后端根据birthday自动判断）" → "出行人类型，关联字典traveler_type：ADULT=成人, CHILD=儿童, YOUNG_CHILD=小童, BABY=幼童（无需传入，后端根据birthday自动判断）" + +### 订单服务 + +#### ✏️ AdminUpdateOrderRequest + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +#### ✏️ MpOrderListVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +#### ✏️ OrderDetailVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +#### ✏️ OrderListVO + + - 🆕 `youngChildCount` (`Integer`) — 小童数 + - 🆕 `babyCount` (`Integer`) — 幼童数 + +
+📁 全部变更文件 (点击展开) + +``` +M hl-common/hl-common-redis/src/main/java/com/hulalv/common/util/TravelerTypeResolver.java +M hl-mp-service/src/main/java/com/hulalv/mp/controller/MpProductController.java +M hl-mp-service/src/main/java/com/hulalv/mp/dto/MpCreateOrderRequest.java +M hl-mp-service/src/main/java/com/hulalv/mp/dto/MpProductQuoteRequest.java +M hl-mp-service/src/main/java/com/hulalv/mp/dto/MpTravelerRequest.java +M hl-mp-service/src/main/java/com/hulalv/mp/feign/MpProductFeignClient.java +M hl-mp-service/src/main/java/com/hulalv/mp/feign/MpProductFeignFallbackFactory.java +M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpCustomProductDetailVO.java +M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpOrderDetailVO.java +M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpOrderListItemVO.java +M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpPriceCalendarDayVO.java +M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpProductQuoteVO.java +M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpTravelerVO.java +M hl-order-service/src/main/java/com/hulalv/order/constant/OrderConstants.java +M hl-order-service/src/main/java/com/hulalv/order/dto/AdminCreateOrderRequest.java +M hl-order-service/src/main/java/com/hulalv/order/dto/AdminUpdateOrderRequest.java +M hl-order-service/src/main/java/com/hulalv/order/dto/CreateOrderRequest.java +M hl-order-service/src/main/java/com/hulalv/order/dto/QuotePreviewRequest.java +M hl-order-service/src/main/java/com/hulalv/order/entity/OrderInfo.java +A hl-order-service/src/main/java/com/hulalv/order/feign/ContractFeignClient.java +A hl-order-service/src/main/java/com/hulalv/order/feign/ContractFeignFallbackFactory.java +A hl-order-service/src/main/java/com/hulalv/order/feign/InsuranceFeignClient.java +A hl-order-service/src/main/java/com/hulalv/order/feign/InsuranceFeignFallbackFactory.java +M hl-order-service/src/main/java/com/hulalv/order/feign/ProductFeignClient.java +M hl-order-service/src/main/java/com/hulalv/order/feign/ProductFeignFallbackFactory.java +M hl-order-service/src/main/java/com/hulalv/order/service/DashboardStatsService.java +M hl-order-service/src/main/java/com/hulalv/order/service/OrderCascadeService.java +M hl-order-service/src/main/java/com/hulalv/order/service/OrderService.java +M hl-order-service/src/main/java/com/hulalv/order/service/TripService.java +M hl-order-service/src/main/java/com/hulalv/order/vo/MpOrderListVO.java +M hl-order-service/src/main/java/com/hulalv/order/vo/OrderDetailVO.java +M hl-order-service/src/main/java/com/hulalv/order/vo/OrderListVO.java +M hl-product-service/src/main/java/com/hulalv/product/constant/ProductConstants.java +M hl-product-service/src/main/java/com/hulalv/product/controller/InternalProductController.java +M hl-product-service/src/main/java/com/hulalv/product/controller/PricingController.java +M hl-product-service/src/main/java/com/hulalv/product/controller/QuoteController.java +M hl-product-service/src/main/java/com/hulalv/product/dto/FamilySaveRequest.java +M hl-product-service/src/main/java/com/hulalv/product/dto/PricingRequest.java +M hl-product-service/src/main/java/com/hulalv/product/dto/ProductCreateRequest.java +M hl-product-service/src/main/java/com/hulalv/product/dto/ProductSaveRequest.java +M hl-product-service/src/main/java/com/hulalv/product/dto/ProductUpdateRequest.java +M hl-product-service/src/main/java/com/hulalv/product/dto/QuoteRequest.java +M hl-product-service/src/main/java/com/hulalv/product/entity/Product.java +M hl-product-service/src/main/java/com/hulalv/product/entity/ProductFamily.java +M hl-product-service/src/main/java/com/hulalv/product/entity/ProductPricing.java +M hl-product-service/src/main/java/com/hulalv/product/feign/InsuranceSchemeFeignClient.java +M hl-product-service/src/main/java/com/hulalv/product/feign/MaterialRefFeignClient.java +M hl-product-service/src/main/java/com/hulalv/product/feign/ReviewFeignClient.java +M hl-product-service/src/main/java/com/hulalv/product/service/CostCalculationService.java +M hl-product-service/src/main/java/com/hulalv/product/service/ProductFamilyService.java +M hl-product-service/src/main/java/com/hulalv/product/service/ProductPricingService.java +M hl-product-service/src/main/java/com/hulalv/product/service/ProductService.java +M hl-product-service/src/main/java/com/hulalv/product/service/QuoteCalculatorService.java +M hl-product-service/src/main/java/com/hulalv/product/vo/ProductFamilyVO.java +M hl-product-service/src/main/java/com/hulalv/product/vo/ProductListVO.java +M hl-product-service/src/main/java/com/hulalv/product/vo/ProductPricingVO.java +M hl-product-service/src/main/java/com/hulalv/product/vo/ProductVO.java +M hl-product-service/src/main/java/com/hulalv/product/vo/QuoteResultVO.java +M hl-user-service/src/main/java/com/hulalv/user/dto/TravelerRequest.java +``` +
\ No newline at end of file