diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteCanteenSpuService.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteCanteenSpuService.java
index d13d7849d..ef7974f08 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteCanteenSpuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteCanteenSpuService.java
@@ -23,6 +23,7 @@ package com.bsd.pjcloud.canteen.api.feign;
 import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
+import com.bsd.pjcloud.canteen.vo.app.OnlineSpuComboItemVO;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author zjf
@@ -67,6 +69,15 @@ public interface RemoteCanteenSpuService {
     @PostMapping("/canteenSpu/ad/getSpuListByIds")
     R<List<CanteenSpuEntity>> getSpuListByIds(@RequestBody List<Long> ids);
 
+    /**
+     * 按套餐 SPU ID 批量查询套餐组成，用于跨服务补充只读展示数据。
+     *
+     * @param spuIds 套餐 SPU ID 列表，空列表返回空映射
+     * @return 套餐 SPU ID 与已按配置顺序排列的组成菜品映射
+     */
+    @PostMapping("/canteenSpu/ad/getComboItemsBySpuIds")
+    R<Map<Long, List<OnlineSpuComboItemVO>>> getComboItemsBySpuIds(@RequestBody List<Long> spuIds);
+
     /**
      * 购物车效验库存
      * @param spuId
diff --git a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java
index fe2ed83f6..65f8ff68d 100644
--- a/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/api/feign/RemoteDailyMenuService.java
@@ -26,9 +26,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.CanteenSpuUpdateStockReqDTO;
 import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
-import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.APPOnlineSpuVO;
 import com.bsd.pjcloud.canteen.vo.app.CanteenOnlineSpuAppVO;
+import com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO;
 import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
 import com.bsd.pjcloud.common.core.util.R;
 import io.swagger.v3.oas.annotations.Operation;
@@ -70,17 +70,18 @@ public interface RemoteDailyMenuService {
 
 
     /**
-     * 根据菜品日期获取当天的菜品列表
-     * @param day  日期
-     * @param hourType 早中晚
-     * @param categoryId 分类id
-     * @param merchantId 商户id
-     * @return
+     * 查询收银终端指定日期的每日菜谱，返回与 App 分页记录一致的商品及套餐组成结构。
+     *
+     * @param day 菜谱生效日期，格式为 yyyy-MM-dd
+     * @param hourType 餐段编码；为空表示全部餐段
+     * @param categoryId 菜品分类 ID；为空表示全部分类
+     * @param merchantId 收银终端所属商户 ID
+     * @return 指定条件下的每日菜谱列表；无可售菜品时 data 为空列表
      */
     @GetMapping("/canteenDailyMenu/ad/getCanteenList")
-    public R<List<ADCanteenDailyMenuListVO>> getCanteenList(@RequestParam("day") String day,
-                                                            @RequestParam(value = "hourType", required = false) Integer hourType,
-                                                            @RequestParam(value = "categoryId", required = false) Long categoryId,
-                                                            @RequestParam(value = "merchantId") Long merchantId);
+    R<List<DailyMenuAppVO>> getCanteenList(@RequestParam("day") String day,
+                                           @RequestParam(value = "hourType", required = false) Integer hourType,
+                                           @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                           @RequestParam(value = "merchantId") Long merchantId);
 
 }
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java
index 8b8698124..aa54a4780 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenDailyMenuController.java
@@ -14,7 +14,6 @@ import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
-import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
@@ -190,14 +189,22 @@ public class CanteenDailyMenuController {
 
 
     //    ---------AD------------
+    /**
+     * 查询收银终端指定日期的每日菜谱，并返回套餐类型及其组成明细。
+     *
+     * @param day 菜谱生效日期，格式为 yyyy-MM-dd
+     * @param hourType 餐段编码；为空表示全部餐段
+     * @param categoryId 菜品分类 ID；为空表示全部分类
+     * @param merchantId 收银终端所属商户 ID
+     * @return 与 App 每日菜谱分页记录一致的商品列表；无数据时返回空列表
+     */
     @GetMapping("/ad/getCanteenList")
     @SysLog("查询每日菜品列表")
-    public R<List<ADCanteenDailyMenuListVO>> getCanteenList(@RequestParam("day") String day,
-                                                            @RequestParam(value = "hourType", required = false) Integer hourType,
-                                                            @RequestParam(value = "categoryId", required = false) Long categoryId,
-                                                            @RequestParam(value = "merchantId") Long merchantId) {
-
-        return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId,merchantId));
+    public R<List<DailyMenuAppVO>> getCanteenList(@RequestParam("day") String day,
+                                                   @RequestParam(value = "hourType", required = false) Integer hourType,
+                                                   @RequestParam(value = "categoryId", required = false) Long categoryId,
+                                                   @RequestParam(value = "merchantId") Long merchantId) {
+        return R.ok(canteenDailyMenuService.getCanteenMenuListScope(day, hourType, categoryId, merchantId));
     }
 
 //    --------------APP---------------
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
index 2a4f36ab3..4c4b6d5eb 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/controller/CanteenSpuController.java
@@ -15,6 +15,7 @@ import com.bsd.pjcloud.canteen.entity.CanteenOnlineSpuEntity;
 import com.bsd.pjcloud.canteen.entity.CanteenStockEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenStockMapper;
 import com.bsd.pjcloud.canteen.service.CanteenStockService;
+import com.bsd.pjcloud.canteen.vo.app.OnlineSpuComboItemVO;
 import com.bsd.pjcloud.canteen.vo.erp.CanteenSpuSimpleVO;
 import com.bsd.pjcloud.canteen.vo.erp.CanteenSpuStockVO;
 import com.bsd.pjcloud.common.core.util.R;
@@ -34,6 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -263,6 +265,17 @@ public class CanteenSpuController {
         return R.ok(list);
     }
 
+    /**
+     * 按套餐 SPU ID 批量查询套餐组成，供订单等内部业务补充只读展示信息。
+     *
+     * @param spuIds 套餐 SPU ID 列表，空列表返回空映射
+     * @return 套餐 SPU ID 与组成菜品列表的映射
+     */
+    @PostMapping("/ad/getComboItemsBySpuIds")
+    public R<Map<Long, List<OnlineSpuComboItemVO>>> getComboItemsBySpuIds(@RequestBody List<Long> spuIds) {
+        return R.ok(canteenSpuService.loadComboItemVos(spuIds));
+    }
+
 
     @ApiCryptoAes
     @GetMapping("/app/checkSpuStock")
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
index 5d64a0a52..bbc607843 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/mapper/CanteenDailyMenuMapper.java
@@ -2,7 +2,6 @@ package com.bsd.pjcloud.canteen.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
-import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.DailyMenuVO;
 import com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
@@ -22,14 +21,17 @@ public interface CanteenDailyMenuMapper extends PjcloudBaseMapper<CanteenDailyMe
 
 
     /**
-     * ad查询菜品列表
-     * @param day
-     * @param hourType
-     * @param categoryId
-     * @return
+     * 查询收银终端每日菜谱展示数据，字段与 App 分页查询保持一致。
+     *
+     * @param day 菜谱生效日期，格式为 yyyy-MM-dd
+     * @param hourType 餐段编码；为空表示全部餐段
+     * @param categoryId 菜品分类 ID；为空表示全部分类
+     * @param merchantId 商户 ID
+     * @param dataScope 当前数据权限范围
+     * @return 菜谱与菜品展示字段列表，套餐明细由 Service 批量补充
      */
-    List<ADCanteenDailyMenuListVO> getCanteenMenuList(@Param("day") String day, @Param("hourType") Integer hourType,
-                                                       @Param("categoryId") Long categoryId, @Param("merchantId") Long merchantId,DataScope dataScope);
+    List<DailyMenuAppVO> getCanteenMenuList(@Param("day") String day, @Param("hourType") Integer hourType,
+                                             @Param("categoryId") Long categoryId, @Param("merchantId") Long merchantId, DataScope dataScope);
 
 
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
index 7fa283a3c..839ad25c1 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/CanteenDailyMenuService.java
@@ -6,7 +6,6 @@ import com.bsd.pjcloud.canteen.dto.CanteenDailyMenuCVDTO;
 import com.bsd.pjcloud.canteen.dto.DailyMenuAll;
 import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
-import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
@@ -43,14 +42,15 @@ public interface CanteenDailyMenuService extends IService<CanteenDailyMenuEntity
 
 
     /**
-     * ad机获取每次菜品
+     * 查询收银终端指定日期的每日菜谱，并补充与 App 分页接口一致的套餐组成数据。
      *
-     * @param day
-     * @param hourType
-     * @param categoryId
-     * @return
+     * @param day 菜谱生效日期，格式为 yyyy-MM-dd
+     * @param hourType 餐段编码；为空表示全部餐段
+     * @param categoryId 菜品分类 ID；为空表示全部分类
+     * @param merchantId 商户 ID，用于隔离终端所属商户的数据
+     * @return 与 App 每日菜谱分页记录一致的展示字段列表
      */
-    List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId);
+    List<DailyMenuAppVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId);
 
     Page selectTimeFoodPage(Page page, DailyMenuDTO dailyMenuDTO);
 
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
index b24e3a862..37edcf84e 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/java/com/bsd/pjcloud/canteen/service/impl/CanteenDailyMenuServiceImpl.java
@@ -11,7 +11,6 @@ import com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO;
 import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenSpuMapper;
 import com.bsd.pjcloud.canteen.service.CanteenSpuService;
-import com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO;
 import com.bsd.pjcloud.canteen.vo.DailyMenuVO;
 import com.bsd.pjcloud.canteen.entity.CanteenDailyMenuEntity;
 import com.bsd.pjcloud.canteen.mapper.CanteenDailyMenuMapper;
@@ -138,9 +137,20 @@ public class CanteenDailyMenuServiceImpl extends ServiceImpl<CanteenDailyMenuMap
         return true;
     }
 
+    /**
+     * 查询收银终端每日菜谱，并批量补充套餐组成以避免逐条查询。
+     *
+     * @param day 菜谱生效日期，格式为 yyyy-MM-dd
+     * @param hourType 餐段编码；为空表示全部餐段
+     * @param categoryId 菜品分类 ID；为空表示全部分类
+     * @param merchantId 收银终端所属商户 ID
+     * @return 可售菜谱列表；单品的套餐组成固定为空列表
+     */
     @Override
-    public List<ADCanteenDailyMenuListVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId) {
-        return baseMapper.getCanteenMenuList(day, hourType, categoryId, merchantId, DataScope.of());
+    public List<DailyMenuAppVO> getCanteenMenuListScope(String day, Integer hourType, Long categoryId, Long merchantId) {
+        List<DailyMenuAppVO> list = baseMapper.getCanteenMenuList(day, hourType, categoryId, merchantId, DataScope.of());
+        fillDailyMenuAppCombo(list);
+        return list;
     }
 
     @Override
diff --git a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
index d15159de9..593026e89 100644
--- a/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
+++ b/pjcloud-canteen/pjcloud-canteen-biz/src/main/resources/mapper/CanteenDailyMenuMapper.xml
@@ -17,17 +17,26 @@
         <result property="tenantId" column="tenant_id"/>
     </resultMap>
 
-    <resultMap id="adCanteenDailyMenuListVO" type="com.bsd.pjcloud.canteen.vo.ADCanteenDailyMenuListVO">
+    <resultMap id="adDailyMenuAppVO" type="com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO">
         <id property="id" column="id"/>
-        <result property="name" column="name"/>
+        <result property="startTime" column="start_time"/>
+        <result property="merchantId" column="merchant_id"/>
         <result property="spuId" column="spu_id"/>
-        <result property="hourType" column="hour_type"/>
+        <result property="name" column="name"/>
         <result property="price" column="price"/>
+        <result property="marketPrice" column="market_price"/>
         <result property="categoryId" column="category_id"/>
+        <result property="categoryName" column="category_name"/>
         <result property="picUrl" column="pic_url"/>
+        <result property="sliderPicUrls" column="slider_pic_urls"/>
+        <result property="introduction" column="introduction"/>
+        <result property="description" column="description"/>
         <result property="stock" column="stock"/>
-        <result property="sort" column="sort"/>
+        <result property="salesCount" column="sales_count"/>
         <result property="hourType" column="hour_type"/>
+        <result property="sort" column="sort"/>
+        <result property="isShow" column="is_show"/>
+        <result property="spuType" column="spu_type"/>
     </resultMap>
     <select id="selectTimeFood" resultType="com.bsd.pjcloud.canteen.vo.DailyMenuVO">
         SELECT
@@ -54,24 +63,37 @@
         </where>
         order by sp.sort asc
     </select>
-    <select id="getCanteenMenuList" resultMap="adCanteenDailyMenuListVO">
+    <select id="getCanteenMenuList" resultMap="adDailyMenuAppVO">
         SELECT
-        sp.id as spu_id,
         t.id,
+        t.start_time,
+        t.merchant_id,
+        sp.id AS spu_id,
         sp.name,
-        sp.pic_url,
-        t.hour_type,
         sp.price,
+        sp.market_price,
+        sp.pic_url,
+        sp.slider_pic_urls,
+        sp.introduction,
+        sp.description,
         sp.stock,
-        sp.category_id,
+        sp.sales_count,
         sp.sort,
+        sp.is_show,
+        c.id AS category_id,
+        c.name AS category_name,
+        IFNULL(sp.spu_type, 1) AS spu_type,
+        t.hour_type,
+        <!-- 数据权限拦截器会在当前查询外层按部门和创建人过滤，必须在临时结果集中透传这两个字段。 -->
         t.dept_id,
         t.create_by
         FROM canteen_daily_menu t
         LEFT JOIN canteen_spu sp
         on t.spu_id=sp.id
+        LEFT JOIN canteen_category c
+        on sp.category_id = c.id AND c.del_flag = 0
         <where>
-            sp.del_flag = 0 and t.del_flag = 0
+            sp.del_flag = 0 and t.del_flag = 0 and sp.is_show = 0
             <if test="categoryId != null">
                 AND sp.category_id = #{categoryId}
             </if>
@@ -85,6 +107,7 @@
                 AND t.merchant_id = #{merchantId}
             </if>
         </where>
+        order by sp.sort asc
     </select>
     <select id="selectTimeFoodPage" resultType="com.bsd.pjcloud.canteen.vo.app.DailyMenuAppVO"
             parameterType="com.bsd.pjcloud.canteen.dto.app.DailyMenuDTO">
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/android/ReservationMenuQueryVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/android/ReservationMenuQueryVo.java
index 8a90e45ae..94294805e 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/android/ReservationMenuQueryVo.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/android/ReservationMenuQueryVo.java
@@ -73,9 +73,13 @@ public class ReservationMenuQueryVo {
         private List<OrderItem> items;
     }
 
+    /** 单笔预约订单中的商品及其套餐展示信息。 */
     @Data
     public static class OrderItem {
 
+        /** 菜品库商品 SPU ID；历史订单数据缺失时可能为空。 */
+        private Long productId;
+
         /** 该笔预约订单购买的商品名称。 */
         private String productName;
 
@@ -84,5 +88,34 @@ public class ReservationMenuQueryVo {
 
         /** 该笔预约订单购买的商品数量；历史异常数据缺失时可能为空。 */
         private Integer productCount;
+
+        /** 商品类型：1 为单品，2 为套餐；商品元数据不可用时按单品返回。 */
+        private Integer spuType;
+
+        /** 套餐组成明细；单品或套餐元数据暂不可用时返回空列表。 */
+        private List<ComboItem> comboItems;
+    }
+
+    /** 套餐内单个组成菜品的只读展示信息。 */
+    @Data
+    public static class ComboItem {
+
+        /** 套餐组成菜品的 SPU ID。 */
+        private Long childSpuId;
+
+        /** 套餐组成菜品名称；历史关联菜品缺失时可能为空。 */
+        private String name;
+
+        /** 套餐组成菜品封面地址；未配置时可能为空。 */
+        private String picUrl;
+
+        /** 套餐内该组成菜品的份数。 */
+        private Integer quantity;
+
+        /** 套餐组成的显示顺序。 */
+        private Integer sortOrder;
+
+        /** 套餐组成菜品的展示单价，单位为分。 */
+        private Integer price;
     }
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImpl.java
index 2d547cefa..bb2279267 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImpl.java
@@ -6,6 +6,9 @@ import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
+import com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService;
+import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
+import com.bsd.pjcloud.canteen.vo.app.OnlineSpuComboItemVO;
 import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.hard.api.constant.ReservationRecognitionTypeEnum;
@@ -30,6 +33,7 @@ import com.bsd.pjcloud.hard.service.ReservationMenuQueryService;
 import com.bsd.pjcloud.wallet.api.feign.RemoteMchService;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
@@ -44,6 +48,7 @@ import java.util.TreeMap;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryService {
 
     private final HardManagerService hardManagerService;
@@ -53,6 +58,10 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
     private final RemoteDeptService remoteDeptService;
     private final RemoteMchService remoteMchService;
 
+    /** 食堂菜品远程服务，用于批量补充订单商品类型和套餐组成。 */
+    private final RemoteCanteenSpuService remoteCanteenSpuService;
+
+    /** {@inheritDoc} */
     @Override
     public ReservationMenuQueryVo query(ReservationMenuQueryDto dto) {
         TerminalMerchant terminalMerchant = resolveTerminalMerchant(dto.getHardId());
@@ -71,7 +80,8 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
 
         // 身份与商户条件只在服务端生成，终端无法借此接口查询其他用户或其他食堂。
         List<HardOrderVo> orders = hardOrderService.scopeList(query, null);
-        return aggregate(recognizedUser, terminalMerchant, orders, dto.getMaskName());
+        Map<Long, ProductMetadata> productMetadata = loadProductMetadata(orders);
+        return aggregate(recognizedUser, terminalMerchant, orders, dto.getMaskName(), productMetadata);
     }
 
     @Override
@@ -155,7 +165,94 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
         return new RecognizedUser(user.getUserId(), user.getName(), user.getDeptId());
     }
 
-    private ReservationMenuQueryVo aggregate(RecognizedUser user, TerminalMerchant terminalMerchant, List<HardOrderVo> sourceOrders, Boolean maskNameEnabled) {
+    /**
+     * 批量加载预约订单涉及的菜品类型与套餐组成。
+     *
+     * <p>商品元数据仅用于核销前展示，远程服务失败时必须降级为空映射，不能阻断预约查询和核销主流程。</p>
+     *
+     * @param sourceOrders 当前用户在本食堂的有效预约订单
+     * @return 商品 SPU ID 与展示元数据的映射；无法加载时返回空映射
+     */
+    private Map<Long, ProductMetadata> loadProductMetadata(List<HardOrderVo> sourceOrders) {
+        if (sourceOrders == null || sourceOrders.isEmpty()) return Map.of();
+        List<Long> productIds = sourceOrders.stream()
+                .filter(Objects::nonNull)
+                .flatMap(order -> order.getCarList() == null ? java.util.stream.Stream.empty() : order.getCarList().stream())
+                .filter(Objects::nonNull)
+                .map(HardCarVo::getProductId)
+                .filter(Objects::nonNull)
+                .distinct()
+                .toList();
+        if (productIds.isEmpty()) return Map.of();
+
+        R<List<CanteenSpuEntity>> spuResult;
+        try {
+            spuResult = remoteCanteenSpuService.getSpuListByIds(productIds);
+        } catch (Exception exception) {
+            log.warn("预约菜单商品元数据查询异常，按单品降级展示，productIds={}", productIds, exception);
+            return Map.of();
+        }
+        if (spuResult == null || !spuResult.isOk() || spuResult.getData() == null) {
+            log.warn("预约菜单商品元数据查询失败，按单品降级展示，productIds={}, message={}", productIds,
+                    spuResult == null ? null : spuResult.getMsg());
+            return Map.of();
+        }
+
+        List<CanteenSpuEntity> spus = spuResult.getData().stream()
+                .filter(spu -> spu != null && spu.getId() != null)
+                .toList();
+        List<Long> comboSpuIds = spus.stream()
+                .filter(spu -> Objects.equals(spu.getSpuType(), 2))
+                .map(CanteenSpuEntity::getId)
+                .toList();
+        Map<Long, List<OnlineSpuComboItemVO>> comboItemsBySpuId = loadComboItems(comboSpuIds);
+
+        Map<Long, ProductMetadata> result = new LinkedHashMap<>();
+        for (CanteenSpuEntity spu : spus) {
+            int spuType = Objects.equals(spu.getSpuType(), 2) ? 2 : 1;
+            List<OnlineSpuComboItemVO> sourceComboItems = comboItemsBySpuId.get(spu.getId());
+            List<OnlineSpuComboItemVO> availableComboItems = sourceComboItems == null
+                    ? List.of()
+                    : sourceComboItems;
+            List<OnlineSpuComboItemVO> comboItems = availableComboItems.stream()
+                    .filter(Objects::nonNull)
+                    .toList();
+            result.put(spu.getId(), new ProductMetadata(spuType, comboItems));
+        }
+        return result;
+    }
+
+    /**
+     * 加载指定套餐的组成明细；失败时保留已识别的套餐类型并返回空明细。
+     *
+     * @param comboSpuIds 套餐 SPU ID 列表
+     * @return 套餐 SPU ID 与组成明细映射
+     */
+    private Map<Long, List<OnlineSpuComboItemVO>> loadComboItems(List<Long> comboSpuIds) {
+        if (comboSpuIds.isEmpty()) return Map.of();
+        try {
+            R<Map<Long, List<OnlineSpuComboItemVO>>> result = remoteCanteenSpuService.getComboItemsBySpuIds(comboSpuIds);
+            if (result != null && result.isOk() && result.getData() != null) return result.getData();
+            log.warn("预约菜单套餐组成查询失败，保留套餐标识并隐藏明细，comboSpuIds={}, message={}", comboSpuIds,
+                    result == null ? null : result.getMsg());
+        } catch (Exception exception) {
+            log.warn("预约菜单套餐组成查询异常，保留套餐标识并隐藏明细，comboSpuIds={}", comboSpuIds, exception);
+        }
+        return Map.of();
+    }
+
+    /**
+     * 将预约订单聚合为终端按日期、餐段和订单展示的数据结构。
+     *
+     * @param user 已识别用户
+     * @param terminalMerchant 当前终端绑定食堂
+     * @param sourceOrders 可核销预约订单
+     * @param maskNameEnabled 是否对用户姓名脱敏
+     * @param productMetadata 商品类型与套餐组成映射
+     * @return 终端预约菜单查询结果
+     */
+    private ReservationMenuQueryVo aggregate(RecognizedUser user, TerminalMerchant terminalMerchant, List<HardOrderVo> sourceOrders,
+                                             Boolean maskNameEnabled, Map<Long, ProductMetadata> productMetadata) {
         List<HardOrderVo> orders = (sourceOrders == null ? List.<HardOrderVo>of() : sourceOrders).stream()
                 .filter(order -> order != null && order.getApptUseDate() != null && StrUtil.isNotBlank(resolveHourType(order)))
                 .sorted(Comparator.comparing(HardOrderVo::getApptUseDate)
@@ -180,7 +277,11 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
                     String productName = car.getProductName().trim();
                     meal.items().add(productName);
                     if (orderItems != null) {
-                        orderItems.add(new OrderItemAccumulator(productName, car.getProductPic(), car.getProductCount()));
+                        ProductMetadata metadata = productMetadata.get(car.getProductId());
+                        orderItems.add(new OrderItemAccumulator(
+                                car.getProductId(), productName, car.getProductPic(), car.getProductCount(),
+                                metadata == null ? 1 : metadata.spuType(),
+                                metadata == null ? List.of() : metadata.comboItems()));
                     }
                 }
             }
@@ -208,6 +309,12 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
         return result;
     }
 
+    /**
+     * 将单个餐段聚合结果转换为终端响应，并保持订单及商品的稳定顺序。
+     *
+     * @param source 餐段聚合数据
+     * @return 终端餐段响应
+     */
     private static ReservationMenuQueryVo.Meal toMeal(MealAccumulator source) {
         ReservationMenuQueryVo.Meal meal = new ReservationMenuQueryVo.Meal();
         meal.setHourType(source.hourType());
@@ -219,9 +326,12 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
             order.setOrderId(entry.getKey());
             order.setItems(entry.getValue().stream().map(sourceItem -> {
                 ReservationMenuQueryVo.OrderItem item = new ReservationMenuQueryVo.OrderItem();
+                item.setProductId(sourceItem.productId());
                 item.setProductName(sourceItem.productName());
                 item.setProductPic(sourceItem.productPic());
                 item.setProductCount(sourceItem.productCount());
+                item.setSpuType(sourceItem.spuType());
+                item.setComboItems(sourceItem.comboItems().stream().map(ReservationMenuQueryServiceImpl::toComboItem).toList());
                 return item;
             }).toList());
             return order;
@@ -229,6 +339,23 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
         return meal;
     }
 
+    /**
+     * 将食堂套餐组成转换为硬件服务对终端公开的稳定响应模型。
+     *
+     * @param source 食堂服务套餐组成
+     * @return 终端核销弹框使用的套餐组成
+     */
+    private static ReservationMenuQueryVo.ComboItem toComboItem(OnlineSpuComboItemVO source) {
+        ReservationMenuQueryVo.ComboItem item = new ReservationMenuQueryVo.ComboItem();
+        item.setChildSpuId(source.getChildSpuId());
+        item.setName(source.getName());
+        item.setPicUrl(source.getPicUrl());
+        item.setQuantity(source.getQuantity());
+        item.setSortOrder(source.getSortOrder());
+        item.setPrice(source.getPrice());
+        return item;
+    }
+
     private static String resolveHourType(HardOrderVo order) {
         return StrUtil.blankToDefault(order.getHourType(), order.getApptHourType());
     }
@@ -285,9 +412,19 @@ public class ReservationMenuQueryServiceImpl implements ReservationMenuQueryServ
         }
     }
 
+    /** 聚合阶段保存单笔订单商品与已补充套餐元数据的临时模型。 */
     private record OrderItemAccumulator(
+            /** 菜品库商品 SPU ID。 */ Long productId,
             /** 商品名称。 */ String productName,
             /** 商品图片地址。 */ String productPic,
-            /** 购买数量。 */ Integer productCount) {
+            /** 购买数量。 */ Integer productCount,
+            /** 商品类型：1 单品，2 套餐。 */ Integer spuType,
+            /** 套餐组成；单品或元数据不可用时为空列表。 */ List<OnlineSpuComboItemVO> comboItems) {
+    }
+
+    /** 按商品 SPU ID 缓存的商品类型与套餐组成。 */
+    private record ProductMetadata(
+            /** 商品类型：1 单品，2 套餐。 */ Integer spuType,
+            /** 套餐组成；单品或组成查询失败时为空列表。 */ List<OnlineSpuComboItemVO> comboItems) {
     }
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index 2d1b74efa..6207100e6 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -811,7 +811,6 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         if (ObjectUtil.isEmpty(mch)) {
             throw new RuntimeException("机器绑定的商户不存在");
         }
-
         String subject = hardCarService.computerCarSubject(dto.getSysType(), dto.getOrderType(), dto.getList());
         int totalPrice = hardCarService.computerCarTotalPrice(dto.getSysType(), dto.getOrderType(), dto.getList());
         int extraPrice = isExtraPrice(dto.getSysType()) ? computeExtraPrice(totalPrice, mch, null) : 0;
@@ -819,13 +818,11 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         if (amount <= 0) {
             throw new RuntimeException("聚合支付金额必须大于0");
         }
-
         HardOrderEntity reusableOrder = getReusableAggregateOrder(dto);
         if (reusableOrder != null) {
             validateReusableAggregateOrder(reusableOrder, dto, totalPrice, extraPrice, subject);
             return createOrReuseAggregateSession(reusableOrder, amount);
         }
-
         Long parentCarId = hardCarService.createCard(dto.getUserId(), dto.getMerchantId(), dto.getSysType(), dto.getOrderType(), dto.getList());
         HardOrderEntity order = HardOrderEntity.builder()
                 .androidOrderCode(dto.getAndroidOrderCode())
@@ -852,7 +849,6 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         if (baseMapper.insert(order) <= 0 || order.getId() == null) {
             throw new RuntimeException("创建聚合支付业务订单失败");
         }
-
         return createOrReuseAggregateSession(order, amount);
     }
 
@@ -905,9 +901,8 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
      * @return Hardware 订单及其聚合收银二维码
      */
     private HardAggregateOrderCodePayVo createOrReuseAggregateSession(HardOrderEntity order, int amount) {
-
         ThirdAggregateOrderCodePayDto aggregateDto = new ThirdAggregateOrderCodePayDto();
-        aggregateDto.setBizType(ThirdPayOrderBizTypeEnum.YXFJ_PAY);
+        aggregateDto.setBizType(ThirdPayOrderBizTypeEnum.XFJ);
         aggregateDto.setBizId(String.valueOf(order.getId()));
         aggregateDto.setMchId(order.getMerchantId());
         aggregateDto.setAmount(amount);
@@ -917,7 +912,6 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
             String message = aggregateResult == null ? "第三方支付服务无响应" : aggregateResult.getMsg();
             throw new RuntimeException("创建聚合订单码失败:" + message);
         }
-
         ThirdAggregateOrderCodePayVo aggregate = aggregateResult.getData();
         if (!ObjectUtil.isAllNotEmpty(aggregate.getAggregateNo(), aggregate.getQrCode(), aggregate.getQrCodeType(), aggregate.getExpireTime())
                 || !Objects.equals(aggregate.getQrCodeType(), AGGREGATE_ORDER_PAY_QR_CODE_TYPE)
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImplTest.java b/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImplTest.java
index c59e27400..96c5557e7 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImplTest.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/bsd/pjcloud/hard/service/impl/ReservationMenuQueryServiceImplTest.java
@@ -5,6 +5,9 @@ import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
+import com.bsd.pjcloud.canteen.api.feign.RemoteCanteenSpuService;
+import com.bsd.pjcloud.canteen.entity.CanteenSpuEntity;
+import com.bsd.pjcloud.canteen.vo.app.OnlineSpuComboItemVO;
 import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.hard.api.constant.ReservationRecognitionTypeEnum;
@@ -34,6 +37,7 @@ import org.mockito.ArgumentCaptor;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -54,8 +58,10 @@ class ReservationMenuQueryServiceImplTest {
     private final RemoteUserService remoteUserService = mock(RemoteUserService.class);
     private final RemoteDeptService remoteDeptService = mock(RemoteDeptService.class);
     private final RemoteMchService remoteMchService = mock(RemoteMchService.class);
+    private final RemoteCanteenSpuService remoteCanteenSpuService = mock(RemoteCanteenSpuService.class);
     private final ReservationMenuQueryServiceImpl service = new ReservationMenuQueryServiceImpl(
-            hardManagerService, hardApiService, hardOrderService, remoteUserService, remoteDeptService, remoteMchService);
+            hardManagerService, hardApiService, hardOrderService, remoteUserService, remoteDeptService, remoteMchService,
+            remoteCanteenSpuService);
 
     @Test
     void cardQueryUsesTerminalMerchantAndSelfOnlyFilters() {
@@ -161,6 +167,58 @@ class ReservationMenuQueryServiceImplTest {
         assertEquals(2, result.getDays().get(0).getMeals().get(0).getOrders().get(1).getItems().get(0).getProductCount());
     }
 
+    /** 验证预约订单商品会批量补充套餐类型与按配置排序的组成明细。 */
+    @Test
+    void comboMetadataIsMappedToReservationOrderItems() {
+        stubTerminal(100L, 200L, "第一食堂");
+        stubFaceUser(300L, "王小华", 400L);
+        when(hardOrderService.scopeList(any(), isNull())).thenReturn(List.of(
+                order(1L, LocalDate.of(2026, 8, 6), "2", "午餐预约", LocalDateTime.of(2026, 8, 5, 8, 0),
+                        car(501L, "小黄鱼套餐", "/menu/combo.jpg", 1))));
+        CanteenSpuEntity comboSpu = new CanteenSpuEntity();
+        comboSpu.setId(501L);
+        comboSpu.setSpuType(2);
+        when(remoteCanteenSpuService.getSpuListByIds(List.of(501L))).thenReturn(R.ok(List.of(comboSpu)));
+        OnlineSpuComboItemVO comboItem = new OnlineSpuComboItemVO();
+        comboItem.setChildSpuId(601L);
+        comboItem.setName("小黄鱼");
+        comboItem.setPicUrl("/menu/fish.jpg");
+        comboItem.setQuantity(1);
+        comboItem.setSortOrder(0);
+        comboItem.setPrice(1000);
+        when(remoteCanteenSpuService.getComboItemsBySpuIds(List.of(501L)))
+                .thenReturn(R.ok(Map.of(501L, List.of(comboItem))));
+
+        ReservationMenuQueryVo.OrderItem item = service.query(faceQuery(100L, 300L))
+                .getDays().get(0).getMeals().get(0).getOrders().get(0).getItems().get(0);
+
+        assertEquals(501L, item.getProductId());
+        assertEquals(2, item.getSpuType());
+        assertEquals(1, item.getComboItems().size());
+        assertEquals(601L, item.getComboItems().get(0).getChildSpuId());
+        assertEquals("小黄鱼", item.getComboItems().get(0).getName());
+        assertEquals(1000, item.getComboItems().get(0).getPrice());
+    }
+
+    /** 验证商品元数据服务不可用时只降级展示，不阻断预约菜单查询。 */
+    @Test
+    void productMetadataFailureDoesNotBlockReservationQuery() {
+        stubTerminal(100L, 200L, "第一食堂");
+        stubFaceUser(300L, "王小华", 400L);
+        when(hardOrderService.scopeList(any(), isNull())).thenReturn(List.of(
+                order(1L, LocalDate.of(2026, 8, 6), "2", "午餐预约", LocalDateTime.of(2026, 8, 5, 8, 0),
+                        car(501L, "小黄鱼套餐", "/menu/combo.jpg", 1))));
+        when(remoteCanteenSpuService.getSpuListByIds(List.of(501L)))
+                .thenThrow(new RuntimeException("canteen unavailable"));
+
+        ReservationMenuQueryVo.OrderItem item = service.query(faceQuery(100L, 300L))
+                .getDays().get(0).getMeals().get(0).getOrders().get(0).getItems().get(0);
+
+        assertEquals(501L, item.getProductId());
+        assertEquals(1, item.getSpuType());
+        assertTrue(item.getComboItems().isEmpty());
+    }
+
     @Test
     void invalidTerminalBindingIsRejectedBeforeIdentityLookup() {
         HardManagerEntity hard = new HardManagerEntity();
@@ -312,8 +370,15 @@ class ReservationMenuQueryServiceImplTest {
         return order;
     }
 
+    /** 构造不依赖商品元数据的历史订单商品。 */
     private static HardCarVo car(String productName, String productPic, int productCount) {
+        return car(null, productName, productPic, productCount);
+    }
+
+    /** 构造带菜品 SPU ID 的订单商品，供套餐元数据用例复用。 */
+    private static HardCarVo car(Long productId, String productName, String productPic, int productCount) {
         HardCarVo car = new HardCarVo();
+        car.setProductId(productId);
         car.setProductName(productName);
         car.setProductPic(productPic);
         car.setProductCount(productCount);
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/pay/ThirdPayOrderBizTypeEnum.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/pay/ThirdPayOrderBizTypeEnum.java
index c289c0f6c..be8d8029e 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/pay/ThirdPayOrderBizTypeEnum.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/constant/pay/ThirdPayOrderBizTypeEnum.java
@@ -17,6 +17,7 @@ public enum ThirdPayOrderBizTypeEnum {
     YXFJ_PAY("20", "云消费机付款码支付"),
     APP_SHOP_PAY("30", "APP支付-购买商品(有订单)"),
     GUARDIAN_WARD_WALLET_RECHARGE("40", "监护人代被监护人饭卡充值"),
+    XFJ("50", "食堂或者超市的消费机支付"),
     ;
 
     private final String type;
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAggregateOrderPayServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAggregateOrderPayServiceImpl.java
index 8559daced..38e4525de 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAggregateOrderPayServiceImpl.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/appplus/ThirdAggregateOrderPayServiceImpl.java
@@ -863,7 +863,7 @@ public class ThirdAggregateOrderPayServiceImpl implements ThirdAggregateOrderPay
      * @param dto 聚合支付创建请求
      */
     private void validateCreateRequest(ThirdAggregateOrderCodePayDto dto) {
-        if (dto == null || ObjectUtil.notEqual(dto.getBizType(), ThirdPayOrderBizTypeEnum.YXFJ_PAY)) {
+        if (dto == null || ObjectUtil.notEqual(dto.getBizType(), ThirdPayOrderBizTypeEnum.XFJ)) {
             throw new RuntimeException("聚合订单码仅支持云消费机支付业务");
         }
         if (StrUtil.isBlank(dto.getBizId()) || dto.getMchId() == null || dto.getAmount() == null || dto.getAmount() <= 0) {
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/handler/UserWalletCreateEvent.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/handler/UserWalletCreateEvent.java
new file mode 100644
index 000000000..04f9b8738
--- /dev/null
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/handler/UserWalletCreateEvent.java
@@ -0,0 +1,48 @@
+package com.bsd.pjcloud.admin.handler;
+
+/**
+ * 用户默认钱包创建事件。
+ *
+ * <p>事件在用户保存事务中发布，只携带异步调用所需的稳定标识，避免跨线程持有已结束的 HTTP 请求对象。</p>
+ */
+public final class UserWalletCreateEvent {
+
+    /**
+     * 已保存的用户主键；钱包服务使用该主键回查用户及其自动创建钱包角色。
+     */
+    private final Long userId;
+
+    /**
+     * 发布事件时的租户主键；为空时沿用下游服务的默认租户处理规则。
+     */
+    private final Long tenantId;
+
+    /**
+     * 创建用户默认钱包事件。
+     *
+     * @param userId 已保存的用户主键
+     * @param tenantId 用户所属租户主键，非 Web 调用场景下允许为空
+     */
+    public UserWalletCreateEvent(Long userId, Long tenantId) {
+        this.userId = userId;
+        this.tenantId = tenantId;
+    }
+
+    /**
+     * 获取需要创建默认钱包的用户主键。
+     *
+     * @return 已保存的用户主键
+     */
+    public Long getUserId() {
+        return userId;
+    }
+
+    /**
+     * 获取发布事件时的租户主键。
+     *
+     * @return 租户主键，非 Web 调用场景下可能为空
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+}
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/handler/UserWalletCreateEventListener.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/handler/UserWalletCreateEventListener.java
new file mode 100644
index 000000000..1d489d853
--- /dev/null
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/handler/UserWalletCreateEventListener.java
@@ -0,0 +1,72 @@
+package com.bsd.pjcloud.admin.handler;
+
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.data.tenant.TenantBroker;
+import com.bsd.pjcloud.wallet.api.feign.RemoteWalletService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+/**
+ * 用户默认钱包创建事件监听器。
+ *
+ * <p>监听器在用户事务提交成功后才进入 Spring 管理的异步线程池，避免钱包服务回查到未提交的用户数据。</p>
+ */
+@Slf4j
+@Component
+public class UserWalletCreateEventListener {
+
+    /**
+     * 钱包服务远程接口，用于创建默认钱包并同步用户部门等关联信息。
+     */
+    private final RemoteWalletService remoteWalletService;
+
+    /**
+     * 创建用户默认钱包事件监听器。
+     *
+     * @param remoteWalletService 钱包服务远程接口
+     */
+    public UserWalletCreateEventListener(RemoteWalletService remoteWalletService) {
+        this.remoteWalletService = remoteWalletService;
+    }
+
+    /**
+     * 在用户事务提交成功后异步创建默认钱包并通知钱包服务刷新用户信息。
+     *
+     * <p>无事务调用使用 fallbackExecution 直接进入异步线程；此类调用中的用户插入已按单条语句提交，
+     * 不需要等待事务同步回调。异步线程通过 TenantBroker 恢复事件发布时的租户，确保 Feign 请求携带正确租户头。</p>
+     *
+     * @param event 用户主键及事件发布时租户信息
+     */
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT, fallbackExecution = true)
+    public void createDefaultWallet(UserWalletCreateEvent event) {
+        try {
+            TenantBroker.runAs(event.getTenantId(), tenantId -> {
+                R<?> createResult = remoteWalletService.createWallet(event.getUserId());
+                if (createResult == null) {
+                    log.error("用户事务提交后创建默认钱包失败，userId:{}，钱包服务未返回结果", event.getUserId());
+                    return;
+                }
+                if (!createResult.isOk()) {
+                    log.error("用户事务提交后创建默认钱包失败，userId:{}，code:{}，msg:{}", event.getUserId(), createResult.getCode(), createResult.getMsg());
+                    return;
+                }
+
+                R<Boolean> changeResult = remoteWalletService.userChange(event.getUserId(), Boolean.FALSE);
+                if (changeResult == null) {
+                    log.error("默认钱包创建后同步用户信息失败，userId:{}，钱包服务未返回结果", event.getUserId());
+                    return;
+                }
+                if (!changeResult.isOk()) {
+                    log.error("默认钱包创建后同步用户信息失败，userId:{}，code:{}，msg:{}", event.getUserId(), changeResult.getCode(), changeResult.getMsg());
+                }
+            });
+        } catch (Exception exception) {
+            // 异步异常无法反馈给原创建用户请求，必须保留完整堆栈供后续补偿和排查。
+            log.error("用户事务提交后调用钱包服务异常，userId:{}，tenantId:{}", event.getUserId(), event.getTenantId(), exception);
+        }
+    }
+}
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
index 15c64fbc7..5703c50f9 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserServiceImpl.java
@@ -53,6 +53,7 @@ import com.bsd.pjcloud.admin.api.entity.*;
 import com.bsd.pjcloud.admin.api.entity.user.SysUserTagEntity;
 import com.bsd.pjcloud.admin.api.utils.DataUtil;
 import com.bsd.pjcloud.admin.api.vo.*;
+import com.bsd.pjcloud.admin.handler.UserWalletCreateEvent;
 import com.bsd.pjcloud.admin.mapper.SysUserFaceMapper;
 import com.bsd.pjcloud.admin.mapper.SysUserMapper;
 import com.bsd.pjcloud.admin.mapper.SysUserPostMapper;
@@ -74,6 +75,7 @@ import com.bsd.pjcloud.common.core.util.MsgUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.resolver.ParamResolver;
+import com.bsd.pjcloud.common.data.tenant.TenantContextHolder;
 import com.bsd.pjcloud.common.excel.vo.ErrorMessage;
 import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.common.security.util.SecurityUtils;
@@ -91,6 +93,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.mock.web.MockMultipartFile;
@@ -173,6 +176,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     private final FlowUtil flowUtil;
 
+    /**
+     * Spring 业务事件发布器，用于把钱包创建延迟到用户事务成功提交之后执行。
+     */
+    private final ApplicationEventPublisher applicationEventPublisher;
+
     /**
      * 申请注销用户
      */
@@ -207,6 +215,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return saveUser(userDto, true);
     }
 
+    /**
+     * 保存用户主表、身份、岗位和角色关系，并按审核结果安排后续钱包创建。
+     */
     private Long saveUser(UserDTO userDto, boolean skipAudit) {
         sysUserIdentityService.validateDto(userDto);
         SysUser sysUser = new SysUser();
@@ -272,15 +283,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (isDeptAdmin && !skipAudit) {
             getSelf().applyFlow(sysUser);
         } else {
-            // 创建用户默认钱包、保证线程header
-            RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-            CompletableFuture.runAsync(() -> {
-                RequestContextHolder.setRequestAttributes(requestAttributes);
-                // 创建钱包
-                remoteWalletService.createWallet(sysUser.getUserId());
-                // 通知钱包
-                remoteWalletService.userChange(sysUser.getUserId(), Boolean.FALSE);
-            });
+            // 事务提交前其他连接无法读取新用户，因此仅发布事件，由监听器在提交成功后异步创建钱包。
+            applicationEventPublisher.publishEvent(new UserWalletCreateEvent(sysUser.getUserId(), TenantContextHolder.getTenantId()));
         }
 
         return sysUser.getUserId();
@@ -422,8 +426,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         for (SysUser sysUser : userList) {
             cache.evict(sysUser.getUsername());
         }
+        // 删除角色
         sysUserRoleMapper.delete(Wrappers.<SysUserRole>lambdaQuery().in(SysUserRole::getUserId, userIds));
+        // 删除关系
         sysUserRelationService.deleteUserRelationByUserIds(userIds);
+        // 删除身份
         sysUserIdentityService.deleteUserIdentityByUserIds(userIds);
         this.removeBatchByIds(userIds);
         // 删除钱包
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationServiceImpl.java
index 19cc4e171..b9fb90a26 100755
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/user/SysUserRelationServiceImpl.java
@@ -258,14 +258,12 @@ public class SysUserRelationServiceImpl extends ServiceImpl<SysUserRelationMappe
     private void validateCreateUserAndRelation(SysUserRelationCreateUserDto dto) {
         Long existingUserId = dto.getSubjectUserId() == null ? dto.getObjectUserId() : dto.getSubjectUserId();
         validateExistingUserAndRelationType(existingUserId, dto.getRelationTypeId());
-        boolean usernameExists = sysUserService.exists(Wrappers.<SysUser>lambdaQuery()
-                .eq(SysUser::getUsername, dto.getUsername()));
+        boolean usernameExists = sysUserService.exists(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getUsername, dto.getUsername()));
         if (usernameExists) {
             throw new RuntimeException(MsgUtils.getMessage(ErrorCodes.SYS_USER_USERNAME_EXISTING, dto.getUsername()));
         }
         if (StrUtil.isNotBlank(dto.getPhone())) {
-            boolean phoneExists = sysUserService.exists(Wrappers.<SysUser>lambdaQuery()
-                    .eq(SysUser::getPhone, dto.getPhone()));
+            boolean phoneExists = sysUserService.exists(Wrappers.<SysUser>lambdaQuery().eq(SysUser::getPhone, dto.getPhone()));
             if (phoneExists) {
                 throw new RuntimeException(MsgUtils.getMessage(ErrorCodes.SYS_USER_PHONE_EXISTING, dto.getPhone()));
             }
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletActiveService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletActiveService.java
index e3f9c26ed..56656b15e 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletActiveService.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletActiveService.java
@@ -19,30 +19,21 @@ import java.util.List;
 public interface WalletActiveService extends IService<WalletActiveEntity> {
     /**
      * 一键开卡
-     *
-     * @param dto
      */
     void fastCreateCard(WalletActiveDto dto);
 
     /**
      * 开卡成功的通知
-     *
-     * @param id 开卡id
      */
     Boolean openCardSuccess(Long id);
 
     /**
      * 重新激活
-     *
-     * @param id 开卡id
      */
     Boolean refreshAvatar(Long id);
 
     /**
      * 绑定饭卡
-     *
-     * @param dto
-     * @return
      */
     WalletActiveEntity bindCard(WalletActiveBindCardDto dto);
 
@@ -52,22 +43,16 @@ public interface WalletActiveService extends IService<WalletActiveEntity> {
 
     /**
      * 取消绑定饭卡
-     *
-     * @param activeId 开卡id
      */
     Boolean cancelAdminBindCard(Long activeId);
 
     /**
      * 卡号是否存在
-     *
-     * @return
      */
     Boolean exitCardNumber(Long id, String CardNumber);
 
     /**
      * 更具卡号查询开卡信息
-     *
-     * @return
      */
     WalletActiveEntity getByCardNumber(@NotEmpty String cardNumber);
 
@@ -90,8 +75,14 @@ public interface WalletActiveService extends IService<WalletActiveEntity> {
      */
     Long edit(WalletActiveEntity walletActive);
 
+    /**
+     * 根据卡号删除卡
+     */
+    void delCardByCardNumber(String cardNumber);
+
     /**
      * 导入开卡信息,会直接覆盖
      */
     R importWalletActive(List<WalletImportActiveDto> excelVOList, BindingResult bindingResult);
+
 }
\ No newline at end of file
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletActiveServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletActiveServiceImpl.java
index dceb52cb7..cfb5dfd7b 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletActiveServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletActiveServiceImpl.java
@@ -339,6 +339,19 @@ public class WalletActiveServiceImpl extends ServiceImpl<WalletActiveMapper, Wal
         return walletActive.getId();
     }
 
+    /**
+     * 根据卡号删除卡
+     */
+    @Override
+    public void delCardByCardNumber(String cardNumber) {
+        if (ObjectUtil.isEmpty(cardNumber)) return;
+        Long count = baseMapper.selectCount(new LambdaQueryWrapper<WalletActiveEntity>()
+                .eq(WalletActiveEntity::getCardNumber, cardNumber)
+        );
+        if (count <= 0) return;
+        baseMapper.delete(new LambdaQueryWrapper<WalletActiveEntity>().eq(WalletActiveEntity::getCardNumber, cardNumber));
+    }
+
     /**
      * 导入开卡信息,会直接覆盖
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
index 1e3ebf0c9..9bba80d53 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletManageServiceImpl.java
@@ -218,6 +218,11 @@ public class WalletManageServiceImpl extends ServiceImpl<WalletManageMapper, Wal
                     .eq(WalletManageEntity::getUserId, userId)
             );
             if (ObjectUtil.isEmpty(list)) return false;
+            // 查询钱包list有没有绑定饭卡,如果绑定了饭卡连饭卡一起删除
+            for (WalletManageEntity wallet : list) {
+                if (ObjectUtil.isEmpty(wallet.getCardNumber())) continue;
+                walletActiveService.delCardByCardNumber(wallet.getCardNumber());
+            }
             baseMapper.deleteByIds(CollectionUtils.convertList(list, WalletManageEntity::getId));
             list.forEach(v -> redisTemplate.opsForValue().getAndDelete(CacheConstants.WALLET_DETAIL + v.getId()));
         }