又又又更新

shinnosuke

2026-08-13 dbfab7f57fbd0189b31f5f16854b4d725ee79a12

 talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantWorkService.java

@@ -45,7 +45,8 @@
      arguments.addAll(filters.arguments());

      String recordSql = """
            select o.id, o.order_no, tu.name as talent_name, tu.mobile as talent_mobile, tu.gender, tc.card_level,
            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,
                   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
@@ -70,7 +71,8 @@
   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, tc.card_level, o.benefit_id, b.benefit_name,
                   o.card_id, tc.card_no, coalesce(nullif(tu.talent_level, ''), 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,
                   o.subsidy_amount, o.pay_amount, o.order_status, o.verify_status, o.created_at,