shinnosuke
2026-08-18 69138ddcf4936098cb3b67688412badfc8f503a0
talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkService.java
@@ -46,7 +46,7 @@
      String recordSql = """
            select o.id, o.order_no, tu.name as talent_name, tu.mobile as talent_mobile, tu.gender,
                   coalesce(nullif(tu.talent_level, ''), tc.card_level) as card_level,
                   coalesce(nullif(o.card_level_snapshot, ''), tc.card_level) as card_level,
                   b.benefit_name, o.product_name_snapshot, o.order_type, o.order_amount, o.subsidy_amount, o.pay_amount,
                   o.order_status, o.verify_status, o.created_at, verified.verify_time
            from benefit_order o
@@ -71,7 +71,7 @@
   public Map<String, Object> order(String orderNo, Long merchantId, Long storeId) {
      List<Map<String, Object>> rows = query("""
            select o.id, o.order_no, o.talent_id, tu.name as talent_name, tu.mobile as talent_mobile, tu.gender,
                   o.card_id, tc.card_no, coalesce(nullif(tu.talent_level, ''), tc.card_level) as card_level,
                   o.card_id, tc.card_no, coalesce(nullif(o.card_level_snapshot, ''), tc.card_level) as card_level,
                   o.benefit_id, b.benefit_name,
                   o.merchant_id, m.merchant_name, o.product_id, o.product_name_snapshot, p.rights_config,
                   o.order_type, o.order_amount, o.base_pay_amount, o.coupon_amount,