From 1f949ac4599ccd647f966902740e2ea12772ef45 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 10:08:16 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webb/PCFranchiseReportController.java | 653 +++++++++++++++++- 1 file changed, 651 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java index 6a1f828d5..07d3f3626 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java @@ -1,5 +1,6 @@ package com.cool.store.controller.webb; +import com.alibaba.fastjson.JSONObject; import com.cool.store.request.FranchiseReportRequest; import com.cool.store.response.FranchiseReportResponse; import com.cool.store.response.ResponseResult; @@ -28,7 +29,655 @@ public class PCFranchiseReportController { @RequestMapping("/getZxjpOpenShopReport") @ApiOperation("正新鸡排开店") - public ResponseResult> getList(@RequestBody FranchiseReportRequest request) { - return ResponseResult.success( franchiseReportService.zxjpOpenShopReport(request)); + public ResponseResult getList(@RequestBody FranchiseReportRequest request) { + // return ResponseResult.success( franchiseReportService.zxjpOpenShopReport(request)); + return ResponseResult.success(JSONObject.toJSONString(" [\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"川渝大区\",\n" + + " \"storeNum\": 3,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 3,\n" + + " \"franchiseFeeTotal\": 78000,\n" + + " \"firstYearBrandingFeeTotal\": 18000,\n" + + " \"firstYearManagementFeeTotal\": 21600,\n" + + " \"performanceBondTotal\": 15000,\n" + + " \"managementBrandingDesignFeeTotal\": 54600,\n" + + " \"loanMarginTotal\": 30000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 465\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"沪苏大区\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 26000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 5000,\n" + + " \"managementBrandingDesignFeeTotal\": 18200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 401\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"晋蒙大区\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 40000,\n" + + " \"firstYearBrandingFeeTotal\": 9600,\n" + + " \"firstYearManagementFeeTotal\": 11520,\n" + + " \"performanceBondTotal\": 6000,\n" + + " \"managementBrandingDesignFeeTotal\": 27120,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 467\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"福浙大区\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 26000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 5000,\n" + + " \"managementBrandingDesignFeeTotal\": 18200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 473\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"江西大区\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 35000,\n" + + " \"firstYearBrandingFeeTotal\": 10800,\n" + + " \"firstYearManagementFeeTotal\": 12960,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 26760,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 475\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"山东大区\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 61000,\n" + + " \"firstYearBrandingFeeTotal\": 12000,\n" + + " \"firstYearManagementFeeTotal\": 14400,\n" + + " \"performanceBondTotal\": 10000,\n" + + " \"managementBrandingDesignFeeTotal\": 36400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 426\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"深圳大区\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 20000,\n" + + " \"firstYearBrandingFeeTotal\": 4800,\n" + + " \"firstYearManagementFeeTotal\": 5760,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 13560,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 4020\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第一加盟集团\",\n" + + " \"regionName\": \"青岛大区\",\n" + + " \"storeNum\": 7,\n" + + " \"normalStoreNum\": 3,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 4,\n" + + " \"franchiseFeeTotal\": 200000,\n" + + " \"firstYearBrandingFeeTotal\": 42000,\n" + + " \"firstYearManagementFeeTotal\": 50400,\n" + + " \"performanceBondTotal\": 20000,\n" + + " \"managementBrandingDesignFeeTotal\": 112400,\n" + + " \"loanMarginTotal\": 70000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 4022\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"河南大区\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 52000,\n" + + " \"firstYearBrandingFeeTotal\": 12000,\n" + + " \"firstYearManagementFeeTotal\": 14400,\n" + + " \"performanceBondTotal\": 10000,\n" + + " \"managementBrandingDesignFeeTotal\": 36400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 466\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"浙江大区\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 46000,\n" + + " \"firstYearBrandingFeeTotal\": 12000,\n" + + " \"firstYearManagementFeeTotal\": 14400,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 29400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 403\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"河北大区\",\n" + + " \"storeNum\": 5,\n" + + " \"normalStoreNum\": 3,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 130000,\n" + + " \"firstYearBrandingFeeTotal\": 28800,\n" + + " \"firstYearManagementFeeTotal\": 34560,\n" + + " \"performanceBondTotal\": 8000,\n" + + " \"managementBrandingDesignFeeTotal\": 71360,\n" + + " \"loanMarginTotal\": 50000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 1,\n" + + " \"regionId\": 469\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"陕西大区\",\n" + + " \"storeNum\": 4,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 90000,\n" + + " \"firstYearBrandingFeeTotal\": 22800,\n" + + " \"firstYearManagementFeeTotal\": 27360,\n" + + " \"performanceBondTotal\": 11000,\n" + + " \"managementBrandingDesignFeeTotal\": 61160,\n" + + " \"loanMarginTotal\": 40000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 471\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"云南大区\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 20000,\n" + + " \"firstYearBrandingFeeTotal\": 4800,\n" + + " \"firstYearManagementFeeTotal\": 5760,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 13560,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 472\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"甘宁青新大区\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 60000,\n" + + " \"firstYearBrandingFeeTotal\": 12000,\n" + + " \"firstYearManagementFeeTotal\": 14400,\n" + + " \"performanceBondTotal\": 10000,\n" + + " \"managementBrandingDesignFeeTotal\": 36400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 477\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"广西大区\",\n" + + " \"storeNum\": 5,\n" + + " \"normalStoreNum\": 3,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 130000,\n" + + " \"firstYearBrandingFeeTotal\": 30000,\n" + + " \"firstYearManagementFeeTotal\": 36000,\n" + + " \"performanceBondTotal\": 13000,\n" + + " \"managementBrandingDesignFeeTotal\": 79000,\n" + + " \"loanMarginTotal\": 50000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 478\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"贵州大区\",\n" + + " \"storeNum\": 4,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 4,\n" + + " \"franchiseFeeTotal\": 99000,\n" + + " \"firstYearBrandingFeeTotal\": 22800,\n" + + " \"firstYearManagementFeeTotal\": 27360,\n" + + " \"performanceBondTotal\": 18000,\n" + + " \"managementBrandingDesignFeeTotal\": 68160,\n" + + " \"loanMarginTotal\": 40000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 479\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"湖南大区\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 27000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 16200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 480\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第二加盟集团\",\n" + + " \"regionName\": \"甬东大区\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 26000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 0,\n" + + " \"managementBrandingDesignFeeTotal\": 13200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 4023\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第三加盟集团\",\n" + + " \"regionName\": \"海口加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 31800,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 5000,\n" + + " \"managementBrandingDesignFeeTotal\": 18200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 1,\n" + + " \"regionId\": 132\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第三加盟集团\",\n" + + " \"regionName\": \"太原加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 9000,\n" + + " \"firstYearBrandingFeeTotal\": 4800,\n" + + " \"firstYearManagementFeeTotal\": 5760,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 13560,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 1,\n" + + " \"regionId\": 10\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第三加盟集团\",\n" + + " \"regionName\": \"信阳加盟公司\",\n" + + " \"storeNum\": 4,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 1,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 85000,\n" + + " \"firstYearBrandingFeeTotal\": 21600,\n" + + " \"firstYearManagementFeeTotal\": 25920,\n" + + " \"performanceBondTotal\": 16000,\n" + + " \"managementBrandingDesignFeeTotal\": 63520,\n" + + " \"loanMarginTotal\": 40000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 2,\n" + + " \"regionId\": 150\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第三加盟集团\",\n" + + " \"regionName\": \"郑州加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 0,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 5000,\n" + + " \"managementBrandingDesignFeeTotal\": 18200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 56\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第四加盟集团\",\n" + + " \"regionName\": \"鹰潭加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 9000,\n" + + " \"firstYearBrandingFeeTotal\": 4800,\n" + + " \"firstYearManagementFeeTotal\": 5760,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 13560,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 133\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第四加盟集团\",\n" + + " \"regionName\": \"合肥加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 9000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 16200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 31\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第四加盟集团\",\n" + + " \"regionName\": \"武汉加盟公司\",\n" + + " \"storeNum\": 4,\n" + + " \"normalStoreNum\": 3,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 92336,\n" + + " \"firstYearBrandingFeeTotal\": 24000,\n" + + " \"firstYearManagementFeeTotal\": 28800,\n" + + " \"performanceBondTotal\": 20000,\n" + + " \"managementBrandingDesignFeeTotal\": 72800,\n" + + " \"loanMarginTotal\": 40000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 42\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第四加盟集团\",\n" + + " \"regionName\": \"南京加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 20000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 5000,\n" + + " \"managementBrandingDesignFeeTotal\": 18200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 1,\n" + + " \"regionId\": 127\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第五加盟集团\",\n" + + " \"regionName\": \"瑞安加盟公司\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 1,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 52000,\n" + + " \"firstYearBrandingFeeTotal\": 12000,\n" + + " \"firstYearManagementFeeTotal\": 14400,\n" + + " \"performanceBondTotal\": 5000,\n" + + " \"managementBrandingDesignFeeTotal\": 31400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 1,\n" + + " \"regionId\": 129\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第五加盟集团\",\n" + + " \"regionName\": \"杭嘉加盟公司\",\n" + + " \"storeNum\": 5,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 104000,\n" + + " \"firstYearBrandingFeeTotal\": 30000,\n" + + " \"firstYearManagementFeeTotal\": 36000,\n" + + " \"performanceBondTotal\": 13000,\n" + + " \"managementBrandingDesignFeeTotal\": 79000,\n" + + " \"loanMarginTotal\": 50000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 1,\n" + + " \"regionId\": 136\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第五加盟集团\",\n" + + " \"regionName\": \"杭湖加盟公司\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 40000,\n" + + " \"firstYearBrandingFeeTotal\": 10800,\n" + + " \"firstYearManagementFeeTotal\": 12960,\n" + + " \"performanceBondTotal\": 6000,\n" + + " \"managementBrandingDesignFeeTotal\": 29760,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 137\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第五加盟集团\",\n" + + " \"regionName\": \"福州加盟公司\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 52000,\n" + + " \"firstYearBrandingFeeTotal\": 12000,\n" + + " \"firstYearManagementFeeTotal\": 14400,\n" + + " \"performanceBondTotal\": 10000,\n" + + " \"managementBrandingDesignFeeTotal\": 36400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 138\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第五加盟集团\",\n" + + " \"regionName\": \"宁波加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 26000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 0,\n" + + " \"managementBrandingDesignFeeTotal\": 13200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 144\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第六加盟集团\",\n" + + " \"regionName\": \"天津加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 0,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 16200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 81\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第六加盟集团\",\n" + + " \"regionName\": \"石家庄加盟公司\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 40000,\n" + + " \"firstYearBrandingFeeTotal\": 9600,\n" + + " \"firstYearManagementFeeTotal\": 11520,\n" + + " \"performanceBondTotal\": 6000,\n" + + " \"managementBrandingDesignFeeTotal\": 27120,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 29\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第六加盟集团\",\n" + + " \"regionName\": \"贵阳加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 9000,\n" + + " \"firstYearBrandingFeeTotal\": 4800,\n" + + " \"firstYearManagementFeeTotal\": 5760,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 13560,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 30\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第七加盟集团\",\n" + + " \"regionName\": \"湘潭加盟公司\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 1,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 26000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 20400,\n" + + " \"performanceBondTotal\": 5000,\n" + + " \"managementBrandingDesignFeeTotal\": 31400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 2,\n" + + " \"regionId\": 143\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第七加盟集团\",\n" + + " \"regionName\": \"昆明加盟公司\",\n" + + " \"storeNum\": 2,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 0,\n" + + " \"franchiseFeeTotal\": 26000,\n" + + " \"firstYearBrandingFeeTotal\": 12000,\n" + + " \"firstYearManagementFeeTotal\": 14400,\n" + + " \"performanceBondTotal\": 10000,\n" + + " \"managementBrandingDesignFeeTotal\": 36400,\n" + + " \"loanMarginTotal\": 20000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 148\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第七加盟集团\",\n" + + " \"regionName\": \"南宁加盟公司\",\n" + + " \"storeNum\": 1,\n" + + " \"normalStoreNum\": 0,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 1,\n" + + " \"franchiseFeeTotal\": 9000,\n" + + " \"firstYearBrandingFeeTotal\": 6000,\n" + + " \"firstYearManagementFeeTotal\": 7200,\n" + + " \"performanceBondTotal\": 3000,\n" + + " \"managementBrandingDesignFeeTotal\": 16200,\n" + + " \"loanMarginTotal\": 10000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 0,\n" + + " \"regionId\": 125\n" + + " },\n" + + " {\n" + + " \"joinGroupName\": \"第八加盟集团\",\n" + + " \"regionName\": \"两广加盟公司\",\n" + + " \"storeNum\": 4,\n" + + " \"normalStoreNum\": 2,\n" + + " \"restaurantStoreNum\": 0,\n" + + " \"noShowStoreNum\": 2,\n" + + " \"franchiseFeeTotal\": 92000,\n" + + " \"firstYearBrandingFeeTotal\": 21600,\n" + + " \"firstYearManagementFeeTotal\": 25920,\n" + + " \"performanceBondTotal\": 11000,\n" + + " \"managementBrandingDesignFeeTotal\": 58520,\n" + + " \"loanMarginTotal\": 40000,\n" + + " \"yesterdayDate\": \"2025-05-15\",\n" + + " \"yesterdayStoreNum\": 1,\n" + + " \"regionId\": 29923\n" + + " }\n" + + " ]")); } } From a4d2d0a71a3afdccf85e45d9e41ce479bca1a5f8 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 10:09:37 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/FranchiseReportServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index 668978268..d38421b32 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -27,6 +27,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -145,6 +146,12 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { return Collections.emptyList(); } sortByName(list); + if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){ + //集团维度 + List joinGroupList = new ArrayList<>(); + Map listMap = list.stream().collect(Collectors.toMap(FranchiseReportResponse::getJoinGroupName, Function.identity())); + + } return list; } From 83f2dcb7c02503359973b188618cac8bdd006269 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 10:19:46 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webb/PCFranchiseReportController.java | 649 +----------------- 1 file changed, 1 insertion(+), 648 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java index 07d3f3626..bcfd94a78 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java @@ -31,653 +31,6 @@ public class PCFranchiseReportController { @ApiOperation("正新鸡排开店") public ResponseResult getList(@RequestBody FranchiseReportRequest request) { // return ResponseResult.success( franchiseReportService.zxjpOpenShopReport(request)); - return ResponseResult.success(JSONObject.toJSONString(" [\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"川渝大区\",\n" + - " \"storeNum\": 3,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 3,\n" + - " \"franchiseFeeTotal\": 78000,\n" + - " \"firstYearBrandingFeeTotal\": 18000,\n" + - " \"firstYearManagementFeeTotal\": 21600,\n" + - " \"performanceBondTotal\": 15000,\n" + - " \"managementBrandingDesignFeeTotal\": 54600,\n" + - " \"loanMarginTotal\": 30000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 465\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"沪苏大区\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 26000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 5000,\n" + - " \"managementBrandingDesignFeeTotal\": 18200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 401\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"晋蒙大区\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 40000,\n" + - " \"firstYearBrandingFeeTotal\": 9600,\n" + - " \"firstYearManagementFeeTotal\": 11520,\n" + - " \"performanceBondTotal\": 6000,\n" + - " \"managementBrandingDesignFeeTotal\": 27120,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 467\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"福浙大区\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 26000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 5000,\n" + - " \"managementBrandingDesignFeeTotal\": 18200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 473\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"江西大区\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 35000,\n" + - " \"firstYearBrandingFeeTotal\": 10800,\n" + - " \"firstYearManagementFeeTotal\": 12960,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 26760,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 475\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"山东大区\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 61000,\n" + - " \"firstYearBrandingFeeTotal\": 12000,\n" + - " \"firstYearManagementFeeTotal\": 14400,\n" + - " \"performanceBondTotal\": 10000,\n" + - " \"managementBrandingDesignFeeTotal\": 36400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 426\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"深圳大区\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 20000,\n" + - " \"firstYearBrandingFeeTotal\": 4800,\n" + - " \"firstYearManagementFeeTotal\": 5760,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 13560,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 4020\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第一加盟集团\",\n" + - " \"regionName\": \"青岛大区\",\n" + - " \"storeNum\": 7,\n" + - " \"normalStoreNum\": 3,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 4,\n" + - " \"franchiseFeeTotal\": 200000,\n" + - " \"firstYearBrandingFeeTotal\": 42000,\n" + - " \"firstYearManagementFeeTotal\": 50400,\n" + - " \"performanceBondTotal\": 20000,\n" + - " \"managementBrandingDesignFeeTotal\": 112400,\n" + - " \"loanMarginTotal\": 70000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 4022\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"河南大区\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 52000,\n" + - " \"firstYearBrandingFeeTotal\": 12000,\n" + - " \"firstYearManagementFeeTotal\": 14400,\n" + - " \"performanceBondTotal\": 10000,\n" + - " \"managementBrandingDesignFeeTotal\": 36400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 466\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"浙江大区\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 46000,\n" + - " \"firstYearBrandingFeeTotal\": 12000,\n" + - " \"firstYearManagementFeeTotal\": 14400,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 29400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 403\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"河北大区\",\n" + - " \"storeNum\": 5,\n" + - " \"normalStoreNum\": 3,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 130000,\n" + - " \"firstYearBrandingFeeTotal\": 28800,\n" + - " \"firstYearManagementFeeTotal\": 34560,\n" + - " \"performanceBondTotal\": 8000,\n" + - " \"managementBrandingDesignFeeTotal\": 71360,\n" + - " \"loanMarginTotal\": 50000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 1,\n" + - " \"regionId\": 469\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"陕西大区\",\n" + - " \"storeNum\": 4,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 90000,\n" + - " \"firstYearBrandingFeeTotal\": 22800,\n" + - " \"firstYearManagementFeeTotal\": 27360,\n" + - " \"performanceBondTotal\": 11000,\n" + - " \"managementBrandingDesignFeeTotal\": 61160,\n" + - " \"loanMarginTotal\": 40000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 471\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"云南大区\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 20000,\n" + - " \"firstYearBrandingFeeTotal\": 4800,\n" + - " \"firstYearManagementFeeTotal\": 5760,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 13560,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 472\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"甘宁青新大区\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 60000,\n" + - " \"firstYearBrandingFeeTotal\": 12000,\n" + - " \"firstYearManagementFeeTotal\": 14400,\n" + - " \"performanceBondTotal\": 10000,\n" + - " \"managementBrandingDesignFeeTotal\": 36400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 477\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"广西大区\",\n" + - " \"storeNum\": 5,\n" + - " \"normalStoreNum\": 3,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 130000,\n" + - " \"firstYearBrandingFeeTotal\": 30000,\n" + - " \"firstYearManagementFeeTotal\": 36000,\n" + - " \"performanceBondTotal\": 13000,\n" + - " \"managementBrandingDesignFeeTotal\": 79000,\n" + - " \"loanMarginTotal\": 50000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 478\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"贵州大区\",\n" + - " \"storeNum\": 4,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 4,\n" + - " \"franchiseFeeTotal\": 99000,\n" + - " \"firstYearBrandingFeeTotal\": 22800,\n" + - " \"firstYearManagementFeeTotal\": 27360,\n" + - " \"performanceBondTotal\": 18000,\n" + - " \"managementBrandingDesignFeeTotal\": 68160,\n" + - " \"loanMarginTotal\": 40000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 479\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"湖南大区\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 27000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 16200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 480\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第二加盟集团\",\n" + - " \"regionName\": \"甬东大区\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 26000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 0,\n" + - " \"managementBrandingDesignFeeTotal\": 13200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 4023\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第三加盟集团\",\n" + - " \"regionName\": \"海口加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 31800,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 5000,\n" + - " \"managementBrandingDesignFeeTotal\": 18200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 1,\n" + - " \"regionId\": 132\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第三加盟集团\",\n" + - " \"regionName\": \"太原加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 9000,\n" + - " \"firstYearBrandingFeeTotal\": 4800,\n" + - " \"firstYearManagementFeeTotal\": 5760,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 13560,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 1,\n" + - " \"regionId\": 10\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第三加盟集团\",\n" + - " \"regionName\": \"信阳加盟公司\",\n" + - " \"storeNum\": 4,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 1,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 85000,\n" + - " \"firstYearBrandingFeeTotal\": 21600,\n" + - " \"firstYearManagementFeeTotal\": 25920,\n" + - " \"performanceBondTotal\": 16000,\n" + - " \"managementBrandingDesignFeeTotal\": 63520,\n" + - " \"loanMarginTotal\": 40000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 2,\n" + - " \"regionId\": 150\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第三加盟集团\",\n" + - " \"regionName\": \"郑州加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 0,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 5000,\n" + - " \"managementBrandingDesignFeeTotal\": 18200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 56\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第四加盟集团\",\n" + - " \"regionName\": \"鹰潭加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 9000,\n" + - " \"firstYearBrandingFeeTotal\": 4800,\n" + - " \"firstYearManagementFeeTotal\": 5760,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 13560,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 133\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第四加盟集团\",\n" + - " \"regionName\": \"合肥加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 9000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 16200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 31\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第四加盟集团\",\n" + - " \"regionName\": \"武汉加盟公司\",\n" + - " \"storeNum\": 4,\n" + - " \"normalStoreNum\": 3,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 92336,\n" + - " \"firstYearBrandingFeeTotal\": 24000,\n" + - " \"firstYearManagementFeeTotal\": 28800,\n" + - " \"performanceBondTotal\": 20000,\n" + - " \"managementBrandingDesignFeeTotal\": 72800,\n" + - " \"loanMarginTotal\": 40000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 42\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第四加盟集团\",\n" + - " \"regionName\": \"南京加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 20000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 5000,\n" + - " \"managementBrandingDesignFeeTotal\": 18200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 1,\n" + - " \"regionId\": 127\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第五加盟集团\",\n" + - " \"regionName\": \"瑞安加盟公司\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 1,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 52000,\n" + - " \"firstYearBrandingFeeTotal\": 12000,\n" + - " \"firstYearManagementFeeTotal\": 14400,\n" + - " \"performanceBondTotal\": 5000,\n" + - " \"managementBrandingDesignFeeTotal\": 31400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 1,\n" + - " \"regionId\": 129\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第五加盟集团\",\n" + - " \"regionName\": \"杭嘉加盟公司\",\n" + - " \"storeNum\": 5,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 104000,\n" + - " \"firstYearBrandingFeeTotal\": 30000,\n" + - " \"firstYearManagementFeeTotal\": 36000,\n" + - " \"performanceBondTotal\": 13000,\n" + - " \"managementBrandingDesignFeeTotal\": 79000,\n" + - " \"loanMarginTotal\": 50000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 1,\n" + - " \"regionId\": 136\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第五加盟集团\",\n" + - " \"regionName\": \"杭湖加盟公司\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 40000,\n" + - " \"firstYearBrandingFeeTotal\": 10800,\n" + - " \"firstYearManagementFeeTotal\": 12960,\n" + - " \"performanceBondTotal\": 6000,\n" + - " \"managementBrandingDesignFeeTotal\": 29760,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 137\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第五加盟集团\",\n" + - " \"regionName\": \"福州加盟公司\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 52000,\n" + - " \"firstYearBrandingFeeTotal\": 12000,\n" + - " \"firstYearManagementFeeTotal\": 14400,\n" + - " \"performanceBondTotal\": 10000,\n" + - " \"managementBrandingDesignFeeTotal\": 36400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 138\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第五加盟集团\",\n" + - " \"regionName\": \"宁波加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 26000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 0,\n" + - " \"managementBrandingDesignFeeTotal\": 13200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 144\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第六加盟集团\",\n" + - " \"regionName\": \"天津加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 0,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 16200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 81\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第六加盟集团\",\n" + - " \"regionName\": \"石家庄加盟公司\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 40000,\n" + - " \"firstYearBrandingFeeTotal\": 9600,\n" + - " \"firstYearManagementFeeTotal\": 11520,\n" + - " \"performanceBondTotal\": 6000,\n" + - " \"managementBrandingDesignFeeTotal\": 27120,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 29\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第六加盟集团\",\n" + - " \"regionName\": \"贵阳加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 9000,\n" + - " \"firstYearBrandingFeeTotal\": 4800,\n" + - " \"firstYearManagementFeeTotal\": 5760,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 13560,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 30\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第七加盟集团\",\n" + - " \"regionName\": \"湘潭加盟公司\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 1,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 26000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 20400,\n" + - " \"performanceBondTotal\": 5000,\n" + - " \"managementBrandingDesignFeeTotal\": 31400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 2,\n" + - " \"regionId\": 143\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第七加盟集团\",\n" + - " \"regionName\": \"昆明加盟公司\",\n" + - " \"storeNum\": 2,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 0,\n" + - " \"franchiseFeeTotal\": 26000,\n" + - " \"firstYearBrandingFeeTotal\": 12000,\n" + - " \"firstYearManagementFeeTotal\": 14400,\n" + - " \"performanceBondTotal\": 10000,\n" + - " \"managementBrandingDesignFeeTotal\": 36400,\n" + - " \"loanMarginTotal\": 20000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 148\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第七加盟集团\",\n" + - " \"regionName\": \"南宁加盟公司\",\n" + - " \"storeNum\": 1,\n" + - " \"normalStoreNum\": 0,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 1,\n" + - " \"franchiseFeeTotal\": 9000,\n" + - " \"firstYearBrandingFeeTotal\": 6000,\n" + - " \"firstYearManagementFeeTotal\": 7200,\n" + - " \"performanceBondTotal\": 3000,\n" + - " \"managementBrandingDesignFeeTotal\": 16200,\n" + - " \"loanMarginTotal\": 10000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 0,\n" + - " \"regionId\": 125\n" + - " },\n" + - " {\n" + - " \"joinGroupName\": \"第八加盟集团\",\n" + - " \"regionName\": \"两广加盟公司\",\n" + - " \"storeNum\": 4,\n" + - " \"normalStoreNum\": 2,\n" + - " \"restaurantStoreNum\": 0,\n" + - " \"noShowStoreNum\": 2,\n" + - " \"franchiseFeeTotal\": 92000,\n" + - " \"firstYearBrandingFeeTotal\": 21600,\n" + - " \"firstYearManagementFeeTotal\": 25920,\n" + - " \"performanceBondTotal\": 11000,\n" + - " \"managementBrandingDesignFeeTotal\": 58520,\n" + - " \"loanMarginTotal\": 40000,\n" + - " \"yesterdayDate\": \"2025-05-15\",\n" + - " \"yesterdayStoreNum\": 1,\n" + - " \"regionId\": 29923\n" + - " }\n" + - " ]")); + return ResponseResult.success(JSONObject.toJSONString("[{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"川渝大区\",\"storeNum\":3,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":3,\"franchiseFeeTotal\":78000,\"firstYearBrandingFeeTotal\":18000,\"firstYearManagementFeeTotal\":21600,\"performanceBondTotal\":15000,\"managementBrandingDesignFeeTotal\":54600,\"loanMarginTotal\":30000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":465},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"沪苏大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":401},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"晋蒙大区\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":40000,\"firstYearBrandingFeeTotal\":9600,\"firstYearManagementFeeTotal\":11520,\"performanceBondTotal\":6000,\"managementBrandingDesignFeeTotal\":27120,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":467},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"福浙大区\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":473},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"江西大区\",\"storeNum\":2,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":35000,\"firstYearBrandingFeeTotal\":10800,\"firstYearManagementFeeTotal\":12960,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":26760,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":475},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"山东大区\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":61000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":426},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"深圳大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":20000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":4020},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"青岛大区\",\"storeNum\":7,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":4,\"franchiseFeeTotal\":200000,\"firstYearBrandingFeeTotal\":42000,\"firstYearManagementFeeTotal\":50400,\"performanceBondTotal\":20000,\"managementBrandingDesignFeeTotal\":112400,\"loanMarginTotal\":70000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":4022},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"河南大区\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":52000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":466},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"浙江大区\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":46000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":29400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":403},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"河北大区\",\"storeNum\":5,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":130000,\"firstYearBrandingFeeTotal\":28800,\"firstYearManagementFeeTotal\":34560,\"performanceBondTotal\":8000,\"managementBrandingDesignFeeTotal\":71360,\"loanMarginTotal\":50000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":469},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"陕西大区\",\"storeNum\":4,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":90000,\"firstYearBrandingFeeTotal\":22800,\"firstYearManagementFeeTotal\":27360,\"performanceBondTotal\":11000,\"managementBrandingDesignFeeTotal\":61160,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":471},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"云南大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":20000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":472},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"甘宁青新大区\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":60000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":477},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"广西大区\",\"storeNum\":5,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":130000,\"firstYearBrandingFeeTotal\":30000,\"firstYearManagementFeeTotal\":36000,\"performanceBondTotal\":13000,\"managementBrandingDesignFeeTotal\":79000,\"loanMarginTotal\":50000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":478},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"贵州大区\",\"storeNum\":4,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":4,\"franchiseFeeTotal\":99000,\"firstYearBrandingFeeTotal\":22800,\"firstYearManagementFeeTotal\":27360,\"performanceBondTotal\":18000,\"managementBrandingDesignFeeTotal\":68160,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":479},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"湖南大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":27000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":480},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"甬东大区\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":0,\"managementBrandingDesignFeeTotal\":13200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":4023},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"海口加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":31800,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":132},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"太原加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":10},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"信阳加盟公司\",\"storeNum\":4,\"normalStoreNum\":2,\"restaurantStoreNum\":1,\"noShowStoreNum\":1,\"franchiseFeeTotal\":85000,\"firstYearBrandingFeeTotal\":21600,\"firstYearManagementFeeTotal\":25920,\"performanceBondTotal\":16000,\"managementBrandingDesignFeeTotal\":63520,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":2,\"regionId\":150},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"郑州加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":0,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":56},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"鹰潭加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":133},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"合肥加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":31},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"武汉加盟公司\",\"storeNum\":4,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":92336,\"firstYearBrandingFeeTotal\":24000,\"firstYearManagementFeeTotal\":28800,\"performanceBondTotal\":20000,\"managementBrandingDesignFeeTotal\":72800,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":42},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"南京加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":20000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":127},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"瑞安加盟公司\",\"storeNum\":2,\"normalStoreNum\":1,\"restaurantStoreNum\":1,\"noShowStoreNum\":0,\"franchiseFeeTotal\":52000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":31400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":129},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"杭嘉加盟公司\",\"storeNum\":5,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":104000,\"firstYearBrandingFeeTotal\":30000,\"firstYearManagementFeeTotal\":36000,\"performanceBondTotal\":13000,\"managementBrandingDesignFeeTotal\":79000,\"loanMarginTotal\":50000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":136},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"杭湖加盟公司\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":40000,\"firstYearBrandingFeeTotal\":10800,\"firstYearManagementFeeTotal\":12960,\"performanceBondTotal\":6000,\"managementBrandingDesignFeeTotal\":29760,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":137},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"福州加盟公司\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":52000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":138},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"宁波加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":0,\"managementBrandingDesignFeeTotal\":13200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":144},{\"joinGroupName\":\"第六加盟集团\",\"regionName\":\"天津加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":0,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":81},{\"joinGroupName\":\"第六加盟集团\",\"regionName\":\"石家庄加盟公司\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":40000,\"firstYearBrandingFeeTotal\":9600,\"firstYearManagementFeeTotal\":11520,\"performanceBondTotal\":6000,\"managementBrandingDesignFeeTotal\":27120,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":29},{\"joinGroupName\":\"第六加盟集团\",\"regionName\":\"贵阳加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":30},{\"joinGroupName\":\"第七加盟集团\",\"regionName\":\"湘潭加盟公司\",\"storeNum\":2,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":20400,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":31400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":2,\"regionId\":143},{\"joinGroupName\":\"第七加盟集团\",\"regionName\":\"昆明加盟公司\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":148},{\"joinGroupName\":\"第七加盟集团\",\"regionName\":\"南宁加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":125},{\"joinGroupName\":\"第八加盟集团\",\"regionName\":\"两广加盟公司\",\"storeNum\":4,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":92000,\"firstYearBrandingFeeTotal\":21600,\"firstYearManagementFeeTotal\":25920,\"performanceBondTotal\":11000,\"managementBrandingDesignFeeTotal\":58520,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":29923}]")); } } From 9ad46e89435d5179acd22688b99dd793f8cd136e Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 10:28:55 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FranchiseReportServiceImpl.java | 30 ++++++++++++++----- .../webb/PCFranchiseReportController.java | 7 ++--- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index d38421b32..c9557245e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -146,13 +146,29 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { return Collections.emptyList(); } sortByName(list); - if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){ - //集团维度 - List joinGroupList = new ArrayList<>(); - Map listMap = list.stream().collect(Collectors.toMap(FranchiseReportResponse::getJoinGroupName, Function.identity())); - - } - return list; +// if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){ +// //集团维度 +// List joinGroupList = new ArrayList<>(); +// Map listMap = list.stream().collect(Collectors.toMap(FranchiseReportResponse::getJoinGroupName, Function.identity())); +// } + List ab = new ArrayList(); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + ab.addAll(list); + return ab; } public static void sortByName(List list) { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java index bcfd94a78..df3186d4d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCFranchiseReportController.java @@ -29,8 +29,7 @@ public class PCFranchiseReportController { @RequestMapping("/getZxjpOpenShopReport") @ApiOperation("正新鸡排开店") - public ResponseResult getList(@RequestBody FranchiseReportRequest request) { - // return ResponseResult.success( franchiseReportService.zxjpOpenShopReport(request)); - return ResponseResult.success(JSONObject.toJSONString("[{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"川渝大区\",\"storeNum\":3,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":3,\"franchiseFeeTotal\":78000,\"firstYearBrandingFeeTotal\":18000,\"firstYearManagementFeeTotal\":21600,\"performanceBondTotal\":15000,\"managementBrandingDesignFeeTotal\":54600,\"loanMarginTotal\":30000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":465},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"沪苏大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":401},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"晋蒙大区\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":40000,\"firstYearBrandingFeeTotal\":9600,\"firstYearManagementFeeTotal\":11520,\"performanceBondTotal\":6000,\"managementBrandingDesignFeeTotal\":27120,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":467},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"福浙大区\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":473},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"江西大区\",\"storeNum\":2,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":35000,\"firstYearBrandingFeeTotal\":10800,\"firstYearManagementFeeTotal\":12960,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":26760,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":475},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"山东大区\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":61000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":426},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"深圳大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":20000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":4020},{\"joinGroupName\":\"第一加盟集团\",\"regionName\":\"青岛大区\",\"storeNum\":7,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":4,\"franchiseFeeTotal\":200000,\"firstYearBrandingFeeTotal\":42000,\"firstYearManagementFeeTotal\":50400,\"performanceBondTotal\":20000,\"managementBrandingDesignFeeTotal\":112400,\"loanMarginTotal\":70000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":4022},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"河南大区\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":52000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":466},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"浙江大区\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":46000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":29400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":403},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"河北大区\",\"storeNum\":5,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":130000,\"firstYearBrandingFeeTotal\":28800,\"firstYearManagementFeeTotal\":34560,\"performanceBondTotal\":8000,\"managementBrandingDesignFeeTotal\":71360,\"loanMarginTotal\":50000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":469},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"陕西大区\",\"storeNum\":4,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":90000,\"firstYearBrandingFeeTotal\":22800,\"firstYearManagementFeeTotal\":27360,\"performanceBondTotal\":11000,\"managementBrandingDesignFeeTotal\":61160,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":471},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"云南大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":20000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":472},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"甘宁青新大区\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":60000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":477},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"广西大区\",\"storeNum\":5,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":130000,\"firstYearBrandingFeeTotal\":30000,\"firstYearManagementFeeTotal\":36000,\"performanceBondTotal\":13000,\"managementBrandingDesignFeeTotal\":79000,\"loanMarginTotal\":50000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":478},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"贵州大区\",\"storeNum\":4,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":4,\"franchiseFeeTotal\":99000,\"firstYearBrandingFeeTotal\":22800,\"firstYearManagementFeeTotal\":27360,\"performanceBondTotal\":18000,\"managementBrandingDesignFeeTotal\":68160,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":479},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"湖南大区\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":27000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":480},{\"joinGroupName\":\"第二加盟集团\",\"regionName\":\"甬东大区\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":0,\"managementBrandingDesignFeeTotal\":13200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":4023},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"海口加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":31800,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":132},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"太原加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":10},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"信阳加盟公司\",\"storeNum\":4,\"normalStoreNum\":2,\"restaurantStoreNum\":1,\"noShowStoreNum\":1,\"franchiseFeeTotal\":85000,\"firstYearBrandingFeeTotal\":21600,\"firstYearManagementFeeTotal\":25920,\"performanceBondTotal\":16000,\"managementBrandingDesignFeeTotal\":63520,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":2,\"regionId\":150},{\"joinGroupName\":\"第三加盟集团\",\"regionName\":\"郑州加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":0,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":56},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"鹰潭加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":133},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"合肥加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":31},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"武汉加盟公司\",\"storeNum\":4,\"normalStoreNum\":3,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":92336,\"firstYearBrandingFeeTotal\":24000,\"firstYearManagementFeeTotal\":28800,\"performanceBondTotal\":20000,\"managementBrandingDesignFeeTotal\":72800,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":42},{\"joinGroupName\":\"第四加盟集团\",\"regionName\":\"南京加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":20000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":18200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":127},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"瑞安加盟公司\",\"storeNum\":2,\"normalStoreNum\":1,\"restaurantStoreNum\":1,\"noShowStoreNum\":0,\"franchiseFeeTotal\":52000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":31400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":129},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"杭嘉加盟公司\",\"storeNum\":5,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":104000,\"firstYearBrandingFeeTotal\":30000,\"firstYearManagementFeeTotal\":36000,\"performanceBondTotal\":13000,\"managementBrandingDesignFeeTotal\":79000,\"loanMarginTotal\":50000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":136},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"杭湖加盟公司\",\"storeNum\":2,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":40000,\"firstYearBrandingFeeTotal\":10800,\"firstYearManagementFeeTotal\":12960,\"performanceBondTotal\":6000,\"managementBrandingDesignFeeTotal\":29760,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":137},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"福州加盟公司\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":52000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":138},{\"joinGroupName\":\"第五加盟集团\",\"regionName\":\"宁波加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":0,\"managementBrandingDesignFeeTotal\":13200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":144},{\"joinGroupName\":\"第六加盟集团\",\"regionName\":\"天津加盟公司\",\"storeNum\":1,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":0,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":81},{\"joinGroupName\":\"第六加盟集团\",\"regionName\":\"石家庄加盟公司\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":40000,\"firstYearBrandingFeeTotal\":9600,\"firstYearManagementFeeTotal\":11520,\"performanceBondTotal\":6000,\"managementBrandingDesignFeeTotal\":27120,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":29},{\"joinGroupName\":\"第六加盟集团\",\"regionName\":\"贵阳加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":4800,\"firstYearManagementFeeTotal\":5760,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":13560,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":30},{\"joinGroupName\":\"第七加盟集团\",\"regionName\":\"湘潭加盟公司\",\"storeNum\":2,\"normalStoreNum\":1,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":20400,\"performanceBondTotal\":5000,\"managementBrandingDesignFeeTotal\":31400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":2,\"regionId\":143},{\"joinGroupName\":\"第七加盟集团\",\"regionName\":\"昆明加盟公司\",\"storeNum\":2,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":0,\"franchiseFeeTotal\":26000,\"firstYearBrandingFeeTotal\":12000,\"firstYearManagementFeeTotal\":14400,\"performanceBondTotal\":10000,\"managementBrandingDesignFeeTotal\":36400,\"loanMarginTotal\":20000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":148},{\"joinGroupName\":\"第七加盟集团\",\"regionName\":\"南宁加盟公司\",\"storeNum\":1,\"normalStoreNum\":0,\"restaurantStoreNum\":0,\"noShowStoreNum\":1,\"franchiseFeeTotal\":9000,\"firstYearBrandingFeeTotal\":6000,\"firstYearManagementFeeTotal\":7200,\"performanceBondTotal\":3000,\"managementBrandingDesignFeeTotal\":16200,\"loanMarginTotal\":10000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":0,\"regionId\":125},{\"joinGroupName\":\"第八加盟集团\",\"regionName\":\"两广加盟公司\",\"storeNum\":4,\"normalStoreNum\":2,\"restaurantStoreNum\":0,\"noShowStoreNum\":2,\"franchiseFeeTotal\":92000,\"firstYearBrandingFeeTotal\":21600,\"firstYearManagementFeeTotal\":25920,\"performanceBondTotal\":11000,\"managementBrandingDesignFeeTotal\":58520,\"loanMarginTotal\":40000,\"yesterdayDate\":\"2025-05-15\",\"yesterdayStoreNum\":1,\"regionId\":29923}]")); - } + public ResponseResult< List> getList(@RequestBody FranchiseReportRequest request) { + return ResponseResult.success( franchiseReportService.zxjpOpenShopReport(request)); + } } From 234789f88f1be7988ea66979610b47d5265469d7 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 10:47:37 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FranchiseReportServiceImpl.java | 36 ++++++------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index c9557245e..7ccf8eade 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -76,9 +76,17 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { List bigRegionDOList = bigRegionDAO.getByRegionIdList(new ArrayList<>(regionSet)); Map bigRegionDOMap = bigRegionDOList.stream().collect(Collectors.toMap(BigRegionDO::getRegionId, bigRegionDO -> bigRegionDO)); Map responseByRegionIdMap = new HashMap<>(); - + Map responseByJoinGroupNameMap = new HashMap<>(); for (FranchiseReportDTO shopFranchiseReportDTO : shopFranchiseReportList) { - FranchiseReportResponse response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); + FranchiseReportResponse response = new FranchiseReportResponse(); + if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){ + BigRegionDO bigRegionDO = bigRegionDOMap.get(shopFranchiseReportDTO.getRegionId()); + response = responseByJoinGroupNameMap.get(bigRegionDO.getGroupName()); + } + else { + response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); + } + if (response == null) { response = new FranchiseReportResponse(); response.setRegionId(shopFranchiseReportDTO.getRegionId()); @@ -146,29 +154,7 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { return Collections.emptyList(); } sortByName(list); -// if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){ -// //集团维度 -// List joinGroupList = new ArrayList<>(); -// Map listMap = list.stream().collect(Collectors.toMap(FranchiseReportResponse::getJoinGroupName, Function.identity())); -// } - List ab = new ArrayList(); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - ab.addAll(list); - return ab; + return list; } public static void sortByName(List list) { From c65dd376f3b2a78fad7e41d9ad9bbd85920d0382 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 10:56:49 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FranchiseReportServiceImpl.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index 7ccf8eade..b7a018798 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -58,8 +58,8 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { request.setRegionIds(regionIdByGroupName); } else { request.getRegionIds().retainAll(regionIdByGroupName); - if (CollectionUtils.isEmpty(request.getRegionIds())){ - throw new ServiceException(ErrorCodeEnum.REGION_INTERSECTION_IS_NULL); + if (CollectionUtils.isEmpty(request.getRegionIds())) { + throw new ServiceException(ErrorCodeEnum.REGION_INTERSECTION_IS_NULL); } } } @@ -76,22 +76,25 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { List bigRegionDOList = bigRegionDAO.getByRegionIdList(new ArrayList<>(regionSet)); Map bigRegionDOMap = bigRegionDOList.stream().collect(Collectors.toMap(BigRegionDO::getRegionId, bigRegionDO -> bigRegionDO)); Map responseByRegionIdMap = new HashMap<>(); - Map responseByJoinGroupNameMap = new HashMap<>(); + Map responseByJoinGroupNameMap = new HashMap<>(); for (FranchiseReportDTO shopFranchiseReportDTO : shopFranchiseReportList) { - FranchiseReportResponse response = new FranchiseReportResponse(); - if(CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())){ - BigRegionDO bigRegionDO = bigRegionDOMap.get(shopFranchiseReportDTO.getRegionId()); - response = responseByJoinGroupNameMap.get(bigRegionDO.getGroupName()); + BigRegionDO bigRegionDO = bigRegionDOMap.get(shopFranchiseReportDTO.getRegionId()); + if (bigRegionDO == null) { + continue; } - else { - response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); + FranchiseReportResponse response = new FranchiseReportResponse(); + if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { + response = responseByJoinGroupNameMap.getOrDefault(bigRegionDO.getGroupName(), new FranchiseReportResponse()); + response.setJoinGroupName(bigRegionDO.getGroupName()); + } else { + response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); } - if (response == null) { + if (response == null && CollectionUtils.isNotEmpty(request.getJoinGroupName()) && CollectionUtils.isNotEmpty(request.getRegionIds())) { response = new FranchiseReportResponse(); response.setRegionId(shopFranchiseReportDTO.getRegionId()); - response.setRegionName(bigRegionDOMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new BigRegionDO()).getRegionName()); - String groupName = bigRegionDOMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new BigRegionDO()).getGroupName(); + response.setRegionName(bigRegionDO.getRegionName()); + String groupName = bigRegionDO.getGroupName(); if (StringUtils.isBlank(groupName)) { continue; } @@ -117,7 +120,11 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { .add(new BigDecimal(franchiseFeeDO.getFirstYearFee())) .add(new BigDecimal(franchiseFeeDO.getPerformanceBond()))); } - responseByRegionIdMap.put(shopFranchiseReportDTO.getRegionId(), response); + if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { + responseByJoinGroupNameMap.put(bigRegionDO.getGroupName(), response); + } else { + responseByRegionIdMap.put(shopFranchiseReportDTO.getRegionId(), response); + } } FranchiseReportRequest yesterdayRequest = new FranchiseReportRequest(); yesterdayRequest.setRegionIds(request.getRegionIds()); From 8d7d1580e3615465032a0582f2b43b5c087fb124 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 11:09:22 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/FranchiseReportServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index b7a018798..f38099ef4 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -155,7 +155,12 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { } } - List list = new ArrayList<>(responseByRegionIdMap.values()); + List list = new ArrayList<>(); + if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { + list.addAll(responseByJoinGroupNameMap.values()); + }else{ + list.addAll(responseByRegionIdMap.values()); + } if (CollectionUtils.isEmpty(list)) { log.info("数据为空"); return Collections.emptyList(); From 81263112d55af5e3107574ecfeed160bb5993947 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 13:18:59 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/FranchiseReportResponse.java | 4 ++ .../impl/FranchiseReportServiceImpl.java | 39 ++++++++++++++----- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java index a896f8c2a..337230335 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * @Author: WangShuo @@ -89,6 +90,9 @@ public class FranchiseReportResponse { private Integer yesterdayStoreNum = 0; @ExcelIgnore private Long regionId; + //集团维度使用 + @ExcelIgnore + private List regionIds; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index f38099ef4..102573166 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -83,10 +83,16 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { continue; } FranchiseReportResponse response = new FranchiseReportResponse(); + //查集团维度 if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { response = responseByJoinGroupNameMap.getOrDefault(bigRegionDO.getGroupName(), new FranchiseReportResponse()); response.setJoinGroupName(bigRegionDO.getGroupName()); + if (CollectionUtils.isEmpty(response.getRegionIds())){ + response.setRegionIds(new ArrayList<>()); + } + response.getRegionIds().add(shopFranchiseReportDTO.getRegionId()); } else { + //查大区维度 response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); } @@ -143,22 +149,37 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd"); if (CollectionUtils.isNotEmpty(yesterdayShopFranchiseReportList)) { Map> yesterdayMap = yesterdayShopFranchiseReportList.stream().collect(Collectors.groupingBy(FranchiseReportDTO::getRegionId)); - for (Long regionId : responseByRegionIdMap.keySet()) { - FranchiseReportResponse response = responseByRegionIdMap.get(regionId); - if (Objects.isNull(response)) { - continue; + //查集团维度 + if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { + for (FranchiseReportResponse responseByJoinGroupName : responseByJoinGroupNameMap.values()){ + + List regionIds = responseByJoinGroupName.getRegionIds(); + for (Long regionId : regionIds){ + BigRegionDO bigRegionDO = bigRegionDOMap.get(regionId); + List yesterdayList = yesterdayMap.getOrDefault(bigRegionDO.getRegionId(),new ArrayList<>()); + responseByJoinGroupName.setYesterdayDate(yesterdayStartDate.format(formatter1)); + responseByJoinGroupName.setYesterdayStoreNum(responseByJoinGroupName.getYesterdayStoreNum() +(CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size())); + } + } + }else{ + //大区维度 + for (Long regionId : responseByRegionIdMap.keySet()) { + FranchiseReportResponse response = responseByRegionIdMap.get(regionId); + if (Objects.isNull(response)) { + continue; + } + List yesterdayList = yesterdayMap.get(regionId); + response.setYesterdayDate(yesterdayStartDate.format(formatter1)); + response.setYesterdayStoreNum(CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size()); + responseByRegionIdMap.put(regionId, response); } - List yesterdayList = yesterdayMap.get(regionId); - response.setYesterdayDate(yesterdayStartDate.format(formatter1)); - response.setYesterdayStoreNum(CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size()); - responseByRegionIdMap.put(regionId, response); } } List list = new ArrayList<>(); if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { list.addAll(responseByJoinGroupNameMap.values()); - }else{ + } else { list.addAll(responseByRegionIdMap.values()); } if (CollectionUtils.isEmpty(list)) { From 4c243b31eacacc0d6d38c81a43426d7b93425489 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 13:25:39 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/FranchiseReportServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index 102573166..db204271e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -93,11 +93,10 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { response.getRegionIds().add(shopFranchiseReportDTO.getRegionId()); } else { //查大区维度 - response = responseByRegionIdMap.get(shopFranchiseReportDTO.getRegionId()); + response = responseByRegionIdMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new FranchiseReportResponse()); } - if (response == null && CollectionUtils.isNotEmpty(request.getJoinGroupName()) && CollectionUtils.isNotEmpty(request.getRegionIds())) { - response = new FranchiseReportResponse(); + if (CollectionUtils.isNotEmpty(request.getJoinGroupName()) && CollectionUtils.isNotEmpty(request.getRegionIds())) { response.setRegionId(shopFranchiseReportDTO.getRegionId()); response.setRegionName(bigRegionDO.getRegionName()); String groupName = bigRegionDO.getGroupName(); From 28b3851c71d34506916afbd6b6d4c7e9cfee7bfc Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 13:30:43 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A2=B3=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/FranchiseReportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index db204271e..579915268 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -96,7 +96,7 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { response = responseByRegionIdMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new FranchiseReportResponse()); } - if (CollectionUtils.isNotEmpty(request.getJoinGroupName()) && CollectionUtils.isNotEmpty(request.getRegionIds())) { + if (CollectionUtils.isNotEmpty(request.getJoinGroupName()) || CollectionUtils.isNotEmpty(request.getRegionIds())) { response.setRegionId(shopFranchiseReportDTO.getRegionId()); response.setRegionName(bigRegionDO.getRegionName()); String groupName = bigRegionDO.getGroupName(); From 8ec0939eccc958409dd438ca6a6a4c158d224286 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 15:37:47 +0800 Subject: [PATCH 11/15] =?UTF-8?q?PC=E7=AB=AF=E5=8A=A0=E7=9B=9F=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FranchiseReportServiceImpl.java | 55 ++++++++++--------- .../impl/PosAndOrderInfoServiceImpl.java | 18 ++++-- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java index 579915268..6a698df68 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseReportServiceImpl.java @@ -87,13 +87,13 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { response = responseByJoinGroupNameMap.getOrDefault(bigRegionDO.getGroupName(), new FranchiseReportResponse()); response.setJoinGroupName(bigRegionDO.getGroupName()); - if (CollectionUtils.isEmpty(response.getRegionIds())){ + if (CollectionUtils.isEmpty(response.getRegionIds())) { response.setRegionIds(new ArrayList<>()); } response.getRegionIds().add(shopFranchiseReportDTO.getRegionId()); } else { //查大区维度 - response = responseByRegionIdMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new FranchiseReportResponse()); + response = responseByRegionIdMap.getOrDefault(shopFranchiseReportDTO.getRegionId(), new FranchiseReportResponse()); } if (CollectionUtils.isNotEmpty(request.getJoinGroupName()) || CollectionUtils.isNotEmpty(request.getRegionIds())) { @@ -146,35 +146,36 @@ public class FranchiseReportServiceImpl implements FranchiseReportService { yesterdayRequest.setBuildEndTime(yesterdayEndTime); List yesterdayShopFranchiseReportList = shopInfoDAO.getShopFranchiseReportList(yesterdayRequest); DateTimeFormatter formatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - if (CollectionUtils.isNotEmpty(yesterdayShopFranchiseReportList)) { - Map> yesterdayMap = yesterdayShopFranchiseReportList.stream().collect(Collectors.groupingBy(FranchiseReportDTO::getRegionId)); - //查集团维度 - if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { - for (FranchiseReportResponse responseByJoinGroupName : responseByJoinGroupNameMap.values()){ - - List regionIds = responseByJoinGroupName.getRegionIds(); - for (Long regionId : regionIds){ - BigRegionDO bigRegionDO = bigRegionDOMap.get(regionId); - List yesterdayList = yesterdayMap.getOrDefault(bigRegionDO.getRegionId(),new ArrayList<>()); - responseByJoinGroupName.setYesterdayDate(yesterdayStartDate.format(formatter1)); - responseByJoinGroupName.setYesterdayStoreNum(responseByJoinGroupName.getYesterdayStoreNum() +(CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size())); - } - } - }else{ - //大区维度 - for (Long regionId : responseByRegionIdMap.keySet()) { - FranchiseReportResponse response = responseByRegionIdMap.get(regionId); - if (Objects.isNull(response)) { - continue; - } - List yesterdayList = yesterdayMap.get(regionId); - response.setYesterdayDate(yesterdayStartDate.format(formatter1)); - response.setYesterdayStoreNum(CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size()); - responseByRegionIdMap.put(regionId, response); + Map> yesterdayMap = new HashMap<>(); + if (CollectionUtils.isNotEmpty(yesterdayShopFranchiseReportList)){ + yesterdayMap = yesterdayShopFranchiseReportList.stream().collect(Collectors.groupingBy(FranchiseReportDTO::getRegionId)); + } + //查集团维度 + if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { + for (FranchiseReportResponse responseByJoinGroupName : responseByJoinGroupNameMap.values()) { + List regionIds = responseByJoinGroupName.getRegionIds(); + for (Long regionId : regionIds) { + BigRegionDO bigRegionDO = bigRegionDOMap.get(regionId); + List yesterdayList = yesterdayMap.getOrDefault(bigRegionDO.getRegionId(), new ArrayList<>()); + responseByJoinGroupName.setYesterdayDate(yesterdayStartDate.format(formatter1)); + responseByJoinGroupName.setYesterdayStoreNum(responseByJoinGroupName.getYesterdayStoreNum() + (CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size())); } } + } else { + //大区维度 + for (Long regionId : responseByRegionIdMap.keySet()) { + FranchiseReportResponse response = responseByRegionIdMap.get(regionId); + if (Objects.isNull(response)) { + continue; + } + List yesterdayList = yesterdayMap.get(regionId); + response.setYesterdayDate(yesterdayStartDate.format(formatter1)); + response.setYesterdayStoreNum(CollectionUtils.isEmpty(yesterdayList) ? 0 : yesterdayList.size()); + responseByRegionIdMap.put(regionId, response); + } } + List list = new ArrayList<>(); if (CollectionUtils.isEmpty(request.getJoinGroupName()) && CollectionUtils.isEmpty(request.getRegionIds())) { list.addAll(responseByJoinGroupNameMap.values()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java index 4c592b520..5a38cebd7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PosAndOrderInfoServiceImpl.java @@ -1,10 +1,8 @@ package com.cool.store.service.impl; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.PosAndOrderInfoDAO; -import com.cool.store.dao.ShopInfoDAO; -import com.cool.store.dao.ShopStageInfoDAO; +import com.cool.store.dao.*; +import com.cool.store.entity.LineInfoDO; import com.cool.store.entity.PosAndOrderInfoDO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.entity.ShopStageInfoDO; @@ -33,7 +31,8 @@ import java.util.Objects; */ @Service public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService { - + @Resource + private LineInfoDAO lineInfoDAO; @Resource private ShopInfoDAO shopInfoDAO; @Resource @@ -73,6 +72,7 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService { PosAndOrderResponse response = new PosAndOrderResponse(); PosAndOrderInfoDO posAndOrderInfoDO = posAndOrderInfoDAO.selectOneByShopId(shopId, type); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); if (Objects.nonNull(posAndOrderInfoDO)) { response.setShopId(posAndOrderInfoDO.getShopId()); response.setAccount(posAndOrderInfoDO.getAccount()); @@ -83,7 +83,13 @@ public class PosAndOrderInfoServiceImpl implements PosAndOrderInfoService { response.setCreateUser(enterpriseUserDAO.getUserName(posAndOrderInfoDO.getCreateUser())); } else{ - response.setAccount(shopInfo.getShopCode()); + if (type.equals(PosAndOrderEnum.POS.getCode())){ + response.setAccount(lineInfoDO.getMobile()); + } + if (type.equals(PosAndOrderEnum.XIN_FA_SYS.getCode())){ + response.setAccount(shopInfo.getShopCode()); + } + } return response; } From 988c0bc7cd93f2acd645d0d89e8d7e577029dff9 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 16:23:33 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=8E=A8=E6=95=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BA=91=E6=B5=81=E6=B0=B4=E8=B4=A6=E5=8F=B7=E5=8A=A0=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/request/ZxjpApiRequest.java | 2 +- .../java/com/cool/store/service/impl/SyncDataServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java index 81c2bb8e4..aa0c7961a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ZxjpApiRequest.java @@ -72,7 +72,7 @@ public class ZxjpApiRequest { @ApiModelProperty(value = "所属督导") private String shopSupervisorUserName; - @ApiModelProperty(value = "门店类型（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）") + @ApiModelProperty(value = "加盟模式（1-加盟公司、2-加盟部加盟店、3-自有加盟、4-强加盟、）") private Integer joinMode; @ApiModelProperty(value = "经营模式（0 无 1直营 2加盟）") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index c8a0214a6..c87e25330 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -125,7 +125,7 @@ public class SyncDataServiceImpl implements SyncDataService { } request.setFxyAccount(lineInfoDO.getMobile()); request.setXzgAccount(shopInfo.getShopCode()); - request.setYlsAccount(shopInfo.getShopCode()); + request.setYlsAccount("ZXA8_"+shopInfo.getShopCode()); request.setWqfAccount(shopInfo.getShopCode()); request.setDownstreamSystemShopName(shopInfo.getShopName()); if (DownSystemTypeEnum.XGJ.equals(systemType)) { From 54f1fc161e0c9bebbd7fcdc7f465fada9aee803c Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 17:20:06 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=8E=A8=E6=95=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BA=91=E6=B5=81=E6=B0=B4=E8=B4=A6=E5=8F=B7=E5=8A=A0=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/SyncDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index c87e25330..c8a0214a6 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -125,7 +125,7 @@ public class SyncDataServiceImpl implements SyncDataService { } request.setFxyAccount(lineInfoDO.getMobile()); request.setXzgAccount(shopInfo.getShopCode()); - request.setYlsAccount("ZXA8_"+shopInfo.getShopCode()); + request.setYlsAccount(shopInfo.getShopCode()); request.setWqfAccount(shopInfo.getShopCode()); request.setDownstreamSystemShopName(shopInfo.getShopName()); if (DownSystemTypeEnum.XGJ.equals(systemType)) { From 74b3ba88b94edd733c4b874c1cbdd2cb61d903ae Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 17:20:34 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=8E=A8=E6=95=B0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BA=91=E6=B5=81=E6=B0=B4=E8=B4=A6=E5=8F=B7=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/SyncDataServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java index c8a0214a6..95ef1183c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SyncDataServiceImpl.java @@ -125,6 +125,7 @@ public class SyncDataServiceImpl implements SyncDataService { } request.setFxyAccount(lineInfoDO.getMobile()); request.setXzgAccount(shopInfo.getShopCode()); + request.setYlsAccount(shopInfo.getShopCode()); request.setWqfAccount(shopInfo.getShopCode()); request.setDownstreamSystemShopName(shopInfo.getShopName()); From 3de0a3aef6d7284136cbe9cdc89b2e9dc05014d6 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Fri, 16 May 2025 18:18:50 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../response/FranchiseReportResponse.java | 9 +++++++-- .../impl/ExportRealizeServiceImpl.java | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java index 337230335..3879a960b 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseReportResponse.java @@ -79,13 +79,18 @@ public class FranchiseReportResponse { @ColumnWidth(20) private BigDecimal loanMarginTotal = BigDecimal.ZERO; + @ApiModelProperty(value = "收款金额总计") + @ExcelProperty(value = "收款金额总计=加盟费+管理/品牌/设计费+保证金",order = 13) + @ColumnWidth(25) + private BigDecimal total = BigDecimal.ZERO; + @ApiModelProperty(value = "昨日日期") - @ExcelProperty(value = "昨日日期",order = 13) + @ExcelProperty(value = "昨日日期",order = 14) @ColumnWidth(15) private String yesterdayDate; @ApiModelProperty(value = "昨天门店数") - @ExcelProperty(value = "昨天门店数",order = 14) + @ExcelProperty(value = "昨天门店数",order = 15) @ColumnWidth(15) private Integer yesterdayStoreNum = 0; @ExcelIgnore diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index 8c7326fea..dd1b43baf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -630,9 +630,29 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } @Override + @Async public void exportZxjpOpenShopReport(List list, ImportTaskDO importTaskDO, FranchiseReportRequest request) { String url = ""; try { + FranchiseReportResponse total = new FranchiseReportResponse(); + total.setYesterdayDate(list.get(0).getYesterdayDate()); + total.setJoinGroupName("总计"); + for (FranchiseReportResponse response : list){ + response.setTotal(response.getFranchiseFeeTotal().add(response.getManagementBrandingDesignFeeTotal()).add(response.getLoanMarginTotal())); + total.setTotal(total.getTotal().add(response.getTotal())); + total.setStoreNum(total.getStoreNum() + response.getStoreNum()); + total.setNormalStoreNum(total.getNormalStoreNum() + response.getNormalStoreNum()); + total.setRestaurantStoreNum(total.getRestaurantStoreNum() + response.getRestaurantStoreNum()); + total.setNoShowStoreNum(total.getNoShowStoreNum() + response.getNoShowStoreNum()); + total.setFranchiseFeeTotal(total.getFranchiseFeeTotal().add(response.getFranchiseFeeTotal())); + total.setFirstYearBrandingFeeTotal(total.getFirstYearBrandingFeeTotal().add(response.getFirstYearBrandingFeeTotal())); + total.setFirstYearManagementFeeTotal(total.getFirstYearManagementFeeTotal().add(response.getFirstYearManagementFeeTotal())); + total.setPerformanceBondTotal(total.getPerformanceBondTotal().add(response.getPerformanceBondTotal())); + total.setManagementBrandingDesignFeeTotal(total.getManagementBrandingDesignFeeTotal().add(response.getManagementBrandingDesignFeeTotal())); + total.setLoanMarginTotal(total.getLoanMarginTotal().add(response.getLoanMarginTotal())); + total.setYesterdayStoreNum(total.getYesterdayStoreNum() + response.getYesterdayStoreNum()); + } + list.add(total); url = easyExcelUtil.exportExcelSpecial(FranchiseReportResponse.class, list, null, FileTypeEnum.ZXJP_OPEN_SHOP_REPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()), FileTypeEnum.ZXJP_OPEN_SHOP_REPORT.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()),