Merge branch 'order_update'

# Conflicts:
#	src/main/java/com/ycwl/basic/pricing/CLAUDE.md

src/main/java/com/ycwl/basic/pricing/controller/PriceCalculationController.java

@@ -38,6 +38,20 @@ public class PriceCalculationController {
         return ApiResponse.success(result);
     }
 
+    /**
+     * 升单检测：判断是否命中一口价或打包优惠
+     */
+    @PostMapping("/upgrade-check")
+    public ApiResponse<UpgradeCheckResult> upgradeCheck(@RequestBody UpgradeCheckRequest request) {
+        log.info("升单检测请求: scenicId={}, purchased={}, intending={}",
+                request.getScenicId(),
+                request.getPurchasedProducts() != null ? request.getPurchasedProducts().size() : 0,
+                request.getIntendingProducts() != null ? request.getIntendingProducts().size() : 0);
+        
+        UpgradeCheckResult result = priceCalculationService.checkUpgrade(request);
+        return ApiResponse.success(result);
+    }
+    
     /**
      * 查询用户可用优惠券
      */