Merge remote-tracking branch 'origin/saas-api' into saas-api

fs-company/src/main/java/com/fs/company/controller/bridge/CompanyBridgeController.java

@@ -118,6 +118,17 @@ public class CompanyBridgeController extends BaseController {
         return safeListFromTable("fs_store_cart_scrm");
     }
 
+    // 桥接：hisStore storeOrder 的辅助接口（避免被 /{orderId} 通配符捕获）
+    @GetMapping("/store/storeOrder/orderItemsNum")
+    public AjaxResult storeOrderItemsNum() {
+        return AjaxResult.success("orderItemsNum", 0);
+    }
+
+    @GetMapping("/store/storeOrder/getErpAccount")
+    public AjaxResult storeOrderGetErpAccount() {
+        return AjaxResult.success();
+    }
+
     @GetMapping("/store/storeOrderAudit/list")
     public TableDataInfo storeOrderAuditList() {
         return safeListFromTable("fs_store_order_audit_scrm");
@@ -3183,4 +3194,68 @@ public class CompanyBridgeController extends BaseController {
     @PostMapping("/workflow/lobster/instance/terminate/{id}")
     public AjaxResult bridge_lobster_instance_terminate(@PathVariable("id") Long id) { return AjaxResult.success(); }
 
+    // === 恢复菜单的桥接端点 ===
+
+    // CRM - AI话术润色 (前端 /crm/customer_ai_chat/*)
+    @GetMapping("/crm/customer_ai_chat/list")
+    public TableDataInfo bridge_crm_customerAiChat_list() { return getDataTable(new java.util.ArrayList<>()); }
+
+    @GetMapping("/crm/customer_ai_chat/{id}")
+    public AjaxResult bridge_crm_customerAiChat_get(@PathVariable("id") Long id) { return AjaxResult.success(); }
+
+    @PostMapping("/crm/customer_ai_chat")
+    public AjaxResult bridge_crm_customerAiChat_add() { return AjaxResult.success(); }
+
+    @PutMapping("/crm/customer_ai_chat")
+    public AjaxResult bridge_crm_customerAiChat_update() { return AjaxResult.success(); }
+
+    @DeleteMapping("/crm/customer_ai_chat/{id}")
+    public AjaxResult bridge_crm_customerAiChat_delete(@PathVariable("id") Long id) { return AjaxResult.success(); }
+
+    @PostMapping("/crm/customer_ai_chat/export")
+    public AjaxResult bridge_crm_customerAiChat_export() { return AjaxResult.success(); }
+
+    // CRM - 商机管理 (前端 /crm/customer_business/*)
+    @GetMapping("/crm/customer_business/list")
+    public TableDataInfo bridge_crm_customerBusiness_list() { return getDataTable(new java.util.ArrayList<>()); }
+
+    @GetMapping("/crm/customer_business/{id}")
+    public AjaxResult bridge_crm_customerBusiness_get(@PathVariable("id") Long id) { return AjaxResult.success(); }
+
+    @PostMapping("/crm/customer_business")
+    public AjaxResult bridge_crm_customerBusiness_add() { return AjaxResult.success(); }
+
+    @PutMapping("/crm/customer_business")
+    public AjaxResult bridge_crm_customerBusiness_update() { return AjaxResult.success(); }
+
+    @DeleteMapping("/crm/customer_business/{id}")
+    public AjaxResult bridge_crm_customerBusiness_delete(@PathVariable("id") Long id) { return AjaxResult.success(); }
+
+    @PostMapping("/crm/customer_business/export")
+    public AjaxResult bridge_crm_customerBusiness_export() { return AjaxResult.success(); }
+
+    // 计费管理 - 钱包 (前端 /billing/wallet/*)
+    @GetMapping("/billing/wallet/list")
+    public TableDataInfo bridge_billing_wallet_list() { return getDataTable(new java.util.ArrayList<>()); }
+
+    @GetMapping("/billing/wallet/me")
+    public AjaxResult bridge_billing_wallet_me() { return AjaxResult.success(new HashMap<>()); }
+
+    // 计费管理 - 模块使用统计 (前端 /company/moduleUsage/*)
+    @GetMapping("/company/moduleUsage/list")
+    public TableDataInfo bridge_company_moduleUsage_list() { return getDataTable(new java.util.ArrayList<>()); }
+
+    @GetMapping("/company/moduleUsage/page")
+    public TableDataInfo bridge_company_moduleUsage_page() { return getDataTable(new java.util.ArrayList<>()); }
+
+    @GetMapping("/company/moduleUsage/summary")
+    public TableDataInfo bridge_company_moduleUsage_summary() { return getDataTable(new java.util.ArrayList<>()); }
+
+    // 计费管理 - 模块消费统计 (前端 /company/consumeReport/*)
+    @GetMapping("/company/consumeReport/list")
+    public TableDataInfo bridge_company_consumeReport_list() { return getDataTable(new java.util.ArrayList<>()); }
+
+    @GetMapping("/company/consumeReport/page")
+    public TableDataInfo bridge_company_consumeReport_page() { return getDataTable(new java.util.ArrayList<>()); }
+
 }

fs-service/src/main/resources/mapper/aicall/CcLlmAgentProviderMapper.xml

@@ -6,19 +6,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="CcLlmAgentProvider" id="CcLlmAgentProviderResult">
         <result property="id"    column="id"    />
-        <result property="providerClassName"    column="provider_class_name"    />
-        <result property="note"    column="note"    />
+        <result property="name"    column="name"    />
+        <result property="className"    column="class_name"    />
+        <result property="configJson"    column="config_json"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectCcLlmAgentProviderVo">
-        select id, provider_class_name, note from cc_llm_agent_provider
+        select id, name, class_name, config_json, company_id, create_time, update_time from cc_llm_agent_provider
     </sql>
 
     <select id="selectCcLlmAgentProviderList" resultMap="CcLlmAgentProviderResult">
         <include refid="selectCcLlmAgentProviderVo"/>
         <where>  
-            <if test="providerClassName != null  and providerClassName != ''"> and provider_class_name like concat('%', #{providerClassName}, '%')</if>
-            <if test="note != null  and note != ''"> and note = #{note}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
         </where>
     </select>
     
@@ -30,20 +34,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertCcLlmAgentProvider" useGeneratedKeys="true" keyProperty="id">
         insert into cc_llm_agent_provider
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            provider_class_name,
-            note,
+            name,
+            class_name,
+            config_json,
+            company_id,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            #{providerClassName},
-            #{note},
+            #{name},
+            #{className},
+            #{configJson},
+            #{companyId},
         </trim>
     </insert>
 
     <update id="updateCcLlmAgentProvider">
         update cc_llm_agent_provider
         <trim prefix="SET" suffixOverrides=",">
-            provider_class_name = #{providerClassName},
-            note = #{note},
+            name = #{name},
+            class_name = #{className},
+            config_json = #{configJson},
+            company_id = #{companyId},
         </trim>
         where id = #{id}
     </update>