fix: complete miniapp benefit and coupon flows

shinnosuke

2026-08-21 348ea7313f2f6681de2b0693e53c59edaf202bd1

 talent-card-server/src/main/java/com/talentcard/server/business/portal/AdminApprovalPortalService.java

@@ -10,9 +10,14 @@
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tools.jackson.core.type.TypeReference;
import tools.jackson.databind.ObjectMapper;

@Service
public class AdminApprovalPortalService {

    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
    private static final TypeReference<List<Map<String, Object>>> APPROVAL_ITEMS = new TypeReference<>() {};

    private final JdbcTemplate jdbc;

@@ -22,23 +27,68 @@

    @Transactional(readOnly = true)
    public Map<String, Object> detail(Long serviceId) {
        approvalService(serviceId);
        Map<String, Object> merchant = approvalService(serviceId);
        Map<String, Object> benefit = benefit();
        Map<String, Object> result = new LinkedHashMap<>();
        result.put("benefitId", benefit.get("id"));
        result.put("serviceId", serviceId);
        result.put("title", benefit.get("title"));
        result.put("freeLabel", benefit.get("freeLabel"));
        result.put("heroImage", benefit.get("heroImage"));
        result.put("available", number(benefit.get("enabled")) == 1);
        result.put("heroImage", text(merchant.get("coverUrl"), text(benefit.get("heroImage"))));
        result.put("available", number(benefit.get("enabled")) == 1 && number(merchant.get("status")) == 1);
        result.put("unavailableReason", text(benefit.get("unavailableReason"), "该权益暂未开放"));
        result.put("organizations", organizations(((Number) benefit.get("id")).longValue()));
        List<Map<String, Object>> configuredOrganizations = configuredOrganizations(merchant);
        result.put("organizations", configuredOrganizations.isEmpty()
                ? organizations(((Number) benefit.get("id")).longValue())
                : configuredOrganizations);
        return result;
    }

    private List<Map<String, Object>> configuredOrganizations(Map<String, Object> merchant) {
        List<Map<String, Object>> items = parseApprovalItems(merchant.get("usageInstructions"));
        if (items.isEmpty()) {
            String rightsText = text(merchant.get("rightsText"));
            if (rightsText.isBlank()) return List.of();
            items = List.of(Map.of(
                    "name", text(merchant.get("merchantName"), "行政审批服务"),
                    "content", rightsText,
                    "address", text(merchant.get("address")),
                    "phone", text(merchant.get("contactMobile"))));
        }
        List<Map<String, Object>> result = new java.util.ArrayList<>();
        for (int index = 0; index < items.size(); index++) {
            Map<String, Object> item = items.get(index);
            Map<String, Object> organization = new LinkedHashMap<>();
            organization.put("id", merchant.get("id") + "-" + index);
            organization.put("name", text(item.get("name"), text(merchant.get("merchantName"), "行政审批服务")));
            organization.put("address", text(item.get("address"), text(merchant.get("address"))));
            organization.put("latitude", merchant.get("latitude"));
            organization.put("longitude", merchant.get("longitude"));
            organization.put("description", text(item.get("content"), text(merchant.get("rightsText"), "暂无权益说明")));
            organization.put("phone", text(item.get("phone"), text(merchant.get("contactMobile"))));
            organization.put("officeHours", "");
            String windowInfoUrl = text(item.get("windowInfoUrl"), text(item.get("pdfFile"), text(item.get("pdf_file"))));
            organization.put("windowInfoUrl", windowInfoUrl);
            organization.put("windows", List.of());
            organization.put("hasWindowInfo", !windowInfoUrl.isBlank());
            result.add(organization);
        }
        return result;
    }

    private List<Map<String, Object>> parseApprovalItems(Object value) {
        if (value == null || String.valueOf(value).isBlank()) return List.of();
        try {
            return OBJECT_MAPPER.readValue(String.valueOf(value), APPROVAL_ITEMS);
        } catch (Exception ignored) {
            return List.of();
        }
    }

    private List<Map<String, Object>> organizations(Long benefitId) {
        return query("""
                select id, organization_name, address, latitude, longitude, rights_text, consultation_phone, office_hours
                select id, organization_name, address, latitude, longitude, rights_text, consultation_phone, office_hours,
                       pdf_file, is_pdf_visible
                from admin_approval_organization
                where benefit_id = ? and enabled = 1 and deleted = 0
                order by sort_no asc, id asc
@@ -61,8 +111,10 @@
            organization.put("description", row.get("rightsText"));
            organization.put("phone", text(row.get("consultationPhone")));
            organization.put("officeHours", text(row.get("officeHours")));
            String windowInfoUrl = number(row.get("isPdfVisible")) == 1 ? text(row.get("pdfFile")) : "";
            organization.put("windowInfoUrl", windowInfoUrl);
            organization.put("windows", windows);
            organization.put("hasWindowInfo", !windows.isEmpty());
            organization.put("hasWindowInfo", !windowInfoUrl.isBlank());
            return organization;
        }).toList();
    }
@@ -70,7 +122,8 @@
    private Map<String, Object> approvalService(Long serviceId) {
        if (serviceId == null || serviceId <= 0) throw new BusinessException(ErrorCode.BAD_REQUEST, "行政审批服务信息不能为空");
        List<Map<String, Object>> rows = query("""
                select m.id
                select m.id, m.merchant_name, m.address, m.contact_mobile, m.cover_url, m.latitude, m.longitude,
                       m.status, m.usage_instructions, m.rights_text
                from merchant m
                where m.id = ? and m.deleted = 0 and m.merchant_type_code = 'approval'
                """, serviceId);