代码调整-注释重复接口类、报错类及方法等..

fs-admin-saas/pom.xml

@@ -61,11 +61,11 @@
         </dependency>
 
         <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <optional>true</optional> &lt;!&ndash; 表示依赖不会传递 &ndash;&gt;-->
+<!--        </dependency>-->
          <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>

fs-admin-saas/src/main/java/com/fs/FsSaasAdminApplication.java

@@ -14,20 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
  * 租户总后台启动程序（saasadminui → 8004）
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, RedissonAutoConfiguration.class})
-@ComponentScan(
-    basePackages = "com.fs",
-    excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
-        "com\\.fs\\.framework\\.service\\.PermissionService",
-        "com\\.fs\\.framework\\.service\\.UserDetailsServiceImpl",
-        // 销售端 Controller 留在 fs-company，租户总后台不扫描
-        // his / hisStore 同名 Controller（如 FsIntegralGoodsController）只保留 his
-        "com\\.fs\\.hisStore\\.controller\\..*",
-        // pay: AliPayBean/WxPayBean 与 fs-common 同名 bean 冲突
-        "com\\.fs\\.company\\.controller\\.pay\\..*",
-        "com\\.fs\\.company\\.aspectj\\..*",
-        "com\\.fs\\.his\\.controller\\.FsAiWorkflowController"
-    })
-)
 @Transactional
 @EnableAsync
 @EnableScheduling

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsMenuScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsMenuScrm;
-import com.fs.hisStore.service.IFsMenuScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 用户端菜单管理 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsMenuScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/menu")
-public class FsMenuScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsMenuScrmService fsMenuService;
-
-    @PreAuthorize("@ss.hasPermi('store:menu:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsMenuScrm fsMenu)
-    {
-        startPage();
-        List<FsMenuScrm> list = fsMenuService.selectFsMenuList(fsMenu);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:menu:export')")
-    @Log(title = "用户端菜单管理", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsMenuScrm fsMenu)
-    {
-        List<FsMenuScrm> list = fsMenuService.selectFsMenuList(fsMenu);
-        ExcelUtil<FsMenuScrm> util = new ExcelUtil<FsMenuScrm>(FsMenuScrm.class);
-        return util.exportExcel(list, "menu");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:menu:query')")
-    @GetMapping(value = "/{menuId}")
-    public AjaxResult getInfo(@PathVariable("menuId") Long menuId)
-    {
-        return AjaxResult.success(fsMenuService.selectFsMenuById(menuId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:menu:add')")
-    @Log(title = "用户端菜单管理", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsMenuScrm fsMenu)
-    {
-        return toAjax(fsMenuService.insertFsMenu(fsMenu));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:menu:edit')")
-    @Log(title = "用户端菜单管理", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsMenuScrm fsMenu)
-    {
-        return toAjax(fsMenuService.updateFsMenu(fsMenu));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:menu:remove')")
-    @Log(title = "用户端菜单管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{menuIds}")
-    public AjaxResult remove(@PathVariable Long[] menuIds)
-    {
-        return toAjax(fsMenuService.deleteFsMenuByIds(menuIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsMenuScrm;
+//import com.fs.hisStore.service.IFsMenuScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 用户端菜单管理 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsMenuScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/menu")
+//public class FsMenuScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsMenuScrmService fsMenuService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:menu:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsMenuScrm fsMenu)
+//    {
+//        startPage();
+//        List<FsMenuScrm> list = fsMenuService.selectFsMenuList(fsMenu);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:menu:export')")
+//    @Log(title = "用户端菜单管理", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsMenuScrm fsMenu)
+//    {
+//        List<FsMenuScrm> list = fsMenuService.selectFsMenuList(fsMenu);
+//        ExcelUtil<FsMenuScrm> util = new ExcelUtil<FsMenuScrm>(FsMenuScrm.class);
+//        return util.exportExcel(list, "menu");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:menu:query')")
+//    @GetMapping(value = "/{menuId}")
+//    public AjaxResult getInfo(@PathVariable("menuId") Long menuId)
+//    {
+//        return AjaxResult.success(fsMenuService.selectFsMenuById(menuId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:menu:add')")
+//    @Log(title = "用户端菜单管理", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsMenuScrm fsMenu)
+//    {
+//        return toAjax(fsMenuService.insertFsMenu(fsMenu));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:menu:edit')")
+//    @Log(title = "用户端菜单管理", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsMenuScrm fsMenu)
+//    {
+//        return toAjax(fsMenuService.updateFsMenu(fsMenu));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:menu:remove')")
+//    @Log(title = "用户端菜单管理", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{menuIds}")
+//    public AjaxResult remove(@PathVariable Long[] menuIds)
+//    {
+//        return toAjax(fsMenuService.deleteFsMenuByIds(menuIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsPrescribeDrugScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsPrescribeDrugScrm;
-import com.fs.hisStore.service.IFsPrescribeDrugScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 处方药品 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsPrescribeDrugScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/prescribeDrug")
-public class FsPrescribeDrugScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsPrescribeDrugScrmService fsPrescribeDrugService;
-
-    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsPrescribeDrugScrm fsPrescribeDrug)
-    {
-        startPage();
-        List<FsPrescribeDrugScrm> list = fsPrescribeDrugService.selectFsPrescribeDrugList(fsPrescribeDrug);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:export')")
-    @Log(title = "处方药品", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsPrescribeDrugScrm fsPrescribeDrug)
-    {
-        List<FsPrescribeDrugScrm> list = fsPrescribeDrugService.selectFsPrescribeDrugList(fsPrescribeDrug);
-        ExcelUtil<FsPrescribeDrugScrm> util = new ExcelUtil<FsPrescribeDrugScrm>(FsPrescribeDrugScrm.class);
-        return util.exportExcel(list, "prescribeDrug");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:query')")
-    @GetMapping(value = "/{drugId}")
-    public AjaxResult getInfo(@PathVariable("drugId") Long drugId)
-    {
-        return AjaxResult.success(fsPrescribeDrugService.selectFsPrescribeDrugById(drugId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:add')")
-    @Log(title = "处方药品", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsPrescribeDrugScrm fsPrescribeDrug)
-    {
-        return toAjax(fsPrescribeDrugService.insertFsPrescribeDrug(fsPrescribeDrug));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:edit')")
-    @Log(title = "处方药品", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsPrescribeDrugScrm fsPrescribeDrug)
-    {
-        return toAjax(fsPrescribeDrugService.updateFsPrescribeDrug(fsPrescribeDrug));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:remove')")
-    @Log(title = "处方药品", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{drugIds}")
-    public AjaxResult remove(@PathVariable Long[] drugIds)
-    {
-        return toAjax(fsPrescribeDrugService.deleteFsPrescribeDrugByIds(drugIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsPrescribeDrugScrm;
+//import com.fs.hisStore.service.IFsPrescribeDrugScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 处方药品 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsPrescribeDrugScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/prescribeDrug")
+//public class FsPrescribeDrugScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsPrescribeDrugScrmService fsPrescribeDrugService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsPrescribeDrugScrm fsPrescribeDrug)
+//    {
+//        startPage();
+//        List<FsPrescribeDrugScrm> list = fsPrescribeDrugService.selectFsPrescribeDrugList(fsPrescribeDrug);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:export')")
+//    @Log(title = "处方药品", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsPrescribeDrugScrm fsPrescribeDrug)
+//    {
+//        List<FsPrescribeDrugScrm> list = fsPrescribeDrugService.selectFsPrescribeDrugList(fsPrescribeDrug);
+//        ExcelUtil<FsPrescribeDrugScrm> util = new ExcelUtil<FsPrescribeDrugScrm>(FsPrescribeDrugScrm.class);
+//        return util.exportExcel(list, "prescribeDrug");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:query')")
+//    @GetMapping(value = "/{drugId}")
+//    public AjaxResult getInfo(@PathVariable("drugId") Long drugId)
+//    {
+//        return AjaxResult.success(fsPrescribeDrugService.selectFsPrescribeDrugById(drugId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:add')")
+//    @Log(title = "处方药品", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsPrescribeDrugScrm fsPrescribeDrug)
+//    {
+//        return toAjax(fsPrescribeDrugService.insertFsPrescribeDrug(fsPrescribeDrug));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:edit')")
+//    @Log(title = "处方药品", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsPrescribeDrugScrm fsPrescribeDrug)
+//    {
+//        return toAjax(fsPrescribeDrugService.updateFsPrescribeDrug(fsPrescribeDrug));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribeDrug:remove')")
+//    @Log(title = "处方药品", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{drugIds}")
+//    public AjaxResult remove(@PathVariable Long[] drugIds)
+//    {
+//        return toAjax(fsPrescribeDrugService.deleteFsPrescribeDrugByIds(drugIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsPrescribeScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsPrescribeScrm;
-import com.fs.hisStore.service.IFsPrescribeScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 处方 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsPrescribeScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/prescribe")
-public class FsPrescribeScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsPrescribeScrmService fsPrescribeService;
-
-    @PreAuthorize("@ss.hasPermi('store:prescribe:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsPrescribeScrm fsPrescribe)
-    {
-        startPage();
-        List<FsPrescribeScrm> list = fsPrescribeService.selectFsPrescribeList(fsPrescribe);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribe:export')")
-    @Log(title = "处方", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsPrescribeScrm fsPrescribe)
-    {
-        List<FsPrescribeScrm> list = fsPrescribeService.selectFsPrescribeList(fsPrescribe);
-        ExcelUtil<FsPrescribeScrm> util = new ExcelUtil<FsPrescribeScrm>(FsPrescribeScrm.class);
-        return util.exportExcel(list, "处方数据");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribe:query')")
-    @GetMapping(value = "/{prescribeId}")
-    public AjaxResult getInfo(@PathVariable("prescribeId") Long prescribeId)
-    {
-        return AjaxResult.success(fsPrescribeService.selectFsPrescribeById(prescribeId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribe:add')")
-    @Log(title = "处方", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsPrescribeScrm fsPrescribe)
-    {
-        return toAjax(fsPrescribeService.insertFsPrescribe(fsPrescribe));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribe:edit')")
-    @Log(title = "处方", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsPrescribeScrm fsPrescribe)
-    {
-        return toAjax(fsPrescribeService.updateFsPrescribe(fsPrescribe));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:prescribe:remove')")
-    @Log(title = "处方", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{prescribeIds}")
-    public AjaxResult remove(@PathVariable Long[] prescribeIds)
-    {
-        return toAjax(fsPrescribeService.deleteFsPrescribeByIds(prescribeIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsPrescribeScrm;
+//import com.fs.hisStore.service.IFsPrescribeScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 处方 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsPrescribeScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/prescribe")
+//public class FsPrescribeScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsPrescribeScrmService fsPrescribeService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribe:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsPrescribeScrm fsPrescribe)
+//    {
+//        startPage();
+//        List<FsPrescribeScrm> list = fsPrescribeService.selectFsPrescribeList(fsPrescribe);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribe:export')")
+//    @Log(title = "处方", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsPrescribeScrm fsPrescribe)
+//    {
+//        List<FsPrescribeScrm> list = fsPrescribeService.selectFsPrescribeList(fsPrescribe);
+//        ExcelUtil<FsPrescribeScrm> util = new ExcelUtil<FsPrescribeScrm>(FsPrescribeScrm.class);
+//        return util.exportExcel(list, "处方数据");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribe:query')")
+//    @GetMapping(value = "/{prescribeId}")
+//    public AjaxResult getInfo(@PathVariable("prescribeId") Long prescribeId)
+//    {
+//        return AjaxResult.success(fsPrescribeService.selectFsPrescribeById(prescribeId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribe:add')")
+//    @Log(title = "处方", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsPrescribeScrm fsPrescribe)
+//    {
+//        return toAjax(fsPrescribeService.insertFsPrescribe(fsPrescribe));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribe:edit')")
+//    @Log(title = "处方", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsPrescribeScrm fsPrescribe)
+//    {
+//        return toAjax(fsPrescribeService.updateFsPrescribe(fsPrescribe));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:prescribe:remove')")
+//    @Log(title = "处方", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{prescribeIds}")
+//    public AjaxResult remove(@PathVariable Long[] prescribeIds)
+//    {
+//        return toAjax(fsPrescribeService.deleteFsPrescribeByIds(prescribeIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsShippingTemplatesFreeScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsShippingTemplatesFreeScrm;
-import com.fs.hisStore.service.IFsShippingTemplatesFreeScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 免邮费 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsShippingTemplatesFreeScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/shippingTemplatesFree")
-public class FsShippingTemplatesFreeScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsShippingTemplatesFreeScrmService fsShippingTemplatesFreeService;
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
-    {
-        startPage();
-        List<FsShippingTemplatesFreeScrm> list = fsShippingTemplatesFreeService.selectFsShippingTemplatesFreeList(fsShippingTemplatesFree);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:export')")
-    @Log(title = "免邮费", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
-    {
-        List<FsShippingTemplatesFreeScrm> list = fsShippingTemplatesFreeService.selectFsShippingTemplatesFreeList(fsShippingTemplatesFree);
-        ExcelUtil<FsShippingTemplatesFreeScrm> util = new ExcelUtil<FsShippingTemplatesFreeScrm>(FsShippingTemplatesFreeScrm.class);
-        return util.exportExcel(list, "shippingTemplatesFree");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsShippingTemplatesFreeService.selectFsShippingTemplatesFreeById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:add')")
-    @Log(title = "免邮费", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
-    {
-        return toAjax(fsShippingTemplatesFreeService.insertFsShippingTemplatesFree(fsShippingTemplatesFree));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:edit')")
-    @Log(title = "免邮费", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
-    {
-        return toAjax(fsShippingTemplatesFreeService.updateFsShippingTemplatesFree(fsShippingTemplatesFree));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:remove')")
-    @Log(title = "免邮费", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsShippingTemplatesFreeService.deleteFsShippingTemplatesFreeByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsShippingTemplatesFreeScrm;
+//import com.fs.hisStore.service.IFsShippingTemplatesFreeScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 免邮费 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsShippingTemplatesFreeScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/shippingTemplatesFree")
+//public class FsShippingTemplatesFreeScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsShippingTemplatesFreeScrmService fsShippingTemplatesFreeService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
+//    {
+//        startPage();
+//        List<FsShippingTemplatesFreeScrm> list = fsShippingTemplatesFreeService.selectFsShippingTemplatesFreeList(fsShippingTemplatesFree);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:export')")
+//    @Log(title = "免邮费", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
+//    {
+//        List<FsShippingTemplatesFreeScrm> list = fsShippingTemplatesFreeService.selectFsShippingTemplatesFreeList(fsShippingTemplatesFree);
+//        ExcelUtil<FsShippingTemplatesFreeScrm> util = new ExcelUtil<FsShippingTemplatesFreeScrm>(FsShippingTemplatesFreeScrm.class);
+//        return util.exportExcel(list, "shippingTemplatesFree");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsShippingTemplatesFreeService.selectFsShippingTemplatesFreeById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:add')")
+//    @Log(title = "免邮费", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
+//    {
+//        return toAjax(fsShippingTemplatesFreeService.insertFsShippingTemplatesFree(fsShippingTemplatesFree));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:edit')")
+//    @Log(title = "免邮费", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsShippingTemplatesFreeScrm fsShippingTemplatesFree)
+//    {
+//        return toAjax(fsShippingTemplatesFreeService.updateFsShippingTemplatesFree(fsShippingTemplatesFree));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesFree:remove')")
+//    @Log(title = "免邮费", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsShippingTemplatesFreeService.deleteFsShippingTemplatesFreeByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsShippingTemplatesRegionScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsShippingTemplatesRegionScrm;
-import com.fs.hisStore.service.IFsShippingTemplatesRegionScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 邮费区域 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsShippingTemplatesRegionScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/shippingTemplatesRegion")
-public class FsShippingTemplatesRegionScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsShippingTemplatesRegionScrmService fsShippingTemplatesRegionService;
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
-    {
-        startPage();
-        List<FsShippingTemplatesRegionScrm> list = fsShippingTemplatesRegionService.selectFsShippingTemplatesRegionList(fsShippingTemplatesRegion);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:export')")
-    @Log(title = "邮费区域", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
-    {
-        List<FsShippingTemplatesRegionScrm> list = fsShippingTemplatesRegionService.selectFsShippingTemplatesRegionList(fsShippingTemplatesRegion);
-        ExcelUtil<FsShippingTemplatesRegionScrm> util = new ExcelUtil<FsShippingTemplatesRegionScrm>(FsShippingTemplatesRegionScrm.class);
-        return util.exportExcel(list, "shippingTemplatesRegion");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsShippingTemplatesRegionService.selectFsShippingTemplatesRegionById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:add')")
-    @Log(title = "邮费区域", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
-    {
-        return toAjax(fsShippingTemplatesRegionService.insertFsShippingTemplatesRegion(fsShippingTemplatesRegion));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:edit')")
-    @Log(title = "邮费区域", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
-    {
-        return toAjax(fsShippingTemplatesRegionService.updateFsShippingTemplatesRegion(fsShippingTemplatesRegion));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:remove')")
-    @Log(title = "邮费区域", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsShippingTemplatesRegionService.deleteFsShippingTemplatesRegionByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsShippingTemplatesRegionScrm;
+//import com.fs.hisStore.service.IFsShippingTemplatesRegionScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 邮费区域 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsShippingTemplatesRegionScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/shippingTemplatesRegion")
+//public class FsShippingTemplatesRegionScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsShippingTemplatesRegionScrmService fsShippingTemplatesRegionService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
+//    {
+//        startPage();
+//        List<FsShippingTemplatesRegionScrm> list = fsShippingTemplatesRegionService.selectFsShippingTemplatesRegionList(fsShippingTemplatesRegion);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:export')")
+//    @Log(title = "邮费区域", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
+//    {
+//        List<FsShippingTemplatesRegionScrm> list = fsShippingTemplatesRegionService.selectFsShippingTemplatesRegionList(fsShippingTemplatesRegion);
+//        ExcelUtil<FsShippingTemplatesRegionScrm> util = new ExcelUtil<FsShippingTemplatesRegionScrm>(FsShippingTemplatesRegionScrm.class);
+//        return util.exportExcel(list, "shippingTemplatesRegion");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsShippingTemplatesRegionService.selectFsShippingTemplatesRegionById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:add')")
+//    @Log(title = "邮费区域", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
+//    {
+//        return toAjax(fsShippingTemplatesRegionService.insertFsShippingTemplatesRegion(fsShippingTemplatesRegion));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:edit')")
+//    @Log(title = "邮费区域", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsShippingTemplatesRegionScrm fsShippingTemplatesRegion)
+//    {
+//        return toAjax(fsShippingTemplatesRegionService.updateFsShippingTemplatesRegion(fsShippingTemplatesRegion));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplatesRegion:remove')")
+//    @Log(title = "邮费区域", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsShippingTemplatesRegionService.deleteFsShippingTemplatesRegionByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsShippingTemplatesScrmBridgeController.java

@@ -1,91 +1,91 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsShippingTemplatesScrm;
-import com.fs.hisStore.param.FsShippingTemplatesAddEditParam;
-import com.fs.hisStore.service.IFsShippingTemplatesScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 运费模板 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsShippingTemplatesScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/shippingTemplates")
-public class FsShippingTemplatesScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsShippingTemplatesScrmService fsShippingTemplatesService;
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsShippingTemplatesScrm fsShippingTemplates)
-    {
-        startPage();
-        fsShippingTemplates.setIsDel(0);
-        List<FsShippingTemplatesScrm> list = fsShippingTemplatesService.selectFsShippingTemplatesList(fsShippingTemplates);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:export')")
-    @Log(title = "运费模板", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsShippingTemplatesScrm fsShippingTemplates)
-    {
-        List<FsShippingTemplatesScrm> list = fsShippingTemplatesService.selectFsShippingTemplatesList(fsShippingTemplates);
-        ExcelUtil<FsShippingTemplatesScrm> util = new ExcelUtil<FsShippingTemplatesScrm>(FsShippingTemplatesScrm.class);
-        return util.exportExcel(list, "shippingTemplates");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsShippingTemplatesService.selectFsShippingTemplatesById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:add')")
-    @Log(title = "运费模板", businessType = BusinessType.INSERT)
-    @PostMapping
-    public R add(@RequestBody FsShippingTemplatesAddEditParam param)
-    {
-        return fsShippingTemplatesService.addOrEdit(param);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:edit')")
-    @Log(title = "运费模板", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public R edit(@RequestBody FsShippingTemplatesAddEditParam param)
-    {
-        return fsShippingTemplatesService.addOrEdit(param);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:remove')")
-    @Log(title = "运费模板", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsShippingTemplatesService.deleteFsShippingTemplatesByIds(ids));
-    }
-
-    @GetMapping("/getAllList")
-    public R getAllList(FsShippingTemplatesScrm fsShippingTemplates)
-    {
-        fsShippingTemplates.setIsDel(0);
-        List<FsShippingTemplatesScrm> list = fsShippingTemplatesService.selectFsShippingTemplatesList(fsShippingTemplates);
-        return R.ok().put("data", list);
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsShippingTemplatesScrm;
+//import com.fs.hisStore.param.FsShippingTemplatesAddEditParam;
+//import com.fs.hisStore.service.IFsShippingTemplatesScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 运费模板 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsShippingTemplatesScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/shippingTemplates")
+//public class FsShippingTemplatesScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsShippingTemplatesScrmService fsShippingTemplatesService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsShippingTemplatesScrm fsShippingTemplates)
+//    {
+//        startPage();
+//        fsShippingTemplates.setIsDel(0);
+//        List<FsShippingTemplatesScrm> list = fsShippingTemplatesService.selectFsShippingTemplatesList(fsShippingTemplates);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:export')")
+//    @Log(title = "运费模板", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsShippingTemplatesScrm fsShippingTemplates)
+//    {
+//        List<FsShippingTemplatesScrm> list = fsShippingTemplatesService.selectFsShippingTemplatesList(fsShippingTemplates);
+//        ExcelUtil<FsShippingTemplatesScrm> util = new ExcelUtil<FsShippingTemplatesScrm>(FsShippingTemplatesScrm.class);
+//        return util.exportExcel(list, "shippingTemplates");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsShippingTemplatesService.selectFsShippingTemplatesById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:add')")
+//    @Log(title = "运费模板", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public R add(@RequestBody FsShippingTemplatesAddEditParam param)
+//    {
+//        return fsShippingTemplatesService.addOrEdit(param);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:edit')")
+//    @Log(title = "运费模板", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public R edit(@RequestBody FsShippingTemplatesAddEditParam param)
+//    {
+//        return fsShippingTemplatesService.addOrEdit(param);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:shippingTemplates:remove')")
+//    @Log(title = "运费模板", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsShippingTemplatesService.deleteFsShippingTemplatesByIds(ids));
+//    }
+//
+//    @GetMapping("/getAllList")
+//    public R getAllList(FsShippingTemplatesScrm fsShippingTemplates)
+//    {
+//        fsShippingTemplates.setIsDel(0);
+//        List<FsShippingTemplatesScrm> list = fsShippingTemplatesService.selectFsShippingTemplatesList(fsShippingTemplates);
+//        return R.ok().put("data", list);
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreActivityScrmBridgeController.java

@@ -1,91 +1,91 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreActivityScrm;
-import com.fs.hisStore.service.IFsStoreActivityScrmService;
-import com.fs.hisStore.service.IFsStoreProductScrmService;
-import com.fs.hisStore.vo.FsStoreProductActivityListVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 活动 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreActivityScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-11-18
- */
-@RestController
-@RequestMapping("/store/storeActivity")
-public class FsStoreActivityScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreActivityScrmService fsStoreActivityService;
-    @Autowired
-    private IFsStoreProductScrmService productService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeActivity:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreActivityScrm fsStoreActivity)
-    {
-        startPage();
-        List<FsStoreActivityScrm> list = fsStoreActivityService.selectFsStoreActivityList(fsStoreActivity);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeActivity:export')")
-    @Log(title = "活动", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreActivityScrm fsStoreActivity)
-    {
-        List<FsStoreActivityScrm> list = fsStoreActivityService.selectFsStoreActivityList(fsStoreActivity);
-        ExcelUtil<FsStoreActivityScrm> util = new ExcelUtil<FsStoreActivityScrm>(FsStoreActivityScrm.class);
-        return util.exportExcel(list, "storeActivity");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeActivity:query')")
-    @GetMapping(value = "/{activityId}")
-    public R getInfo(@PathVariable("activityId") Long activityId)
-    {
-        FsStoreActivityScrm activity = fsStoreActivityService.selectFsStoreActivityById(activityId);
-        List<FsStoreProductActivityListVO> products = new ArrayList<>();
-        if (activity.getProductIds() != null) {
-            products = productService.selectFsStoreProductByIds(activity.getProductIds());
-        }
-        return R.ok().put("activity", activity).put("products", products);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeActivity:add')")
-    @Log(title = "活动", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreActivityScrm fsStoreActivity)
-    {
-        return toAjax(fsStoreActivityService.insertFsStoreActivity(fsStoreActivity));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeActivity:edit')")
-    @Log(title = "活动", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreActivityScrm fsStoreActivity)
-    {
-        return toAjax(fsStoreActivityService.updateFsStoreActivity(fsStoreActivity));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeActivity:remove')")
-    @Log(title = "活动", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{activityIds}")
-    public AjaxResult remove(@PathVariable Long[] activityIds)
-    {
-        return toAjax(fsStoreActivityService.deleteFsStoreActivityByIds(activityIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreActivityScrm;
+//import com.fs.hisStore.service.IFsStoreActivityScrmService;
+//import com.fs.hisStore.service.IFsStoreProductScrmService;
+//import com.fs.hisStore.vo.FsStoreProductActivityListVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//
+///**
+// * 活动 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreActivityScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-11-18
+// */
+//@RestController
+//@RequestMapping("/store/storeActivity")
+//public class FsStoreActivityScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreActivityScrmService fsStoreActivityService;
+//    @Autowired
+//    private IFsStoreProductScrmService productService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeActivity:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreActivityScrm fsStoreActivity)
+//    {
+//        startPage();
+//        List<FsStoreActivityScrm> list = fsStoreActivityService.selectFsStoreActivityList(fsStoreActivity);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeActivity:export')")
+//    @Log(title = "活动", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreActivityScrm fsStoreActivity)
+//    {
+//        List<FsStoreActivityScrm> list = fsStoreActivityService.selectFsStoreActivityList(fsStoreActivity);
+//        ExcelUtil<FsStoreActivityScrm> util = new ExcelUtil<FsStoreActivityScrm>(FsStoreActivityScrm.class);
+//        return util.exportExcel(list, "storeActivity");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeActivity:query')")
+//    @GetMapping(value = "/{activityId}")
+//    public R getInfo(@PathVariable("activityId") Long activityId)
+//    {
+//        FsStoreActivityScrm activity = fsStoreActivityService.selectFsStoreActivityById(activityId);
+//        List<FsStoreProductActivityListVO> products = new ArrayList<>();
+//        if (activity.getProductIds() != null) {
+//            products = productService.selectFsStoreProductByIds(activity.getProductIds());
+//        }
+//        return R.ok().put("activity", activity).put("products", products);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeActivity:add')")
+//    @Log(title = "活动", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreActivityScrm fsStoreActivity)
+//    {
+//        return toAjax(fsStoreActivityService.insertFsStoreActivity(fsStoreActivity));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeActivity:edit')")
+//    @Log(title = "活动", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreActivityScrm fsStoreActivity)
+//    {
+//        return toAjax(fsStoreActivityService.updateFsStoreActivity(fsStoreActivity));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeActivity:remove')")
+//    @Log(title = "活动", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{activityIds}")
+//    public AjaxResult remove(@PathVariable Long[] activityIds)
+//    {
+//        return toAjax(fsStoreActivityService.deleteFsStoreActivityByIds(activityIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreAfterSalesItemScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreAfterSalesItemScrm;
-import com.fs.hisStore.service.IFsStoreAfterSalesItemScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 售后子 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreAfterSalesItemScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeAfterSalesItem")
-public class FsStoreAfterSalesItemScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreAfterSalesItemScrmService fsStoreAfterSalesItemService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
-    {
-        startPage();
-        List<FsStoreAfterSalesItemScrm> list = fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemList(fsStoreAfterSalesItem);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:export')")
-    @Log(title = "售后子", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
-    {
-        List<FsStoreAfterSalesItemScrm> list = fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemList(fsStoreAfterSalesItem);
-        ExcelUtil<FsStoreAfterSalesItemScrm> util = new ExcelUtil<FsStoreAfterSalesItemScrm>(FsStoreAfterSalesItemScrm.class);
-        return util.exportExcel(list, "storeAfterSalesItem");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:add')")
-    @Log(title = "售后子", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
-    {
-        return toAjax(fsStoreAfterSalesItemService.insertFsStoreAfterSalesItem(fsStoreAfterSalesItem));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:edit')")
-    @Log(title = "售后子", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
-    {
-        return toAjax(fsStoreAfterSalesItemService.updateFsStoreAfterSalesItem(fsStoreAfterSalesItem));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:remove')")
-    @Log(title = "售后子", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreAfterSalesItemService.deleteFsStoreAfterSalesItemByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreAfterSalesItemScrm;
+//import com.fs.hisStore.service.IFsStoreAfterSalesItemScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 售后子 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreAfterSalesItemScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeAfterSalesItem")
+//public class FsStoreAfterSalesItemScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreAfterSalesItemScrmService fsStoreAfterSalesItemService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
+//    {
+//        startPage();
+//        List<FsStoreAfterSalesItemScrm> list = fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemList(fsStoreAfterSalesItem);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:export')")
+//    @Log(title = "售后子", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
+//    {
+//        List<FsStoreAfterSalesItemScrm> list = fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemList(fsStoreAfterSalesItem);
+//        ExcelUtil<FsStoreAfterSalesItemScrm> util = new ExcelUtil<FsStoreAfterSalesItemScrm>(FsStoreAfterSalesItemScrm.class);
+//        return util.exportExcel(list, "storeAfterSalesItem");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:add')")
+//    @Log(title = "售后子", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
+//    {
+//        return toAjax(fsStoreAfterSalesItemService.insertFsStoreAfterSalesItem(fsStoreAfterSalesItem));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:edit')")
+//    @Log(title = "售后子", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreAfterSalesItemScrm fsStoreAfterSalesItem)
+//    {
+//        return toAjax(fsStoreAfterSalesItemService.updateFsStoreAfterSalesItem(fsStoreAfterSalesItem));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesItem:remove')")
+//    @Log(title = "售后子", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreAfterSalesItemService.deleteFsStoreAfterSalesItemByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreAfterSalesScrmBridgeController.java

@@ -1,231 +1,233 @@
-package com.fs.admin.controller.store;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.config.saas.ProjectConfig;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.his.domain.FsUser;
-import com.fs.his.service.IFsUserService;
-import com.fs.hisStore.domain.FsStoreAfterSalesItemScrm;
-import com.fs.hisStore.domain.FsStoreAfterSalesScrm;
-import com.fs.hisStore.domain.FsStoreAfterSalesStatusScrm;
-import com.fs.hisStore.domain.FsStoreOrderScrm;
-import com.fs.hisStore.param.FsStoreAfterSalesAudit1Param;
-import com.fs.hisStore.param.FsStoreAfterSalesAudit2Param;
-import com.fs.hisStore.param.FsStoreAfterSalesCancelParam;
-import com.fs.hisStore.param.FsStoreAfterSalesRefundParam;
-import com.fs.hisStore.service.IFsStoreAfterSalesItemScrmService;
-import com.fs.hisStore.service.IFsStoreAfterSalesScrmService;
-import com.fs.hisStore.service.IFsStoreAfterSalesStatusScrmService;
-import com.fs.hisStore.service.IFsStoreOrderScrmService;
-import com.fs.hisStore.vo.FsStoreAfterSalesVO;
-import com.fs.hisStore.vo.FsStoreOrderItemExportRefundZMVO;
-import com.fs.system.mapper.SysConfigMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * 售后记录 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreAfterSalesScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeAfterSales")
-public class FsStoreAfterSalesScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreOrderScrmService fsStoreOrderService;
-    @Autowired
-    private IFsUserService userService;
-    @Autowired
-    private IFsStoreAfterSalesScrmService fsStoreAfterSalesService;
-    @Autowired
-    private IFsStoreAfterSalesItemScrmService fsStoreAfterSalesItemService;
-    @Autowired
-    private IFsStoreAfterSalesStatusScrmService storeAfterSalesStatusService;
-    @Autowired
-    private SysConfigMapper sysConfigMapper;
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreAfterSalesScrm fsStoreAfterSales)
-    {
-        startPage();
-        List<FsStoreAfterSalesVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesListVO(fsStoreAfterSales);
-        for (FsStoreAfterSalesVO vo : list) {
-            vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
-        }
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:export')")
-    @Log(title = "售后记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreAfterSalesScrm fsStoreAfterSales)
-    {
-        if (StringUtils.isNotEmpty(fsStoreAfterSales.getBeginTime()) && StringUtils.isNotEmpty(fsStoreAfterSales.getEndTime())) {
-            fsStoreAfterSales.setBeginTime(null);
-            fsStoreAfterSales.setEndTime(null);
-        }
-        if (fsStoreAfterSalesService.isEntityNull(fsStoreAfterSales) && Objects.isNull(fsStoreAfterSales.getParams())) {
-            return AjaxResult.error("请筛选数据导出");
-        }
-
-        List<FsStoreAfterSalesVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesListVOExport(fsStoreAfterSales);
-        if ("北京卓美".equals(ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())) {
-            List<FsStoreOrderItemExportRefundZMVO> zmvoList = list.stream()
-                    .map(vo -> {
-                        FsStoreOrderItemExportRefundZMVO zmvo = new FsStoreOrderItemExportRefundZMVO();
-                        try {
-                            zmvo.setPayCode(vo.getPayCode());
-                            zmvo.setOrderCode(vo.getOrderCode());
-                            zmvo.setStatus(vo.getOrderStatus().toString());
-                            zmvo.setUserId(vo.getUserId());
-                            zmvo.setProductName(vo.getProductName());
-                            zmvo.setBarCode(vo.getProductBarCode());
-                            zmvo.setSku(vo.getSku());
-                            zmvo.setNum(vo.getNum());
-                            zmvo.setPrice(vo.getPrice());
-                            zmvo.setCost(vo.getCost());
-                            zmvo.setPayMoney(vo.getPayMoney());
-                            zmvo.setPayPostage(vo.getTotalPostage());
-                            zmvo.setCateName(vo.getCateName());
-                            zmvo.setRealName(vo.getUserName());
-                            zmvo.setUserPhone(vo.getUserPhone());
-                            zmvo.setUserAddress(vo.getUserAddress());
-                            zmvo.setCreateTime(vo.getOrderCreateTime());
-                            zmvo.setPayTime(vo.getOrderPayTime());
-                            zmvo.setDeliverySn(vo.getOrderDeliverySn());
-                            zmvo.setDeliveryName(vo.getOrderDeliveryName());
-                            zmvo.setDeliveryId(vo.getOrderDeliveryId());
-                            zmvo.setCompanyName(vo.getCompanyName());
-                            zmvo.setCompanyUserNickName(vo.getCompanyUserNickName());
-                            zmvo.setRefundTime(vo.getCreateTime());
-                            zmvo.setRefundMoney(vo.getRefundAmount());
-                            zmvo.setBankTransactionId(vo.getBankTransactionId());
-                            zmvo.setReasons(vo.getReasons());
-                            zmvo.setExplains(vo.getExplains());
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        return zmvo;
-                    })
-                    .collect(Collectors.toList());
-            for (FsStoreOrderItemExportRefundZMVO vo : zmvoList) {
-                vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
-            }
-            ExcelUtil<FsStoreOrderItemExportRefundZMVO> util = new ExcelUtil<FsStoreOrderItemExportRefundZMVO>(FsStoreOrderItemExportRefundZMVO.class);
-            return util.exportExcel(zmvoList, "退款订单导出");
-        }
-        for (FsStoreAfterSalesVO vo : list) {
-            vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
-        }
-        ExcelUtil<FsStoreAfterSalesVO> util = new ExcelUtil<FsStoreAfterSalesVO>(FsStoreAfterSalesVO.class);
-        return util.exportExcel(list, "退款订单导出");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:query')")
-    @GetMapping(value = "/{id}")
-    public R getInfo(@PathVariable("id") Long id)
-    {
-        FsStoreAfterSalesScrm afterSales = fsStoreAfterSalesService.selectFsStoreAfterSalesById(id);
-        FsStoreAfterSalesItemScrm map = new FsStoreAfterSalesItemScrm();
-        map.setStoreAfterSalesId(id);
-        List<FsStoreAfterSalesItemScrm> items = fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemList(map);
-        FsStoreAfterSalesStatusScrm statusMap = new FsStoreAfterSalesStatusScrm();
-        statusMap.setStoreAfterSalesId(id);
-        List<FsStoreAfterSalesStatusScrm> logs = storeAfterSalesStatusService.selectFsStoreAfterSalesStatusList(statusMap);
-        FsUser user = userService.selectFsUserById(afterSales.getUserId());
-        user.setPhone(ParseUtils.parsePhone(user.getPhone()));
-        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderByOrderCode(afterSales.getOrderCode());
-        return R.ok().put("afterSales", afterSales).put("items", items).put("logs", logs).put("user", user).put("order", order);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:add')")
-    @Log(title = "售后记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreAfterSalesScrm fsStoreAfterSales)
-    {
-        return toAjax(fsStoreAfterSalesService.insertFsStoreAfterSales(fsStoreAfterSales));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:edit')")
-    @Log(title = "售后记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreAfterSalesScrm fsStoreAfterSales)
-    {
-        if ((!"".equals(fsStoreAfterSales.getDeliveryName()) && !"".equals(fsStoreAfterSales.getDeliverySn())) || (fsStoreAfterSales.getDeliveryName() == null && fsStoreAfterSales.getDeliverySn() == null)) {
-            fsStoreAfterSales.setStatus(2);
-        }
-        return toAjax(fsStoreAfterSalesService.updateDelivery(fsStoreAfterSales));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:remove')")
-    @Log(title = "售后记录", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreAfterSalesService.deleteFsStoreAfterSalesByIds(ids));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:audit1')")
-    @PostMapping("/audit1")
-    public R audit1(@RequestBody FsStoreAfterSalesAudit1Param param)
-    {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.audit1(param);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:audit2')")
-    @PostMapping("/audit2")
-    public R audit2(@RequestBody FsStoreAfterSalesAudit2Param param)
-    {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.audit2(param);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:refund')")
-    @PostMapping("/refund")
-    public R refund(@RequestBody FsStoreAfterSalesRefundParam param)
-    {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.refundMoney(param);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:cancel')")
-    @PostMapping("/cancel")
-    public R cancel(@RequestBody FsStoreAfterSalesCancelParam param) throws ParseException
-    {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return fsStoreAfterSalesService.cancel(param);
-    }
-
-    @GetMapping("/getStoreAfterSales")
-    public R getStoreAfterSales(@RequestParam("orderCode") String orderCode)
-    {
-        List<FsStoreAfterSalesVO> vo = fsStoreAfterSalesService.selectFsStoreAfterSalesVOByOrderCode(orderCode);
-        return R.ok().put("data", vo);
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import cn.hutool.core.bean.BeanUtil;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.ParseUtils;
+//import com.fs.common.utils.StringUtils;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.config.saas.ProjectConfig;
+//import com.fs.his.domain.FsUser;
+//import com.fs.his.service.IFsUserService;
+//import com.fs.hisStore.domain.FsStoreAfterSalesItemScrm;
+//import com.fs.hisStore.domain.FsStoreAfterSalesScrm;
+//import com.fs.hisStore.domain.FsStoreAfterSalesStatusScrm;
+//import com.fs.hisStore.domain.FsStoreOrderScrm;
+//import com.fs.hisStore.param.FsStoreAfterSalesAudit1Param;
+//import com.fs.hisStore.param.FsStoreAfterSalesAudit2Param;
+//import com.fs.hisStore.param.FsStoreAfterSalesCancelParam;
+//import com.fs.hisStore.param.FsStoreAfterSalesRefundParam;
+//import com.fs.hisStore.service.IFsStoreAfterSalesItemScrmService;
+//import com.fs.hisStore.service.IFsStoreAfterSalesScrmService;
+//import com.fs.hisStore.service.IFsStoreAfterSalesStatusScrmService;
+//import com.fs.hisStore.service.IFsStoreOrderScrmService;
+//import com.fs.hisStore.vo.FsStoreAfterSalesVO;
+//import com.fs.hisStore.vo.FsStoreOrderItemExportRefundZMVO;
+//import com.fs.system.mapper.SysConfigMapper;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.math.BigDecimal;
+//import java.text.ParseException;
+//import java.util.List;
+//import java.util.Objects;
+//import java.util.stream.Collectors;
+//
+///**
+// * 售后记录 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreAfterSalesScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeAfterSales")
+//public class FsStoreAfterSalesScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreOrderScrmService fsStoreOrderService;
+//    @Autowired
+//    private IFsUserService userService;
+//    @Autowired
+//    private IFsStoreAfterSalesScrmService fsStoreAfterSalesService;
+//    @Autowired
+//    private IFsStoreAfterSalesItemScrmService fsStoreAfterSalesItemService;
+//    @Autowired
+//    private IFsStoreAfterSalesStatusScrmService storeAfterSalesStatusService;
+//    @Autowired
+//    private SysConfigMapper sysConfigMapper;
+//
+////    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:list')")
+////    @GetMapping("/list")
+////    public TableDataInfo list(FsStoreAfterSalesScrm fsStoreAfterSales)
+////    {
+////        startPage();
+////        List<FsStoreAfterSalesVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesListVO(fsStoreAfterSales);
+////        for (FsStoreAfterSalesVO vo : list) {
+////            vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
+////        }
+////        return getDataTable(list);
+////    }
+//
+////    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:export')")
+////    @Log(title = "售后记录", businessType = BusinessType.EXPORT)
+////    @GetMapping("/export")
+////    public AjaxResult export(FsStoreAfterSalesScrm fsStoreAfterSales)
+////    {
+////        if (StringUtils.isNotEmpty(fsStoreAfterSales.getBeginTime()) && StringUtils.isNotEmpty(fsStoreAfterSales.getEndTime())) {
+////            fsStoreAfterSales.setBeginTime(null);
+////            fsStoreAfterSales.setEndTime(null);
+////        }
+////        if (fsStoreAfterSalesService.isEntityNull(fsStoreAfterSales) && Objects.isNull(fsStoreAfterSales.getParams())) {
+////            return AjaxResult.error("请筛选数据导出");
+////        }
+////
+////        List<FsStoreAfterSalesVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesListVOExport(fsStoreAfterSales);
+////        if ("北京卓美".equals(ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())) {
+////            List<FsStoreOrderItemExportRefundZMVO> zmvoList = list.stream()
+////                    .map(vo -> {
+////                        FsStoreOrderItemExportRefundZMVO zmvo = new FsStoreOrderItemExportRefundZMVO();
+////                        try {
+////                            zmvo.setPayCode(vo.getPayCode());
+////                            zmvo.setOrderCode(vo.getOrderCode());
+////                            zmvo.setStatus(vo.getOrderStatus().toString());
+////                            zmvo.setUserId(vo.getUserId());
+////                            zmvo.setProductName(vo.getProductName());
+////                            zmvo.setBarCode(vo.getProductBarCode());
+////                            zmvo.setSku(vo.getSku());
+////                            zmvo.setNum(vo.getNum());
+////                            zmvo.setPrice(vo.getPrice());
+////                            zmvo.setCost(vo.getCost());
+////                            zmvo.setPayMoney(vo.getPayMoney());
+////                            zmvo.setPayPostage(vo.getTotalPostage());
+////                            zmvo.setCateName(vo.getCateName());
+////                            zmvo.setRealName(vo.getUserName());
+////                            zmvo.setUserPhone(vo.getUserPhone());
+////                            zmvo.setUserAddress(vo.getUserAddress());
+////                            zmvo.setCreateTime(vo.getOrderCreateTime());
+////                            zmvo.setPayTime(vo.getOrderPayTime());
+////                            zmvo.setDeliverySn(vo.getOrderDeliverySn());
+////                            zmvo.setDeliveryName(vo.getOrderDeliveryName());
+////                            zmvo.setDeliveryId(vo.getOrderDeliveryId());
+////                            zmvo.setCompanyName(vo.getCompanyName());
+////                            zmvo.setCompanyUserNickName(vo.getCompanyUserNickName());
+////                            zmvo.setRefundTime(vo.getCreateTime());
+////                            zmvo.setRefundMoney(vo.getRefundAmount());
+////                            zmvo.setBankTransactionId(vo.getBankTransactionId());
+////                            zmvo.setReasons(vo.getReasons());
+////                            zmvo.setExplains(vo.getExplains());
+////                        } catch (Exception e) {
+////                            e.printStackTrace();
+////                        }
+////                        return zmvo;
+////                    })
+////                    .collect(Collectors.toList());
+////            for (FsStoreOrderItemExportRefundZMVO vo : zmvoList) {
+////                vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
+////            }
+////            ExcelUtil<FsStoreOrderItemExportRefundZMVO> util = new ExcelUtil<FsStoreOrderItemExportRefundZMVO>(FsStoreOrderItemExportRefundZMVO.class);
+////            return util.exportExcel(zmvoList, "退款订单导出");
+////        }
+////        for (FsStoreAfterSalesVO vo : list) {
+////            vo.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
+////        }
+////        ExcelUtil<FsStoreAfterSalesVO> util = new ExcelUtil<FsStoreAfterSalesVO>(FsStoreAfterSalesVO.class);
+////        return util.exportExcel(list, "退款订单导出");
+////    }
+//
+////    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:query')")
+////    @GetMapping(value = "/{id}")
+////    public R getInfo(@PathVariable("id") Long id)
+////    {
+////        FsStoreAfterSalesScrm afterSales = fsStoreAfterSalesService.selectFsStoreAfterSalesById(id);
+////        FsStoreAfterSalesItemScrm map = new FsStoreAfterSalesItemScrm();
+////        map.setStoreAfterSalesId(id);
+////        List<FsStoreAfterSalesItemScrm> items = fsStoreAfterSalesItemService.selectFsStoreAfterSalesItemList(map);
+////        FsStoreAfterSalesStatusScrm statusMap = new FsStoreAfterSalesStatusScrm();
+////        statusMap.setStoreAfterSalesId(id);
+////        List<FsStoreAfterSalesStatusScrm> logs = storeAfterSalesStatusService.selectFsStoreAfterSalesStatusList(statusMap);
+////        FsUser user = userService.selectFsUserById(afterSales.getUserId());
+////        user.setPhone(ParseUtils.parsePhone(user.getPhone()));
+////        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderByOrderCode(afterSales.getOrderCode());
+////        return R.ok().put("afterSales", afterSales).put("items", items).put("logs", logs).put("user", user).put("order", order);
+////    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:add')")
+//    @Log(title = "售后记录", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreAfterSalesScrm fsStoreAfterSales)
+//    {
+//        return toAjax(fsStoreAfterSalesService.insertFsStoreAfterSales(fsStoreAfterSales));
+//    }
+//
+////    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:edit')")
+////    @Log(title = "售后记录", businessType = BusinessType.UPDATE)
+////    @PutMapping
+////    public AjaxResult edit(@RequestBody FsStoreAfterSalesScrm fsStoreAfterSales)
+////    {
+////        if ((!"".equals(fsStoreAfterSales.getDeliveryName()) && !"".equals(fsStoreAfterSales.getDeliverySn())) || (fsStoreAfterSales.getDeliveryName() == null && fsStoreAfterSales.getDeliverySn() == null)) {
+////            fsStoreAfterSales.setStatus(2);
+////        }
+////        return toAjax(fsStoreAfterSalesService.updateDelivery(fsStoreAfterSales));
+////    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:remove')")
+//    @Log(title = "售后记录", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreAfterSalesService.deleteFsStoreAfterSalesByIds(ids));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:audit1')")
+//    @PostMapping("/audit1")
+//    public R audit1(@RequestBody FsStoreAfterSalesAudit1Param param)
+//    {
+////        LoginUser loginUser = SecurityUtils.getLoginUser();
+////        param.setOperator(loginUser.getCompanyUser().getNickName());
+////        return fsStoreAfterSalesService.audit1(param);
+//        throw new RuntimeException("未实现");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:audit2')")
+//    @PostMapping("/audit2")
+//    public R audit2(@RequestBody FsStoreAfterSalesAudit2Param param)
+//    {
+////        LoginUser loginUser = SecurityUtils.getLoginUser();
+////        param.setOperator(loginUser.getCompanyUser().getNickName());
+////        return fsStoreAfterSalesService.audit2(param);
+//        throw new RuntimeException("未实现");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:refund')")
+//    @PostMapping("/refund")
+//    public R refund(@RequestBody FsStoreAfterSalesRefundParam param)
+//    {
+////        LoginUser loginUser = SecurityUtils.getLoginUser();
+////        param.setOperator(loginUser.getCompanyUser().getNickName());
+////        return fsStoreAfterSalesService.refundMoney(param);
+//        throw new RuntimeException("未实现");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSales:cancel')")
+//    @PostMapping("/cancel")
+//    public R cancel(@RequestBody FsStoreAfterSalesCancelParam param) throws ParseException
+//    {
+////        LoginUser loginUser = SecurityUtils.getLoginUser();
+////        param.setOperator(loginUser.getCompanyUser().getNickName());
+////        return fsStoreAfterSalesService.cancel(param);
+//        throw new RuntimeException("未实现");
+//    }
+//
+//    @GetMapping("/getStoreAfterSales")
+//    public R getStoreAfterSales(@RequestParam("orderCode") String orderCode)
+//    {
+//        List<FsStoreAfterSalesVO> vo = fsStoreAfterSalesService.selectFsStoreAfterSalesVOByOrderCode(orderCode);
+//        return R.ok().put("data", vo);
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreAfterSalesStatusScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreAfterSalesStatusScrm;
-import com.fs.hisStore.service.IFsStoreAfterSalesStatusScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 售后订单操作 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreAfterSalesStatusScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeAfterSalesStatus")
-public class FsStoreAfterSalesStatusScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreAfterSalesStatusScrmService fsStoreAfterSalesStatusService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
-    {
-        startPage();
-        List<FsStoreAfterSalesStatusScrm> list = fsStoreAfterSalesStatusService.selectFsStoreAfterSalesStatusList(fsStoreAfterSalesStatus);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:export')")
-    @Log(title = "售后订单操作", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
-    {
-        List<FsStoreAfterSalesStatusScrm> list = fsStoreAfterSalesStatusService.selectFsStoreAfterSalesStatusList(fsStoreAfterSalesStatus);
-        ExcelUtil<FsStoreAfterSalesStatusScrm> util = new ExcelUtil<FsStoreAfterSalesStatusScrm>(FsStoreAfterSalesStatusScrm.class);
-        return util.exportExcel(list, "storeAfterSalesStatus");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreAfterSalesStatusService.selectFsStoreAfterSalesStatusById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:add')")
-    @Log(title = "售后订单操作", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
-    {
-        return toAjax(fsStoreAfterSalesStatusService.insertFsStoreAfterSalesStatus(fsStoreAfterSalesStatus));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:edit')")
-    @Log(title = "售后订单操作", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
-    {
-        return toAjax(fsStoreAfterSalesStatusService.updateFsStoreAfterSalesStatus(fsStoreAfterSalesStatus));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:remove')")
-    @Log(title = "售后订单操作", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreAfterSalesStatusService.deleteFsStoreAfterSalesStatusByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreAfterSalesStatusScrm;
+//import com.fs.hisStore.service.IFsStoreAfterSalesStatusScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 售后订单操作 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreAfterSalesStatusScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeAfterSalesStatus")
+//public class FsStoreAfterSalesStatusScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreAfterSalesStatusScrmService fsStoreAfterSalesStatusService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
+//    {
+//        startPage();
+//        List<FsStoreAfterSalesStatusScrm> list = fsStoreAfterSalesStatusService.selectFsStoreAfterSalesStatusList(fsStoreAfterSalesStatus);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:export')")
+//    @Log(title = "售后订单操作", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
+//    {
+//        List<FsStoreAfterSalesStatusScrm> list = fsStoreAfterSalesStatusService.selectFsStoreAfterSalesStatusList(fsStoreAfterSalesStatus);
+//        ExcelUtil<FsStoreAfterSalesStatusScrm> util = new ExcelUtil<FsStoreAfterSalesStatusScrm>(FsStoreAfterSalesStatusScrm.class);
+//        return util.exportExcel(list, "storeAfterSalesStatus");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreAfterSalesStatusService.selectFsStoreAfterSalesStatusById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:add')")
+//    @Log(title = "售后订单操作", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
+//    {
+//        return toAjax(fsStoreAfterSalesStatusService.insertFsStoreAfterSalesStatus(fsStoreAfterSalesStatus));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:edit')")
+//    @Log(title = "售后订单操作", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreAfterSalesStatusScrm fsStoreAfterSalesStatus)
+//    {
+//        return toAjax(fsStoreAfterSalesStatusService.updateFsStoreAfterSalesStatus(fsStoreAfterSalesStatus));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeAfterSalesStatus:remove')")
+//    @Log(title = "售后订单操作", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreAfterSalesStatusService.deleteFsStoreAfterSalesStatusByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreCartScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreCartScrm;
-import com.fs.hisStore.service.IFsStoreCartScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 购物车 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreCartScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-21
- */
-@RestController
-@RequestMapping("/store/store/storeCart")
-public class FsStoreCartScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreCartScrmService fsStoreCartService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeCart:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreCartScrm fsStoreCart)
-    {
-        startPage();
-        List<FsStoreCartScrm> list = fsStoreCartService.selectFsStoreCartList(fsStoreCart);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCart:export')")
-    @Log(title = "购物车", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreCartScrm fsStoreCart)
-    {
-        List<FsStoreCartScrm> list = fsStoreCartService.selectFsStoreCartList(fsStoreCart);
-        ExcelUtil<FsStoreCartScrm> util = new ExcelUtil<FsStoreCartScrm>(FsStoreCartScrm.class);
-        return util.exportExcel(list, "storeCart");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCart:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreCartService.selectFsStoreCartById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCart:add')")
-    @Log(title = "购物车", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreCartScrm fsStoreCart)
-    {
-        return toAjax(fsStoreCartService.insertFsStoreCart(fsStoreCart));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCart:edit')")
-    @Log(title = "购物车", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreCartScrm fsStoreCart)
-    {
-        return toAjax(fsStoreCartService.updateFsStoreCart(fsStoreCart));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCart:remove')")
-    @Log(title = "购物车", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreCartService.deleteFsStoreCartByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreCartScrm;
+//import com.fs.hisStore.service.IFsStoreCartScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 购物车 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreCartScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-21
+// */
+//@RestController
+//@RequestMapping("/store/store/storeCart")
+//public class FsStoreCartScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreCartScrmService fsStoreCartService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCart:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreCartScrm fsStoreCart)
+//    {
+//        startPage();
+//        List<FsStoreCartScrm> list = fsStoreCartService.selectFsStoreCartList(fsStoreCart);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCart:export')")
+//    @Log(title = "购物车", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreCartScrm fsStoreCart)
+//    {
+//        List<FsStoreCartScrm> list = fsStoreCartService.selectFsStoreCartList(fsStoreCart);
+//        ExcelUtil<FsStoreCartScrm> util = new ExcelUtil<FsStoreCartScrm>(FsStoreCartScrm.class);
+//        return util.exportExcel(list, "storeCart");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCart:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreCartService.selectFsStoreCartById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCart:add')")
+//    @Log(title = "购物车", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreCartScrm fsStoreCart)
+//    {
+//        return toAjax(fsStoreCartService.insertFsStoreCart(fsStoreCart));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCart:edit')")
+//    @Log(title = "购物车", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreCartScrm fsStoreCart)
+//    {
+//        return toAjax(fsStoreCartService.updateFsStoreCart(fsStoreCart));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCart:remove')")
+//    @Log(title = "购物车", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreCartService.deleteFsStoreCartByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreCouponScrmBridgeController.java

@@ -1,129 +1,129 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreCouponScrm;
-import com.fs.hisStore.domain.FsStoreCouponIssueScrm;
-import com.fs.hisStore.param.FsStoreCouponPublishParam;
-import com.fs.hisStore.service.IFsStoreCouponIssueScrmService;
-import com.fs.hisStore.service.IFsStoreCouponScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 优惠券 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreCouponScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/storeCoupon")
-public class FsStoreCouponScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreCouponScrmService fsStoreCouponService;
-    @Autowired
-    private IFsStoreCouponIssueScrmService fsStoreCouponIssueService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreCouponScrm fsStoreCoupon)
-    {
-        startPage();
-        fsStoreCoupon.setIsDel(0);
-        List<FsStoreCouponScrm> list = fsStoreCouponService.selectFsStoreCouponList(fsStoreCoupon);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:export')")
-    @Log(title = "优惠券", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreCouponScrm fsStoreCoupon)
-    {
-        List<FsStoreCouponScrm> list = fsStoreCouponService.selectFsStoreCouponList(fsStoreCoupon);
-        ExcelUtil<FsStoreCouponScrm> util = new ExcelUtil<FsStoreCouponScrm>(FsStoreCouponScrm.class);
-        return util.exportExcel(list, "storeCoupon");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:query')")
-    @GetMapping(value = "/{couponId}")
-    public AjaxResult getInfo(@PathVariable("couponId") Long couponId)
-    {
-        return AjaxResult.success(fsStoreCouponService.selectFsStoreCouponById(couponId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:add')")
-    @Log(title = "优惠券", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreCouponScrm fsStoreCoupon)
-    {
-        return toAjax(fsStoreCouponService.insertFsStoreCoupon(fsStoreCoupon));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:edit')")
-    @Log(title = "优惠券", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreCouponScrm fsStoreCoupon)
-    {
-        return toAjax(fsStoreCouponService.updateFsStoreCoupon(fsStoreCoupon));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:remove')")
-    @Log(title = "优惠券", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{couponIds}")
-    public AjaxResult remove(@PathVariable Long[] couponIds)
-    {
-        return toAjax(fsStoreCouponService.deleteFsStoreCouponByIds(couponIds));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:publish')")
-    @PostMapping("/publish")
-    public AjaxResult publish(@RequestBody FsStoreCouponPublishParam publishParam)
-    {
-        FsStoreCouponScrm coupon = fsStoreCouponService.selectFsStoreCouponById(publishParam.getCouponId());
-        FsStoreCouponIssueScrm issue = new FsStoreCouponIssueScrm();
-        issue.setCouponId(publishParam.getCouponId());
-        issue.setCouponName(coupon.getTitle());
-        issue.setCouponType(coupon.getType());
-        issue.setStartTime(publishParam.getStartTime());
-        issue.setLimitTime(publishParam.getLimitTime());
-        issue.setTotalCount(publishParam.getTotalCount());
-        issue.setRemainCount(0);
-        issue.setIsPermanent(0);
-        issue.setStatus(1);
-        issue.setCreateTime(new Date());
-        return toAjax(fsStoreCouponIssueService.insertFsStoreCouponIssue(issue));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeCoupon:batchPublish')")
-    @PostMapping("/batchPublish")
-    public R batchPublish(@RequestBody FsStoreCouponPublishParam publishParam)
-    {
-        List<FsStoreCouponScrm> list = fsStoreCouponService.selectFsStoreCouponByIds(publishParam.getIds());
-        for (FsStoreCouponScrm coupon : list) {
-            FsStoreCouponIssueScrm issue = new FsStoreCouponIssueScrm();
-            issue.setCouponId(coupon.getCouponId());
-            issue.setCouponName(coupon.getTitle());
-            issue.setCouponType(coupon.getType());
-            issue.setStartTime(publishParam.getStartTime());
-            issue.setLimitTime(publishParam.getLimitTime());
-            issue.setTotalCount(publishParam.getTotalCount());
-            issue.setRemainCount(0);
-            issue.setIsPermanent(0);
-            issue.setStatus(1);
-            issue.setCreateTime(new Date());
-            fsStoreCouponIssueService.insertFsStoreCouponIssue(issue);
-        }
-        return R.ok();
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreCouponScrm;
+//import com.fs.hisStore.domain.FsStoreCouponIssueScrm;
+//import com.fs.hisStore.param.FsStoreCouponPublishParam;
+//import com.fs.hisStore.service.IFsStoreCouponIssueScrmService;
+//import com.fs.hisStore.service.IFsStoreCouponScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * 优惠券 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreCouponScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/storeCoupon")
+//public class FsStoreCouponScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreCouponScrmService fsStoreCouponService;
+//    @Autowired
+//    private IFsStoreCouponIssueScrmService fsStoreCouponIssueService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreCouponScrm fsStoreCoupon)
+//    {
+//        startPage();
+//        fsStoreCoupon.setIsDel(0);
+//        List<FsStoreCouponScrm> list = fsStoreCouponService.selectFsStoreCouponList(fsStoreCoupon);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:export')")
+//    @Log(title = "优惠券", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreCouponScrm fsStoreCoupon)
+//    {
+//        List<FsStoreCouponScrm> list = fsStoreCouponService.selectFsStoreCouponList(fsStoreCoupon);
+//        ExcelUtil<FsStoreCouponScrm> util = new ExcelUtil<FsStoreCouponScrm>(FsStoreCouponScrm.class);
+//        return util.exportExcel(list, "storeCoupon");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:query')")
+//    @GetMapping(value = "/{couponId}")
+//    public AjaxResult getInfo(@PathVariable("couponId") Long couponId)
+//    {
+//        return AjaxResult.success(fsStoreCouponService.selectFsStoreCouponById(couponId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:add')")
+//    @Log(title = "优惠券", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreCouponScrm fsStoreCoupon)
+//    {
+//        return toAjax(fsStoreCouponService.insertFsStoreCoupon(fsStoreCoupon));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:edit')")
+//    @Log(title = "优惠券", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreCouponScrm fsStoreCoupon)
+//    {
+//        return toAjax(fsStoreCouponService.updateFsStoreCoupon(fsStoreCoupon));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:remove')")
+//    @Log(title = "优惠券", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{couponIds}")
+//    public AjaxResult remove(@PathVariable Long[] couponIds)
+//    {
+//        return toAjax(fsStoreCouponService.deleteFsStoreCouponByIds(couponIds));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:publish')")
+//    @PostMapping("/publish")
+//    public AjaxResult publish(@RequestBody FsStoreCouponPublishParam publishParam)
+//    {
+//        FsStoreCouponScrm coupon = fsStoreCouponService.selectFsStoreCouponById(publishParam.getCouponId());
+//        FsStoreCouponIssueScrm issue = new FsStoreCouponIssueScrm();
+//        issue.setCouponId(publishParam.getCouponId());
+//        issue.setCouponName(coupon.getTitle());
+//        issue.setCouponType(coupon.getType());
+//        issue.setStartTime(publishParam.getStartTime());
+//        issue.setLimitTime(publishParam.getLimitTime());
+//        issue.setTotalCount(publishParam.getTotalCount());
+//        issue.setRemainCount(0);
+//        issue.setIsPermanent(0);
+//        issue.setStatus(1);
+//        issue.setCreateTime(new Date());
+//        return toAjax(fsStoreCouponIssueService.insertFsStoreCouponIssue(issue));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeCoupon:batchPublish')")
+//    @PostMapping("/batchPublish")
+//    public R batchPublish(@RequestBody FsStoreCouponPublishParam publishParam)
+//    {
+//        List<FsStoreCouponScrm> list = fsStoreCouponService.selectFsStoreCouponByIds(publishParam.getIds());
+//        for (FsStoreCouponScrm coupon : list) {
+//            FsStoreCouponIssueScrm issue = new FsStoreCouponIssueScrm();
+//            issue.setCouponId(coupon.getCouponId());
+//            issue.setCouponName(coupon.getTitle());
+//            issue.setCouponType(coupon.getType());
+//            issue.setStartTime(publishParam.getStartTime());
+//            issue.setLimitTime(publishParam.getLimitTime());
+//            issue.setTotalCount(publishParam.getTotalCount());
+//            issue.setRemainCount(0);
+//            issue.setIsPermanent(0);
+//            issue.setStatus(1);
+//            issue.setCreateTime(new Date());
+//            fsStoreCouponIssueService.insertFsStoreCouponIssue(issue);
+//        }
+//        return R.ok();
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderAuditScrmBridgeController.java

@@ -33,14 +33,14 @@ public class FsStoreOrderAuditScrmBridgeController extends BaseController
     @Autowired
     private IFsStoreOrderAuditScrmService fsStoreOrderAuditService;
 
-    @PreAuthorize("@ss.hasPermi('store:storeOrderAudit:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreOrderAuditParam param)
-    {
-        startPage();
-        List<FsStoreOrderAuditVO> list = fsStoreOrderAuditService.selectStoreOrderAuditVOList(param);
-        return getDataTable(list);
-    }
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderAudit:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreOrderAuditParam param)
+//    {
+//        startPage();
+//        List<FsStoreOrderAuditVO> list = fsStoreOrderAuditService.selectStoreOrderAuditVOList(param);
+//        return getDataTable(list);
+//    }
 
     @PreAuthorize("@ss.hasPermi('store:storeOrderAudit:export')")
     @Log(title = "订单审核", businessType = BusinessType.EXPORT)
@@ -75,14 +75,14 @@ public class FsStoreOrderAuditScrmBridgeController extends BaseController
         return toAjax(fsStoreOrderAuditService.updateById(fsStoreOrderAudit));
     }
 
-    @PreAuthorize("@ss.hasPermi('store:storeOrderAudit:audit')")
-    @Log(title = "订单审核", businessType = BusinessType.UPDATE)
-    @PostMapping("/audit")
-    public AjaxResult audit(@Valid @RequestBody FsStoreOrderAuditReviewParam param)
-    {
-        fsStoreOrderAuditService.audit(param, null, true);
-        return AjaxResult.success();
-    }
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderAudit:audit')")
+//    @Log(title = "订单审核", businessType = BusinessType.UPDATE)
+//    @PostMapping("/audit")
+//    public AjaxResult audit(@Valid @RequestBody FsStoreOrderAuditReviewParam param)
+//    {
+//        fsStoreOrderAuditService.audit(param, null, true);
+//        return AjaxResult.success();
+//    }
 
     @PreAuthorize("@ss.hasPermi('store:storeOrderAudit:remove')")
     @Log(title = "订单审核", businessType = BusinessType.DELETE)

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderItemScrmBridgeController.java

@@ -1,88 +1,88 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreOrderItemScrm;
-import com.fs.hisStore.service.IFsStoreOrderItemScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 订单详情 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreOrderItemScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-21
- */
-@RestController
-@RequestMapping("/store/store/storeOrderItem")
-public class FsStoreOrderItemScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreOrderItemScrmService fsStoreOrderItemService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreOrderItemScrm fsStoreOrderItem)
-    {
-        startPage();
-        List<FsStoreOrderItemScrm> list = fsStoreOrderItemService.selectFsStoreOrderItemList(fsStoreOrderItem);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:export')")
-    @Log(title = "订单详情", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreOrderItemScrm fsStoreOrderItem)
-    {
-        List<FsStoreOrderItemScrm> list = fsStoreOrderItemService.selectFsStoreOrderItemList(fsStoreOrderItem);
-        ExcelUtil<FsStoreOrderItemScrm> util = new ExcelUtil<FsStoreOrderItemScrm>(FsStoreOrderItemScrm.class);
-        return util.exportExcel(list, "storeOrderItem");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:query')")
-    @GetMapping(value = "/{itemId}")
-    public AjaxResult getInfo(@PathVariable("itemId") Long itemId)
-    {
-        return AjaxResult.success(fsStoreOrderItemService.selectFsStoreOrderItemById(itemId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:add')")
-    @Log(title = "订单详情", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreOrderItemScrm fsStoreOrderItem)
-    {
-        return toAjax(fsStoreOrderItemService.insertFsStoreOrderItem(fsStoreOrderItem));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:edit')")
-    @Log(title = "订单详情", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreOrderItemScrm fsStoreOrderItem)
-    {
-        return toAjax(fsStoreOrderItemService.updateFsStoreOrderItem(fsStoreOrderItem));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:remove')")
-    @Log(title = "订单详情", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{itemIds}")
-    public AjaxResult remove(@PathVariable Long[] itemIds)
-    {
-        return toAjax(fsStoreOrderItemService.deleteFsStoreOrderItemByIds(itemIds));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:updateNum')")
-    @Log(title = "订单详情修改订单数量", businessType = BusinessType.UPDATE)
-    @PutMapping("/updateNum")
-    public AjaxResult updateNum(@RequestBody FsStoreOrderItemScrm fsStoreOrderItem)
-    {
-        return toAjax(fsStoreOrderItemService.updateFsStoreOrderItemNum(fsStoreOrderItem));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreOrderItemScrm;
+//import com.fs.hisStore.service.IFsStoreOrderItemScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 订单详情 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreOrderItemScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-21
+// */
+//@RestController
+//@RequestMapping("/store/store/storeOrderItem")
+//public class FsStoreOrderItemScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreOrderItemScrmService fsStoreOrderItemService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreOrderItemScrm fsStoreOrderItem)
+//    {
+//        startPage();
+//        List<FsStoreOrderItemScrm> list = fsStoreOrderItemService.selectFsStoreOrderItemList(fsStoreOrderItem);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:export')")
+//    @Log(title = "订单详情", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreOrderItemScrm fsStoreOrderItem)
+//    {
+//        List<FsStoreOrderItemScrm> list = fsStoreOrderItemService.selectFsStoreOrderItemList(fsStoreOrderItem);
+//        ExcelUtil<FsStoreOrderItemScrm> util = new ExcelUtil<FsStoreOrderItemScrm>(FsStoreOrderItemScrm.class);
+//        return util.exportExcel(list, "storeOrderItem");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:query')")
+//    @GetMapping(value = "/{itemId}")
+//    public AjaxResult getInfo(@PathVariable("itemId") Long itemId)
+//    {
+//        return AjaxResult.success(fsStoreOrderItemService.selectFsStoreOrderItemById(itemId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:add')")
+//    @Log(title = "订单详情", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreOrderItemScrm fsStoreOrderItem)
+//    {
+//        return toAjax(fsStoreOrderItemService.insertFsStoreOrderItem(fsStoreOrderItem));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:edit')")
+//    @Log(title = "订单详情", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreOrderItemScrm fsStoreOrderItem)
+//    {
+//        return toAjax(fsStoreOrderItemService.updateFsStoreOrderItem(fsStoreOrderItem));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:remove')")
+//    @Log(title = "订单详情", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{itemIds}")
+//    public AjaxResult remove(@PathVariable Long[] itemIds)
+//    {
+//        return toAjax(fsStoreOrderItemService.deleteFsStoreOrderItemByIds(itemIds));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:updateNum')")
+//    @Log(title = "订单详情修改订单数量", businessType = BusinessType.UPDATE)
+//    @PutMapping("/updateNum")
+//    public AjaxResult updateNum(@RequestBody FsStoreOrderItemScrm fsStoreOrderItem)
+//    {
+//        return toAjax(fsStoreOrderItemService.updateFsStoreOrderItemNum(fsStoreOrderItem));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderNoticeScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreOrderNoticeScrm;
-import com.fs.hisStore.service.IFsStoreOrderNoticeScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 订单通知用户 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreOrderNoticeScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeOrderNotice")
-public class FsStoreOrderNoticeScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreOrderNoticeScrmService fsStoreOrderNoticeService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreOrderNoticeScrm fsStoreOrderNotice)
-    {
-        startPage();
-        List<FsStoreOrderNoticeScrm> list = fsStoreOrderNoticeService.selectFsStoreOrderNoticeList(fsStoreOrderNotice);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:export')")
-    @Log(title = "订单通知用户", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreOrderNoticeScrm fsStoreOrderNotice)
-    {
-        List<FsStoreOrderNoticeScrm> list = fsStoreOrderNoticeService.selectFsStoreOrderNoticeList(fsStoreOrderNotice);
-        ExcelUtil<FsStoreOrderNoticeScrm> util = new ExcelUtil<FsStoreOrderNoticeScrm>(FsStoreOrderNoticeScrm.class);
-        return util.exportExcel(list, "storeOrderNotice");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreOrderNoticeService.selectFsStoreOrderNoticeById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:add')")
-    @Log(title = "订单通知用户", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreOrderNoticeScrm fsStoreOrderNotice)
-    {
-        return toAjax(fsStoreOrderNoticeService.insertFsStoreOrderNotice(fsStoreOrderNotice));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:edit')")
-    @Log(title = "订单通知用户", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreOrderNoticeScrm fsStoreOrderNotice)
-    {
-        return toAjax(fsStoreOrderNoticeService.updateFsStoreOrderNotice(fsStoreOrderNotice));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:remove')")
-    @Log(title = "订单通知用户", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreOrderNoticeService.deleteFsStoreOrderNoticeByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreOrderNoticeScrm;
+//import com.fs.hisStore.service.IFsStoreOrderNoticeScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 订单通知用户 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreOrderNoticeScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeOrderNotice")
+//public class FsStoreOrderNoticeScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreOrderNoticeScrmService fsStoreOrderNoticeService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreOrderNoticeScrm fsStoreOrderNotice)
+//    {
+//        startPage();
+//        List<FsStoreOrderNoticeScrm> list = fsStoreOrderNoticeService.selectFsStoreOrderNoticeList(fsStoreOrderNotice);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:export')")
+//    @Log(title = "订单通知用户", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreOrderNoticeScrm fsStoreOrderNotice)
+//    {
+//        List<FsStoreOrderNoticeScrm> list = fsStoreOrderNoticeService.selectFsStoreOrderNoticeList(fsStoreOrderNotice);
+//        ExcelUtil<FsStoreOrderNoticeScrm> util = new ExcelUtil<FsStoreOrderNoticeScrm>(FsStoreOrderNoticeScrm.class);
+//        return util.exportExcel(list, "storeOrderNotice");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreOrderNoticeService.selectFsStoreOrderNoticeById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:add')")
+//    @Log(title = "订单通知用户", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreOrderNoticeScrm fsStoreOrderNotice)
+//    {
+//        return toAjax(fsStoreOrderNoticeService.insertFsStoreOrderNotice(fsStoreOrderNotice));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:edit')")
+//    @Log(title = "订单通知用户", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreOrderNoticeScrm fsStoreOrderNotice)
+//    {
+//        return toAjax(fsStoreOrderNoticeService.updateFsStoreOrderNotice(fsStoreOrderNotice));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderNotice:remove')")
+//    @Log(title = "订单通知用户", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreOrderNoticeService.deleteFsStoreOrderNoticeByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderOfflineScrmBridgeController.java

@@ -1,132 +1,132 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.crm.domain.CrmCustomer;
-import com.fs.crm.service.ICrmCustomerService;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.hisStore.domain.FsStoreOrderOfflineScrm;
-import com.fs.hisStore.domain.FsStoreOrderOfflineItemScrm;
-import com.fs.hisStore.param.FsStoreOrderOfflineParam;
-import com.fs.hisStore.service.IFsStoreOrderOfflineItemScrmService;
-import com.fs.hisStore.service.IFsStoreOrderOfflineScrmService;
-import com.fs.hisStore.vo.FsStoreOrderOfflineListVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 线下订单 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreOrderOfflineScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2024-10-29
- */
-@RestController
-@RequestMapping("/store/store/storeOrderOffline")
-public class FsStoreOrderOfflineScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreOrderOfflineScrmService fsStoreOrderOfflineService;
-    @Autowired
-    private IFsStoreOrderOfflineItemScrmService fsStoreOrderOfflineItemService;
-    @Autowired
-    private ICrmCustomerService crmCustomerService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreOrderOfflineParam param)
-    {
-        startPage();
-        List<FsStoreOrderOfflineListVO> list = fsStoreOrderOfflineService.selectFsStoreOrderOfflineListVO(param);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:export')")
-    @Log(title = "线下订单", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreOrderOfflineScrm fsStoreOrderOffline)
-    {
-        List<FsStoreOrderOfflineScrm> list = fsStoreOrderOfflineService.selectFsStoreOrderOfflineList(fsStoreOrderOffline);
-        ExcelUtil<FsStoreOrderOfflineScrm> util = new ExcelUtil<FsStoreOrderOfflineScrm>(FsStoreOrderOfflineScrm.class);
-        return util.exportExcel(list, "storeOrderOffline");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:query')")
-    @GetMapping(value = "/{orderId}")
-    public R getInfo(@PathVariable("orderId") Long orderId)
-    {
-        FsStoreOrderOfflineListVO order = fsStoreOrderOfflineService.selectFsStoreOrderOfflineVOById(orderId);
-        order.setMobile(ParseUtils.parsePhone(order.getMobile()));
-        CrmCustomer customer = null;
-        if(order.getCrmId()!=null && order.getCrmId()>0){
-            customer = crmCustomerService.selectCrmCustomerById(order.getCrmId());
-            customer.setMobile(ParseUtils.parsePhone(customer.getMobile()));
-        }
-        FsStoreOrderOfflineItemScrm itemMap = new FsStoreOrderOfflineItemScrm();
-        itemMap.setOrderId(order.getOrderId());
-        List<FsStoreOrderOfflineItemScrm> items = fsStoreOrderOfflineItemService.selectFsStoreOrderOfflineItemList(itemMap);
-        return R.ok().put("order", order).put("items", items).put("customer", customer);
-    }
-
-    @GetMapping(value = "/queryPhone/{orderId}")
-    @Log(title = "查看电话", businessType = BusinessType.GRANT)
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:queryPhone')")
-    public R getPhone(@PathVariable("orderId") Long orderId)
-    {
-        FsStoreOrderOfflineListVO order = fsStoreOrderOfflineService.selectFsStoreOrderOfflineVOById(orderId);
-        String userPhone = order.getMobile();
-        return R.ok().put("userPhone", userPhone);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:add')")
-    @Log(title = "线下订单", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreOrderOfflineScrm fsStoreOrderOffline)
-    {
-        return toAjax(fsStoreOrderOfflineService.insertFsStoreOrderOffline(fsStoreOrderOffline));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:edit')")
-    @Log(title = "线下订单", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreOrderOfflineScrm fsStoreOrderOffline)
-    {
-        return toAjax(fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:remove')")
-    @Log(title = "线下订单", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{orderIds}")
-    public AjaxResult remove(@PathVariable Long[] orderIds)
-    {
-        return toAjax(fsStoreOrderOfflineService.deleteFsStoreOrderOfflineByIds(orderIds));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:audit')")
-    @Log(title = "审核订单", businessType = BusinessType.UPDATE)
-    @PostMapping("/auditOrder/{orderId}")
-    public R auditOrder(@PathVariable Long orderId)
-    {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        FsStoreOrderOfflineScrm fsStoreOrderOffline = new FsStoreOrderOfflineScrm();
-        fsStoreOrderOffline.setOrderId(orderId);
-        fsStoreOrderOffline.setStatus(3L);
-        fsStoreOrderOffline.setAuditBy(loginUser.getCompanyUser().getNickName());
-        fsStoreOrderOffline.setAuditTime(new Date());
-        if (fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline) > 0){
-            return R.ok();
-        }
-        return R.error("审核失败");
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.ParseUtils;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.crm.domain.CrmCustomer;
+//import com.fs.crm.service.ICrmCustomerService;
+//import com.fs.framework.security.SecurityUtils;
+//import com.fs.framework.security.LoginUser;
+//import com.fs.hisStore.domain.FsStoreOrderOfflineScrm;
+//import com.fs.hisStore.domain.FsStoreOrderOfflineItemScrm;
+//import com.fs.hisStore.param.FsStoreOrderOfflineParam;
+//import com.fs.hisStore.service.IFsStoreOrderOfflineItemScrmService;
+//import com.fs.hisStore.service.IFsStoreOrderOfflineScrmService;
+//import com.fs.hisStore.vo.FsStoreOrderOfflineListVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * 线下订单 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreOrderOfflineScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2024-10-29
+// */
+//@RestController
+//@RequestMapping("/store/store/storeOrderOffline")
+//public class FsStoreOrderOfflineScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreOrderOfflineScrmService fsStoreOrderOfflineService;
+//    @Autowired
+//    private IFsStoreOrderOfflineItemScrmService fsStoreOrderOfflineItemService;
+//    @Autowired
+//    private ICrmCustomerService crmCustomerService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreOrderOfflineParam param)
+//    {
+//        startPage();
+//        List<FsStoreOrderOfflineListVO> list = fsStoreOrderOfflineService.selectFsStoreOrderOfflineListVO(param);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:export')")
+//    @Log(title = "线下订单", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreOrderOfflineScrm fsStoreOrderOffline)
+//    {
+//        List<FsStoreOrderOfflineScrm> list = fsStoreOrderOfflineService.selectFsStoreOrderOfflineList(fsStoreOrderOffline);
+//        ExcelUtil<FsStoreOrderOfflineScrm> util = new ExcelUtil<FsStoreOrderOfflineScrm>(FsStoreOrderOfflineScrm.class);
+//        return util.exportExcel(list, "storeOrderOffline");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:query')")
+//    @GetMapping(value = "/{orderId}")
+//    public R getInfo(@PathVariable("orderId") Long orderId)
+//    {
+//        FsStoreOrderOfflineListVO order = fsStoreOrderOfflineService.selectFsStoreOrderOfflineVOById(orderId);
+//        order.setMobile(ParseUtils.parsePhone(order.getMobile()));
+//        CrmCustomer customer = null;
+//        if(order.getCrmId()!=null && order.getCrmId()>0){
+//            customer = crmCustomerService.selectCrmCustomerById(order.getCrmId());
+//            customer.setMobile(ParseUtils.parsePhone(customer.getMobile()));
+//        }
+//        FsStoreOrderOfflineItemScrm itemMap = new FsStoreOrderOfflineItemScrm();
+//        itemMap.setOrderId(order.getOrderId());
+//        List<FsStoreOrderOfflineItemScrm> items = fsStoreOrderOfflineItemService.selectFsStoreOrderOfflineItemList(itemMap);
+//        return R.ok().put("order", order).put("items", items).put("customer", customer);
+//    }
+//
+//    @GetMapping(value = "/queryPhone/{orderId}")
+//    @Log(title = "查看电话", businessType = BusinessType.GRANT)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:queryPhone')")
+//    public R getPhone(@PathVariable("orderId") Long orderId)
+//    {
+//        FsStoreOrderOfflineListVO order = fsStoreOrderOfflineService.selectFsStoreOrderOfflineVOById(orderId);
+//        String userPhone = order.getMobile();
+//        return R.ok().put("userPhone", userPhone);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:add')")
+//    @Log(title = "线下订单", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreOrderOfflineScrm fsStoreOrderOffline)
+//    {
+//        return toAjax(fsStoreOrderOfflineService.insertFsStoreOrderOffline(fsStoreOrderOffline));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:edit')")
+//    @Log(title = "线下订单", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreOrderOfflineScrm fsStoreOrderOffline)
+//    {
+//        return toAjax(fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:remove')")
+//    @Log(title = "线下订单", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{orderIds}")
+//    public AjaxResult remove(@PathVariable Long[] orderIds)
+//    {
+//        return toAjax(fsStoreOrderOfflineService.deleteFsStoreOrderOfflineByIds(orderIds));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderOffline:audit')")
+//    @Log(title = "审核订单", businessType = BusinessType.UPDATE)
+//    @PostMapping("/auditOrder/{orderId}")
+//    public R auditOrder(@PathVariable Long orderId)
+//    {
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        FsStoreOrderOfflineScrm fsStoreOrderOffline = new FsStoreOrderOfflineScrm();
+//        fsStoreOrderOffline.setOrderId(orderId);
+//        fsStoreOrderOffline.setStatus(3L);
+//        fsStoreOrderOffline.setAuditBy(loginUser.getCompanyUser().getNickName());
+//        fsStoreOrderOffline.setAuditTime(new Date());
+//        if (fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline) > 0){
+//            return R.ok();
+//        }
+//        return R.error("审核失败");
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderScrmBridgeController.java

@@ -1,1060 +1,1060 @@
-package com.fs.admin.controller.store;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.domain.entity.SysRole;
-import com.fs.common.core.domain.entity.SysUser;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.CloudHostUtils;
-import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.company.param.CompanyStoreOrderMoneyLogsListParam;
-import com.fs.company.service.ICompanyMoneyLogsService;
-import com.fs.company.vo.CompanyStoreOrderMoneyLogsVO;
-import com.fs.config.cloud.CloudHostProper;
-import com.fs.erp.domain.ErpDeliverys;
-import com.fs.erp.domain.ErpOrderQuery;
-import com.fs.erp.dto.ErpOrderQueryRequert;
-import com.fs.erp.dto.ErpOrderQueryResponse;
-import com.fs.erp.dto.df.DFConfigVo;
-import com.fs.erp.service.IErpOrderService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.service.TokenService;
-import com.fs.his.domain.FsDfAccount;
-import com.fs.his.domain.FsStoreOrderDf;
-import com.fs.his.domain.FsUser;
-import com.fs.his.enums.FsStoreOrderLogEnum;
-import com.fs.his.param.FsStoreOrderSetErpPhoneParam;
-import com.fs.his.service.IFsDfAccountService;
-import com.fs.his.service.IFsExpressService;
-import com.fs.his.service.IFsStoreOrderDfService;
-import com.fs.his.service.IFsUserService;
-import com.fs.his.utils.ConfigUtil;
-import com.fs.his.vo.FsStoreOrderListAndStatisticsVo;
-import com.fs.his.vo.FsStoreOrderListVO;
-import com.fs.hisStore.config.FsErpConfig;
-import com.fs.hisStore.domain.FsStoreOrderItemScrm;
-import com.fs.hisStore.domain.FsStoreOrderScrm;
-import com.fs.hisStore.domain.FsStoreOrderStatusScrm;
-import com.fs.hisStore.domain.FsStorePaymentScrm;
-import com.fs.his.dto.ExpressInfoDTO;
-import com.fs.hisStore.dto.StoreOrderExpressExportDTO;
-import com.fs.hisStore.dto.StoreOrderProductDTO;
-import com.fs.hisStore.enums.ShipperCodeEnum;
-import com.fs.hisStore.param.*;
-import com.fs.hisStore.service.*;
-import com.fs.hisStore.vo.*;
-import com.fs.system.domain.SysConfig;
-import com.fs.system.mapper.SysConfigMapper;
-import com.fs.system.service.ISysRoleService;
-import com.github.pagehelper.PageHelper;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * 订单 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreOrderScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeOrder")
-public class FsStoreOrderScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsExpressService expressService;
-    @Autowired
-    private IFsStoreOrderScrmService fsStoreOrderService;
-    @Autowired
-    private IFsStoreOrderItemScrmService orderItemService;
-    @Autowired
-    private IFsUserService userService;
-    @Autowired
-    private IFsStoreOrderStatusScrmService orderStatusService;
-    @Autowired
-    IFsStorePaymentScrmService paymentService;
-    @Autowired
-    private CloudHostProper cloudHostProper;
-    @Autowired
-    private ICompanyMoneyLogsService moneyLogsService;
-    @Autowired
-    @Qualifier("erpOrderServiceImpl")
-    private IErpOrderService gyOrderService;
-    @Autowired
-    @Qualifier("wdtErpOrderServiceImpl")
-    private IErpOrderService wdtOrderService;
-    @Autowired
-    @Qualifier("hzOMSErpOrderServiceImpl")
-    private IErpOrderService hzOMSErpOrderService;
-    @Autowired
-    @Qualifier("dfOrderServiceImpl")
-    private IErpOrderService dfOrderService;
-    @Autowired
-    @Qualifier("k9OrderScrmServiceImpl")
-    private IErpOrderService k9OrderService;
-    @Autowired
-    @Qualifier("JSTErpOrderServiceImpl")
-    private IErpOrderService jSTOrderService;
-    @Autowired
-    private ConfigUtil configUtil;
-    @Autowired
-    private IFsStoreOrderAuditLogScrmService orderAuditLogService;
-    @Autowired
-    private TokenService tokenService;
-    @Autowired
-    SysConfigMapper sysConfigMapper;
-    @Autowired
-    private IFsDfAccountService fsDfAccountService;
-    @Autowired
-    private IFsStoreOrderDfService fsStoreOrderDfService;
-    @Autowired
-    private IFsStoreOrderLogsScrmService fsStoreOrderLogsService;
-    @Autowired
-    private ISysRoleService sysRoleService;
-
-    private IErpOrderService getErpService()
-    {
-        IErpOrderService erpOrderService = null;
-        FsErpConfig erpConfig = configUtil.getErpConfig();
-        Integer erpOpen = erpConfig.getErpOpen();
-        if (erpOpen != null && erpOpen == 1) {
-            Integer erpType = erpConfig.getErpType();
-            if (erpType != null) {
-                if (erpType == 1) {
-                    erpOrderService = gyOrderService;
-                } else if (erpType == 2) {
-                    erpOrderService = wdtOrderService;
-                } else if (erpType == 3) {
-                    erpOrderService = hzOMSErpOrderService;
-                } else if (erpType == 4) {
-                    erpOrderService = dfOrderService;
-                } else if (erpType == 5) {
-                    erpOrderService = jSTOrderService;
-                } else if (erpType == 6) {
-                    erpOrderService = k9OrderService;
-                }
-            }
-        }
-        return erpOrderService;
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:list')")
-    @PostMapping("/list")
-    public TableDataInfo list(@RequestBody FsStoreOrderParam param)
-    {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-        TableDataInfo dataTable = getDataTable(list);
-        if (CloudHostUtils.hasCloudHostName("康年堂")) {
-            dataTable.setMsg("knt");
-        }
-        if (list != null) {
-            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderVO vo : list) {
-                if (vo.getPhone() != null) {
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (ObjectUtil.isNotEmpty(vo.getUserPhone())) {
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (CloudHostUtils.hasCloudHostName("康年堂")) {
-                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
-                    if (df != null) {
-                        vo.setErpAccount(df.getLoginAccount());
-                    }
-                }
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance")) || loginUser.getPermissions().contains("*:*:*") && (vo.getCost() != null && vo.getTotalNum() != null)) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setPayDelivery(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
-        BeanUtils.copyProperties(dataTable, vo);
-        if (dataTable.getTotal() > 0) {
-            Map<String, BigDecimal> statistics = fsStoreOrderService.selectFsStoreOrderStatistics(param);
-            if (statistics != null && statistics.size() >= 3) {
-                vo.setPayPriceTotal(statistics.get("pay_price").toString());
-                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
-                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
-            } else {
-                vo.setPayPriceTotal("0");
-                vo.setPayMoneyTotal("0");
-                vo.setPayRemainTotal("0");
-            }
-            String productStatistics = fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
-            if (StringUtils.isNotBlank(productStatistics)) {
-                vo.setProductInfo(productStatistics);
-            } else {
-                vo.setProductInfo("");
-            }
-        }
-        return vo;
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:payRemainList')")
-    @GetMapping("/payRemainList")
-    public TableDataInfo payRemainList(FsStoreOrderParam param)
-    {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        List<FsStoreOrderVO> list = fsStoreOrderService.selectPayRemainListVO(param);
-        if (list != null) {
-            for (FsStoreOrderVO vo : list) {
-                if (vo.getPhone() != null) {
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-            }
-        }
-        return getDataTable(list);
-    }
-
-    @Log(title = "付尾款订单", businessType = BusinessType.EXPORT)
-    @GetMapping("/payRemainExport")
-    public AjaxResult payRemainExport(FsStoreOrderParam param)
-    {
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        List<FsStorePayRemainOrderExportVO> list = fsStoreOrderService.selectFsStorePayRemainOrderListVOByExport(param);
-        if (list != null) {
-            for (FsStorePayRemainOrderExportVO vo : list) {
-                if (vo.getPhone() != null) {
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (vo.getUserPhone() != null) {
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (vo.getUserAddress() != null) {
-                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
-                }
-            }
-        }
-        ExcelUtil<FsStorePayRemainOrderExportVO> util = new ExcelUtil<FsStorePayRemainOrderExportVO>(FsStorePayRemainOrderExportVO.class);
-        return util.exportExcel(list, "付尾款订单数据");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:export')")
-    @Log(title = "订单", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public AjaxResult export(@RequestBody FsStoreOrderParam param)
-    {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)) {
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderErpExportVO> list = fsStoreOrderService.selectFsStoreOrderListVOByExport(param);
-        if (list != null) {
-            SysRole sysRole = isCheckPermission();
-            for (FsStoreOrderErpExportVO vo : list) {
-                if (vo.getPhone() != null && sysRole.getIsCheckPhone() != 1) {
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (vo.getUserAddress() != null && sysRole.getIsCheckAddress() != 1) {
-                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
-                }
-                String orderItem = orderItemService.selectFsStoreOrderItemByOrderId(vo.getId());
-                vo.setOrderItem(orderItem);
-            }
-        }
-        String filter = param.getFilter();
-        ArrayList<String> filterList = new ArrayList<>();
-        if (StringUtils.isNotBlank(filter)) {
-            String[] filterArr = filter.split("\\s*,\\s*");
-            filterList.addAll(Arrays.asList(filterArr));
-        }
-        ExcelUtil<FsStoreOrderErpExportVO> util = new ExcelUtil<FsStoreOrderErpExportVO>(FsStoreOrderErpExportVO.class);
-        if (filter != null && !filter.isEmpty()) {
-            return util.exportExcelSelectedColumns(list, "订单数据", filterList);
-        } else {
-            return util.exportExcel(list, "订单数据");
-        }
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:export:details')")
-    @Log(title = "订单", businessType = BusinessType.EXPORT)
-    @PostMapping("/exportDetails")
-    public AjaxResult exportDetails(@RequestBody FsStoreOrderParam param)
-    {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)) {
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderErpExportVO> list = fsStoreOrderService.selectFsStoreOrderListVOByExport(param);
-        String filter = param.getFilter();
-        ArrayList<String> filterList = new ArrayList<>();
-        if (StringUtils.isNotBlank(filter)) {
-            String[] filterArr = filter.split("\\s*,\\s*");
-            filterList.addAll(Arrays.asList(filterArr));
-        }
-        ExcelUtil<FsStoreOrderErpExportVO> util = new ExcelUtil<FsStoreOrderErpExportVO>(FsStoreOrderErpExportVO.class);
-        if (filter != null && !filter.isEmpty()) {
-            return util.exportExcelSelectedColumns(list, "订单数据", filterList);
-        } else {
-            return util.exportExcel(list, "订单数据");
-        }
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:exportItems')")
-    @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
-    @GetMapping("/exportItems")
-    public AjaxResult exportItems(FsStoreOrderParam param)
-    {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)) {
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        if (list != null) {
-            SysRole sysRole = isCheckPermission();
-            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
-                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
-                    vo.setUserPhone(phone);
-                }
-                if (vo.getUserAddress() != null && sysRole.getIsCheckAddress() != 1) {
-                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
-                }
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:exportItems:details')")
-    @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
-    @GetMapping("/exportItemsDetails")
-    public AjaxResult exportItemsDetails(FsStoreOrderParam param)
-    {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)) {
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        if ("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())) {
-            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
-                    .map(vo -> {
-                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
-                        try {
-                            BeanUtil.copyProperties(vo, zmvo);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                        return zmvo;
-                    })
-                    .collect(Collectors.toList());
-            if (zmvoList != null) {
-                LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-                for (FsStoreOrderItemExportZMVO vo : zmvoList) {
-                    if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                        try {
-                            StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                            BeanUtil.copyProperties(orderProductDTO, vo);
-                        } catch (Exception e) {
-                        }
-                    }
-                    if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
-                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                    } else {
-                        vo.setPayPostage(BigDecimal.ZERO);
-                        vo.setCost(BigDecimal.ZERO);
-                        vo.setFPrice(BigDecimal.ZERO);
-                        vo.setBarCode("");
-                        vo.setCateName("");
-                        vo.setBankTransactionId("");
-                    }
-                }
-            }
-            ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
-            return util.exportExcel(zmvoList, "订单明细数据");
-        }
-        if (list != null) {
-            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
-    }
-
-    @GetMapping("/orderItemsNum")
-    public R orderItemsNum(FsStoreOrderParam param)
-    {
-        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        Long orderItemsNum = orderItemService.countFsStoreOrderItemListExportVO(param);
-        return R.ok().put("orderItemsNum", "订单明细数目：" + orderItemsNum);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:query')")
-    @GetMapping(value = "/{id}")
-    public R getInfo(@PathVariable("id") Long id)
-    {
-        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
-        order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
-        order.setUserAddress(ParseUtils.parseAddress(order.getUserAddress()));
-        FsUser user = userService.selectFsUserById(order.getUserId());
-        if (user != null) {
-            user.setPhone(ParseUtils.parsePhone(user.getPhone()));
-        }
-        FsStoreOrderItemScrm itemMap = new FsStoreOrderItemScrm();
-        itemMap.setOrderId(order.getId());
-        List<FsStoreOrderItemScrm> items = orderItemService.selectFsStoreOrderItemList(itemMap);
-        FsStoreOrderStatusScrm statusMap = new FsStoreOrderStatusScrm();
-        statusMap.setOrderId(order.getId());
-        List<FsStoreOrderStatusScrm> logs = orderStatusService.selectFsStoreOrderStatusList(statusMap);
-        List<FsStorePaymentScrm> payments = paymentService.selectFsStorePaymentByOrderId(order.getId());
-        List<CompanyStoreOrderMoneyLogsVO> tuiMoneyLogs = new ArrayList<>();
-        if (order.getCompanyId() != null) {
-            CompanyStoreOrderMoneyLogsListParam moneyLogsMap = new CompanyStoreOrderMoneyLogsListParam();
-            moneyLogsMap.setCompanyId(order.getCompanyId());
-            moneyLogsMap.setBusinessId(order.getId().toString());
-            tuiMoneyLogs = moneyLogsService.selectCompanyStoreOrderMoneyLogsList(moneyLogsMap);
-        }
-        List<FsStoreOrderAuditLogVO> auditLogs = orderAuditLogService.selectStoreOrderAuditLogVOByOrderId(order.getId());
-        return R.ok().put("order", order).put("items", items).put("logs", logs).put("user", user).put("payments", payments).put("tuiMoneyLogs", tuiMoneyLogs)
-                .put("auditLogs", auditLogs);
-    }
-
-    @GetMapping(value = "/queryAddress/{id}")
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:queryAddress')")
-    public R getAddress(@PathVariable("id") Long id)
-    {
-        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
-        String address = order.getUserAddress();
-        return R.ok().put("address", address);
-    }
-
-    @GetMapping(value = "/queryPhone/{id}")
-    @Log(title = "查看电话", businessType = BusinessType.GRANT)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:queryPhone')")
-    public R getPhone(@PathVariable("id") Long id)
-    {
-        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
-        String userPhone = order.getUserPhone();
-        return R.ok().put("userPhone", userPhone);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:express')")
-    @GetMapping(value = "/getExpress/{id}")
-    public R getExpress(@PathVariable("id") Long id)
-    {
-        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
-        ExpressInfoDTO expressInfoDTO = null;
-        if (StringUtils.isNotEmpty(order.getDeliveryId())) {
-            String lastFourNumber = "";
-            if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue()) || order.getDeliverySn().equals(ShipperCodeEnum.ZTO.getValue())) {
-                lastFourNumber = order.getUserPhone();
-                if (lastFourNumber.length() == 11) {
-                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
-                }
-            }
-            expressInfoDTO = expressService.getExpressInfo(order.getOrderCode(), order.getDeliverySn(), order.getDeliveryId(), lastFourNumber);
-        }
-        return R.ok().put("data", expressInfoDTO);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:add')")
-    @Log(title = "订单", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreOrderScrm fsStoreOrder)
-    {
-        return toAjax(fsStoreOrderService.insertFsStoreOrder(fsStoreOrder));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:edit')")
-    @Log(title = "订单", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreOrderScrm fsStoreOrder)
-    {
-        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
-    }
-
-    @Log(title = "修改订单itemJson", businessType = BusinessType.UPDATE)
-    @GetMapping("/updateStoreOrderItemJson/{orderId}/{backendEditProductType}")
-    public AjaxResult updateStoreOrderItemJson(@PathVariable("orderId") Long orderId, @PathVariable("backendEditProductType") Integer backendEditProductType)
-    {
-        return toAjax(fsStoreOrderService.updateStoreOrderItemJson(orderId, backendEditProductType));
-    }
-
-    @Log(title = "修改物流", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:editDeliveryId')")
-    @PutMapping("/editDeliveryId")
-    public AjaxResult editDeliveryId(@RequestBody FsStoreOrderScrm fsStoreOrder)
-    {
-        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
-    }
-
-    @Log(title = "同步管易物流单号", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:updateErpOrder')")
-    @PostMapping("/updateErpOrder")
-    public R updateErpOrder(@Validated @RequestBody FsStoreOrderExpressEditParam param)
-    {
-        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(param.getOrderId());
-        FsErpConfig erpConfig = configUtil.getErpConfig();
-        List<Long> noErpCompany = erpConfig.getNoErpCompany();
-        if (noErpCompany.contains(order.getCompanyId())) {
-            logger.info("订单:{},相关公司不推送erp", order.getOrderCode());
-            return R.ok("订单:" + order.getOrderCode() + "相关公司不推送erp");
-        }
-        IErpOrderService erpOrderService = getErpService();
-        ErpOrderQueryRequert request = new ErpOrderQueryRequert();
-        request.setCode(order.getExtendOrderId());
-        ErpOrderQueryResponse response = erpOrderService.getScrmOrder(request);
-        if (response.getOrders() != null && response.getOrders().size() > 0) {
-            for (ErpOrderQuery orderQuery : response.getOrders()) {
-                if (orderQuery.getDeliverys() != null && orderQuery.getDeliverys().size() > 0) {
-                    for (ErpDeliverys delivery : orderQuery.getDeliverys()) {
-                        if (delivery.getDelivery() && StringUtils.isNotEmpty(delivery.getMail_no())) {
-                            fsStoreOrderService.updateDeliveryOrder(param.getOrderId(), delivery.getMail_no(), delivery.getExpress_code(), delivery.getExpress_name());
-                            return R.ok();
-                        }
-                    }
-                }
-            }
-        }
-        return R.error("未查询到快递信息");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:remove')")
-    @Log(title = "订单", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreOrderService.deleteFsStoreOrderByIds(ids));
-    }
-
-    @PostMapping("/createUserOrder")
-    public R createUserOrder(@Validated @RequestBody FsStoreOrderCreateUserParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.createUserOrder(param);
-    }
-
-    @Log(title = "确认订单", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:finishOrder')")
-    @PostMapping("/finishOrder")
-    public R finishOrder(@Validated @RequestBody FsStoreOrderFinishParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.finishOrder(param.getOrderId());
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:auditPayRemain')")
-    @PostMapping("/auditPayRemain")
-    public R auditPayRemain(@Validated @RequestBody FsStoreOrderAuditPayRemainParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.auditPayRemain(param.getOrderId());
-    }
-
-    @Log(title = "导入", businessType = BusinessType.IMPORT)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:importExpress')")
-    @PostMapping("/importExpress")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        ExcelUtil<StoreOrderExpressExportDTO> util = new ExcelUtil<StoreOrderExpressExportDTO>(StoreOrderExpressExportDTO.class);
-        List<StoreOrderExpressExportDTO> list = util.importExcel(file.getInputStream());
-        String message = fsStoreOrderService.importExpress(list, updateSupport);
-        return AjaxResult.success(message);
-    }
-
-    @GetMapping("/importTemplate")
-    public AjaxResult importTemplate()
-    {
-        ExcelUtil<StoreOrderExpressExportDTO> util = new ExcelUtil<StoreOrderExpressExportDTO>(StoreOrderExpressExportDTO.class);
-        return util.importTemplateExcel("物流回单数据");
-    }
-
-    @GetMapping("/getStoreOrder")
-    public R getStoreOrder(@RequestParam("orderCode") String orderCode)
-    {
-        FsStoreOrderVO vo = fsStoreOrderService.selectFsStoreOrderVOByOrderCode(orderCode);
-        return R.ok().put("data", vo);
-    }
-
-    @Log(title = "冻结、解冻佣金", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:editTuiMoney')")
-    @PostMapping("/editTuiMoney")
-    public R editTuiMoney(@Validated @RequestBody FsStoreOrderEditTuiMoneyParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.editTuiMoney(param);
-    }
-
-    @Log(title = "退款", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:refundOrderMoney')")
-    @PostMapping("/refundOrderMoney")
-    public synchronized R refundOrderMoney(@Validated @RequestBody FsStoreOrderRefundParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.refundOrderMoney(param.getOrderId());
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:getEroOrder')")
-    @GetMapping("/getEroOrder")
-    public R getEroOrder(@RequestParam("extendOrderId") String extendOrderId)
-    {
-        IErpOrderService erpOrderService = getErpService();
-        ErpOrderQueryRequert request = new ErpOrderQueryRequert();
-        request.setCode(extendOrderId);
-        ErpOrderQueryResponse response = erpOrderService.getScrmOrder(request);
-        return R.ok().put("data", response);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:updateExpress')")
-    @PostMapping("/updateExpress")
-    public R updateExpress(@Validated @RequestBody FsStoreOrderExpressEditParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.updateExpress(param);
-    }
-
-    @Log(title = "同步物流", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:syncExpress')")
-    @PostMapping("/syncExpress")
-    public R syncExpress(@Validated @RequestBody FsStoreOrderExpressEditParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.syncExpress(param);
-    }
-
-    @Log(title = "分佣", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:addTuiMoney')")
-    @PostMapping("/addTuiMoney")
-    public R addTuiMoney(@Validated @RequestBody FsStoreOrderAddTuiMoneyParam param, HttpServletRequest request)
-    {
-        return fsStoreOrderService.addTuiMoney(param);
-    }
-
-    @GetMapping("/getCustomerOrderList")
-    public TableDataInfo getCustomerOrderList(FsStoreOrderParam param)
-    {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsCustomerStoreOrderListVO(param);
-        if (list != null) {
-            for (FsStoreOrderVO vo : list) {
-                if (vo.getPhone() != null) {
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2"));
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2"));
-                }
-            }
-        }
-        return getDataTable(list);
-    }
-
-    @Log(title = "手动推管易", businessType = BusinessType.INSERT)
-    @ApiOperation("创建ERP订单")
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:createErpOrder')")
-    @GetMapping("/createErpOrder")
-    public R createErpOrder(@RequestParam("orderCode") String orderCode) throws Exception
-    {
-        logger.info("手动推管易订单号：{}", orderCode);
-        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderByOrderCode(orderCode);
-        return fsStoreOrderService.createOmsOrder(order.getId());
-    }
-
-    @GetMapping("/orderDimensionStatisticsList")
-    public TableDataInfo orderDimensionStatisticsList(OrderStatisticsParam param)
-    {
-        if ("广州郑多燕".equals(cloudHostProper.getCompanyName())) {
-            return getDataTable(fsStoreOrderService.selectZDYOrderSaleStatisticsList(param));
-        }
-        return getDataTable(fsStoreOrderService.selectOrderDimensionStatisticsList(param));
-    }
-
-    @Log(title = "订单维度统计", businessType = BusinessType.EXPORT)
-    @GetMapping("/orderDimensionStatisticsExport")
-    public AjaxResult orderDimensionStatisticsExport(OrderStatisticsParam param)
-    {
-        List<OrderStatisticsVo> list = fsStoreOrderService.selectOrderDimensionStatisticsList(param);
-        ExcelUtil<OrderStatisticsVo> util = new ExcelUtil<>(OrderStatisticsVo.class);
-        return util.exportExcel(list, "订单员工维度统计");
-    }
-
-    @GetMapping(value = "/queryErpPhone")
-    public AjaxResult queryErpPhone()
-    {
-        SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("erp.phone");
-        List<String> list = new ArrayList<>();
-        if (sysConfig != null) {
-            String configValue = sysConfig.getConfigValue();
-            if (StringUtils.isNotEmpty(configValue)) {
-                list = JSON.parseArray(configValue, String.class);
-            }
-        }
-        return AjaxResult.success(list);
-    }
-
-    @PostMapping(value = "/saveErpPhone")
-    public AjaxResult saveErpPhone(@RequestBody List<String> phoneList)
-    {
-        phoneList = phoneList.stream().distinct().collect(Collectors.toList());
-        SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("erp.phone");
-        sysConfig.setConfigValue(JSON.toJSONString(phoneList));
-        return AjaxResult.success(sysConfigMapper.updateConfig(sysConfig));
-    }
-
-    @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
-    @Log(title = "订单", businessType = BusinessType.UPDATE)
-    @PostMapping("/editErpPhone")
-    public AjaxResult editErpPhone(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
-    {
-        param.setOpeName(SecurityUtils.getLoginUser().getUser().getNickName());
-        List<String> erpPhone = param.getErpPhone();
-        if (erpPhone == null || erpPhone.isEmpty()) {
-            return AjaxResult.error("请选择手机号");
-        }
-        return toAjax(fsStoreOrderService.batchUpdateErpByOrderIds(param));
-    }
-
-    @GetMapping("/getErpAccount")
-    public R getErpAccount()
-    {
-        List<String> list = new ArrayList<>();
-        if (CloudHostUtils.hasCloudHostName("金牛明医", "康年堂")) {
-            List<FsDfAccount> erpAccounts = fsDfAccountService.selectFsDfAccountList(null);
-            list = erpAccounts.stream().map(FsDfAccount::getLoginAccount).collect(Collectors.toList());
-        }
-        return R.ok().put("data", list);
-    }
-
-    @Log(title = "手动推管易", businessType = BusinessType.INSERT)
-    @ApiOperation("批量创建ERP订单")
-    @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
-    @PostMapping(value = "/batchCreateErpOrder")
-    public R batchCreateErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
-    {
-        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
-        String loginAccount = param.getLoginAccount();
-        if (StringUtils.isBlank(loginAccount)) {
-            return R.error("未选择推送erp账户");
-        }
-        FsStoreOrderDf df = getDFInfo(loginAccount);
-        if (df.getLoginAccount() == null) {
-            return R.error("未查询到所选erp账户");
-        }
-        List<Long> orderIds = param.getOrderIds();
-        if (orderIds == null || orderIds.isEmpty()) {
-            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-                param.setPayTimeList(param.getPayTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-            }
-            param.setNotHealth(1);
-            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
-        }
-        if (orderIds.isEmpty()) {
-            return R.ok();
-        }
-        orderIds.forEach(orderId -> {
-            try {
-                df.setOrderId(orderId);
-                FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
-                if (temp == null) {
-                    df.setParcelQuantity(param.getParcelQuantity());
-                    fsStoreOrderDfService.insertFsStoreOrderDf(df);
-                    fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
-                            nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
-                }
-                fsStoreOrderService.createOmsOrder(orderId);
-                fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.PUSH_ORDER_ERP.getValue(),
-                        nickName + " " + FsStoreOrderLogEnum.PUSH_ORDER_ERP.getDesc() + ":" + df.getLoginAccount());
-            } catch (ParseException e) {
-                throw new RuntimeException(e);
-            }
-        });
-        return R.ok();
-    }
-
-    @ApiOperation("批量设置订单账户")
-    @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
-    @PostMapping(value = "/batchSetErpOrder")
-    public R batchSetErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
-    {
-        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
-        String loginAccount = param.getLoginAccount();
-        if (StringUtils.isBlank(loginAccount)) {
-            return R.error("未选择erp账户");
-        }
-        FsStoreOrderDf df = getDFInfo(loginAccount);
-        if (df.getLoginAccount() == null) {
-            return R.error("未查询到所选erp账户");
-        }
-        List<Long> orderIds = param.getOrderIds();
-        if (orderIds == null || orderIds.isEmpty()) {
-            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
-                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
-                param.setPayTimeList(param.getPayTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
-                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-            }
-            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
-                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-            }
-            param.setNotHealth(1);
-            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
-        }
-        if (orderIds.isEmpty()) {
-            return R.ok();
-        }
-        orderIds.forEach(orderId -> {
-            df.setOrderId(orderId);
-            FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
-            df.setParcelQuantity(param.getParcelQuantity());
-            if (temp != null) {
-                df.setUpdateTime(new Date());
-                fsStoreOrderDfService.updateFsStoreOrderDf(df);
-            } else {
-                fsStoreOrderDfService.insertFsStoreOrderDf(df);
-            }
-            fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
-                    nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
-        });
-        return R.ok();
-    }
-
-    @ApiOperation("批量审核订单")
-    @Log(title = "订单管理", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:batchAudit')")
-    @PostMapping("/batchAudit")
-    public R batchAuditOrder(@Validated @RequestBody FsStoreOrderBatchAuditParam param)
-    {
-        if (param.getOrderIds() == null || param.getOrderIds().isEmpty()) {
-            return R.error("订单ID列表不能为空");
-        }
-        if (param.getIsAudit() == null) {
-            return R.error("审核状态不能为空");
-        }
-        int count = fsStoreOrderService.batchAuditOrder(param);
-        return R.ok("成功审核 " + count + " 条订单");
-    }
-
-    @ApiOperation("订单备注")
-    @Log(title = "订单管理", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('store:storeOrder:remark')")
-    @PostMapping("/remark")
-    public R remark(@Validated @RequestBody FsStoreOrderScrm param)
-    {
-        if (param.getId() == null || param.getId() < 1) {
-            return R.error("订单ID错误");
-        }
-        if (StringUtils.isEmpty(param.getOrderRemark())) {
-            return R.error("订单备注不能为空");
-        }
-        return fsStoreOrderService.orderRemark(param);
-    }
-
-    private SysRole isCheckPermission()
-    {
-        SysRole sysRole = new SysRole();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        boolean flag = user.isAdmin();
-        if (flag) {
-            sysRole.setIsCheckPhone(1);
-            sysRole.setIsCheckAddress(1);
-        } else {
-            List<SysRole> roles = user.getRoles();
-            if (roles != null && !roles.isEmpty()) {
-                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
-                return sysRoleService.getIsCheckPermission(roleIds);
-            }
-        }
-        return sysRole;
-    }
-
-    private FsStoreOrderDf getDFInfo(String loginAccount)
-    {
-        List<FsDfAccount> erpAccounts = fsDfAccountService.selectFsDfAccountList(null);
-        FsStoreOrderDf df = new FsStoreOrderDf();
-        for (FsDfAccount erpAccount : erpAccounts) {
-            if (loginAccount.equals(erpAccount.getLoginAccount())) {
-                df.setAppKey(erpAccount.getDfAppKey());
-                df.setAppSecret(erpAccount.getDfAppsecret());
-                df.setLoginAccount(loginAccount);
-                df.setMonthlyCard(erpAccount.getMonthlyCard());
-                df.setExpressProductCode(erpAccount.getExpressProductCode());
-                df.setStatus(0);
-                break;
-            }
-        }
-        return df;
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import cn.hutool.core.bean.BeanUtil;
+//import cn.hutool.core.util.ObjectUtil;
+//import cn.hutool.core.util.StrUtil;
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONObject;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.domain.entity.SysRole;
+//import com.fs.common.core.domain.entity.SysUser;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.CloudHostUtils;
+//import com.fs.common.utils.ParseUtils;
+//import com.fs.common.utils.ServletUtils;
+//import com.fs.common.utils.StringUtils;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.company.param.CompanyStoreOrderMoneyLogsListParam;
+//import com.fs.company.service.ICompanyMoneyLogsService;
+//import com.fs.company.vo.CompanyStoreOrderMoneyLogsVO;
+//import com.fs.config.cloud.CloudHostProper;
+//import com.fs.erp.domain.ErpDeliverys;
+//import com.fs.erp.domain.ErpOrderQuery;
+//import com.fs.erp.dto.ErpOrderQueryRequert;
+//import com.fs.erp.dto.ErpOrderQueryResponse;
+//import com.fs.erp.dto.df.DFConfigVo;
+//import com.fs.erp.service.IErpOrderService;
+//import com.fs.framework.security.LoginUser;
+//import com.fs.framework.security.SecurityUtils;
+//import com.fs.framework.service.TokenService;
+//import com.fs.his.domain.FsDfAccount;
+//import com.fs.his.domain.FsStoreOrderDf;
+//import com.fs.his.domain.FsUser;
+//import com.fs.his.enums.FsStoreOrderLogEnum;
+//import com.fs.his.param.FsStoreOrderSetErpPhoneParam;
+//import com.fs.his.service.IFsDfAccountService;
+//import com.fs.his.service.IFsExpressService;
+//import com.fs.his.service.IFsStoreOrderDfService;
+//import com.fs.his.service.IFsUserService;
+//import com.fs.his.utils.ConfigUtil;
+//import com.fs.his.vo.FsStoreOrderListAndStatisticsVo;
+//import com.fs.his.vo.FsStoreOrderListVO;
+//import com.fs.hisStore.config.FsErpConfig;
+//import com.fs.hisStore.domain.FsStoreOrderItemScrm;
+//import com.fs.hisStore.domain.FsStoreOrderScrm;
+//import com.fs.hisStore.domain.FsStoreOrderStatusScrm;
+//import com.fs.hisStore.domain.FsStorePaymentScrm;
+//import com.fs.his.dto.ExpressInfoDTO;
+//import com.fs.hisStore.dto.StoreOrderExpressExportDTO;
+//import com.fs.hisStore.dto.StoreOrderProductDTO;
+//import com.fs.hisStore.enums.ShipperCodeEnum;
+//import com.fs.hisStore.param.*;
+//import com.fs.hisStore.service.*;
+//import com.fs.hisStore.vo.*;
+//import com.fs.system.domain.SysConfig;
+//import com.fs.system.mapper.SysConfigMapper;
+//import com.fs.system.service.ISysRoleService;
+//import com.github.pagehelper.PageHelper;
+//import io.swagger.annotations.ApiOperation;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.validation.annotation.Validated;
+//import org.springframework.web.bind.annotation.*;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import java.math.BigDecimal;
+//import java.text.ParseException;
+//import java.util.*;
+//import java.util.stream.Collectors;
+//
+///**
+// * 订单 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreOrderScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeOrder")
+//public class FsStoreOrderScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsExpressService expressService;
+//    @Autowired
+//    private IFsStoreOrderScrmService fsStoreOrderService;
+//    @Autowired
+//    private IFsStoreOrderItemScrmService orderItemService;
+//    @Autowired
+//    private IFsUserService userService;
+//    @Autowired
+//    private IFsStoreOrderStatusScrmService orderStatusService;
+//    @Autowired
+//    IFsStorePaymentScrmService paymentService;
+//    @Autowired
+//    private CloudHostProper cloudHostProper;
+//    @Autowired
+//    private ICompanyMoneyLogsService moneyLogsService;
+//    @Autowired
+//    @Qualifier("erpOrderServiceImpl")
+//    private IErpOrderService gyOrderService;
+//    @Autowired
+//    @Qualifier("wdtErpOrderServiceImpl")
+//    private IErpOrderService wdtOrderService;
+//    @Autowired
+//    @Qualifier("hzOMSErpOrderServiceImpl")
+//    private IErpOrderService hzOMSErpOrderService;
+//    @Autowired
+//    @Qualifier("dfOrderServiceImpl")
+//    private IErpOrderService dfOrderService;
+//    @Autowired
+//    @Qualifier("k9OrderScrmServiceImpl")
+//    private IErpOrderService k9OrderService;
+//    @Autowired
+//    @Qualifier("JSTErpOrderServiceImpl")
+//    private IErpOrderService jSTOrderService;
+//    @Autowired
+//    private ConfigUtil configUtil;
+//    @Autowired
+//    private IFsStoreOrderAuditLogScrmService orderAuditLogService;
+//    @Autowired
+//    private TokenService tokenService;
+//    @Autowired
+//    SysConfigMapper sysConfigMapper;
+//    @Autowired
+//    private IFsDfAccountService fsDfAccountService;
+//    @Autowired
+//    private IFsStoreOrderDfService fsStoreOrderDfService;
+//    @Autowired
+//    private IFsStoreOrderLogsScrmService fsStoreOrderLogsService;
+//    @Autowired
+//    private ISysRoleService sysRoleService;
+//
+//    private IErpOrderService getErpService()
+//    {
+//        IErpOrderService erpOrderService = null;
+//        FsErpConfig erpConfig = configUtil.getErpConfig();
+//        Integer erpOpen = erpConfig.getErpOpen();
+//        if (erpOpen != null && erpOpen == 1) {
+//            Integer erpType = erpConfig.getErpType();
+//            if (erpType != null) {
+//                if (erpType == 1) {
+//                    erpOrderService = gyOrderService;
+//                } else if (erpType == 2) {
+//                    erpOrderService = wdtOrderService;
+//                } else if (erpType == 3) {
+//                    erpOrderService = hzOMSErpOrderService;
+//                } else if (erpType == 4) {
+//                    erpOrderService = dfOrderService;
+//                } else if (erpType == 5) {
+//                    erpOrderService = jSTOrderService;
+//                } else if (erpType == 6) {
+//                    erpOrderService = k9OrderService;
+//                }
+//            }
+//        }
+//        return erpOrderService;
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:list')")
+//    @PostMapping("/list")
+//    public TableDataInfo list(@RequestBody FsStoreOrderParam param)
+//    {
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//        TableDataInfo dataTable = getDataTable(list);
+//        if (CloudHostUtils.hasCloudHostName("康年堂")) {
+//            dataTable.setMsg("knt");
+//        }
+//        if (list != null) {
+//            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderVO vo : list) {
+//                if (vo.getPhone() != null) {
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (ObjectUtil.isNotEmpty(vo.getUserPhone())) {
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (CloudHostUtils.hasCloudHostName("康年堂")) {
+//                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
+//                    if (df != null) {
+//                        vo.setErpAccount(df.getLoginAccount());
+//                    }
+//                }
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance")) || loginUser.getPermissions().contains("*:*:*") && (vo.getCost() != null && vo.getTotalNum() != null)) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setPayDelivery(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
+//        BeanUtils.copyProperties(dataTable, vo);
+//        if (dataTable.getTotal() > 0) {
+//            Map<String, BigDecimal> statistics = fsStoreOrderService.selectFsStoreOrderStatistics(param);
+//            if (statistics != null && statistics.size() >= 3) {
+//                vo.setPayPriceTotal(statistics.get("pay_price").toString());
+//                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
+//                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
+//            } else {
+//                vo.setPayPriceTotal("0");
+//                vo.setPayMoneyTotal("0");
+//                vo.setPayRemainTotal("0");
+//            }
+//            String productStatistics = fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
+//            if (StringUtils.isNotBlank(productStatistics)) {
+//                vo.setProductInfo(productStatistics);
+//            } else {
+//                vo.setProductInfo("");
+//            }
+//        }
+//        return vo;
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:payRemainList')")
+//    @GetMapping("/payRemainList")
+//    public TableDataInfo payRemainList(FsStoreOrderParam param)
+//    {
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        List<FsStoreOrderVO> list = fsStoreOrderService.selectPayRemainListVO(param);
+//        if (list != null) {
+//            for (FsStoreOrderVO vo : list) {
+//                if (vo.getPhone() != null) {
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//            }
+//        }
+//        return getDataTable(list);
+//    }
+//
+//    @Log(title = "付尾款订单", businessType = BusinessType.EXPORT)
+//    @GetMapping("/payRemainExport")
+//    public AjaxResult payRemainExport(FsStoreOrderParam param)
+//    {
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        List<FsStorePayRemainOrderExportVO> list = fsStoreOrderService.selectFsStorePayRemainOrderListVOByExport(param);
+//        if (list != null) {
+//            for (FsStorePayRemainOrderExportVO vo : list) {
+//                if (vo.getPhone() != null) {
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (vo.getUserPhone() != null) {
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (vo.getUserAddress() != null) {
+//                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStorePayRemainOrderExportVO> util = new ExcelUtil<FsStorePayRemainOrderExportVO>(FsStorePayRemainOrderExportVO.class);
+//        return util.exportExcel(list, "付尾款订单数据");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:export')")
+//    @Log(title = "订单", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public AjaxResult export(@RequestBody FsStoreOrderParam param)
+//    {
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)) {
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderErpExportVO> list = fsStoreOrderService.selectFsStoreOrderListVOByExport(param);
+//        if (list != null) {
+//            SysRole sysRole = isCheckPermission();
+//            for (FsStoreOrderErpExportVO vo : list) {
+//                if (vo.getPhone() != null && sysRole.getIsCheckPhone() != 1) {
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (vo.getUserAddress() != null && sysRole.getIsCheckAddress() != 1) {
+//                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
+//                }
+//                String orderItem = orderItemService.selectFsStoreOrderItemByOrderId(vo.getId());
+//                vo.setOrderItem(orderItem);
+//            }
+//        }
+//        String filter = param.getFilter();
+//        ArrayList<String> filterList = new ArrayList<>();
+//        if (StringUtils.isNotBlank(filter)) {
+//            String[] filterArr = filter.split("\\s*,\\s*");
+//            filterList.addAll(Arrays.asList(filterArr));
+//        }
+//        ExcelUtil<FsStoreOrderErpExportVO> util = new ExcelUtil<FsStoreOrderErpExportVO>(FsStoreOrderErpExportVO.class);
+//        if (filter != null && !filter.isEmpty()) {
+//            return util.exportExcelSelectedColumns(list, "订单数据", filterList);
+//        } else {
+//            return util.exportExcel(list, "订单数据");
+//        }
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:export:details')")
+//    @Log(title = "订单", businessType = BusinessType.EXPORT)
+//    @PostMapping("/exportDetails")
+//    public AjaxResult exportDetails(@RequestBody FsStoreOrderParam param)
+//    {
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)) {
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderErpExportVO> list = fsStoreOrderService.selectFsStoreOrderListVOByExport(param);
+//        String filter = param.getFilter();
+//        ArrayList<String> filterList = new ArrayList<>();
+//        if (StringUtils.isNotBlank(filter)) {
+//            String[] filterArr = filter.split("\\s*,\\s*");
+//            filterList.addAll(Arrays.asList(filterArr));
+//        }
+//        ExcelUtil<FsStoreOrderErpExportVO> util = new ExcelUtil<FsStoreOrderErpExportVO>(FsStoreOrderErpExportVO.class);
+//        if (filter != null && !filter.isEmpty()) {
+//            return util.exportExcelSelectedColumns(list, "订单数据", filterList);
+//        } else {
+//            return util.exportExcel(list, "订单数据");
+//        }
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:exportItems')")
+//    @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
+//    @GetMapping("/exportItems")
+//    public AjaxResult exportItems(FsStoreOrderParam param)
+//    {
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)) {
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        if (list != null) {
+//            SysRole sysRole = isCheckPermission();
+//            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
+//                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
+//                    vo.setUserPhone(phone);
+//                }
+//                if (vo.getUserAddress() != null && sysRole.getIsCheckAddress() != 1) {
+//                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
+//                }
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:exportItems:details')")
+//    @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
+//    @GetMapping("/exportItemsDetails")
+//    public AjaxResult exportItemsDetails(FsStoreOrderParam param)
+//    {
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())) {
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)) {
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        if ("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())) {
+//            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
+//                    .map(vo -> {
+//                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
+//                        try {
+//                            BeanUtil.copyProperties(vo, zmvo);
+//                        } catch (Exception e) {
+//                            e.printStackTrace();
+//                        }
+//                        return zmvo;
+//                    })
+//                    .collect(Collectors.toList());
+//            if (zmvoList != null) {
+//                LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//                for (FsStoreOrderItemExportZMVO vo : zmvoList) {
+//                    if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                        try {
+//                            StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                            BeanUtil.copyProperties(orderProductDTO, vo);
+//                        } catch (Exception e) {
+//                        }
+//                    }
+//                    if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
+//                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                    } else {
+//                        vo.setPayPostage(BigDecimal.ZERO);
+//                        vo.setCost(BigDecimal.ZERO);
+//                        vo.setFPrice(BigDecimal.ZERO);
+//                        vo.setBarCode("");
+//                        vo.setCateName("");
+//                        vo.setBankTransactionId("");
+//                    }
+//                }
+//            }
+//            ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
+//            return util.exportExcel(zmvoList, "订单明细数据");
+//        }
+//        if (list != null) {
+//            LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*")) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+//    }
+//
+//    @GetMapping("/orderItemsNum")
+//    public R orderItemsNum(FsStoreOrderParam param)
+//    {
+//        if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        Long orderItemsNum = orderItemService.countFsStoreOrderItemListExportVO(param);
+//        return R.ok().put("orderItemsNum", "订单明细数目：" + orderItemsNum);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:query')")
+//    @GetMapping(value = "/{id}")
+//    public R getInfo(@PathVariable("id") Long id)
+//    {
+//        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
+//        order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));
+//        order.setUserAddress(ParseUtils.parseAddress(order.getUserAddress()));
+//        FsUser user = userService.selectFsUserById(order.getUserId());
+//        if (user != null) {
+//            user.setPhone(ParseUtils.parsePhone(user.getPhone()));
+//        }
+//        FsStoreOrderItemScrm itemMap = new FsStoreOrderItemScrm();
+//        itemMap.setOrderId(order.getId());
+//        List<FsStoreOrderItemScrm> items = orderItemService.selectFsStoreOrderItemList(itemMap);
+//        FsStoreOrderStatusScrm statusMap = new FsStoreOrderStatusScrm();
+//        statusMap.setOrderId(order.getId());
+//        List<FsStoreOrderStatusScrm> logs = orderStatusService.selectFsStoreOrderStatusList(statusMap);
+//        List<FsStorePaymentScrm> payments = paymentService.selectFsStorePaymentByOrderId(order.getId());
+//        List<CompanyStoreOrderMoneyLogsVO> tuiMoneyLogs = new ArrayList<>();
+//        if (order.getCompanyId() != null) {
+//            CompanyStoreOrderMoneyLogsListParam moneyLogsMap = new CompanyStoreOrderMoneyLogsListParam();
+//            moneyLogsMap.setCompanyId(order.getCompanyId());
+//            moneyLogsMap.setBusinessId(order.getId().toString());
+//            tuiMoneyLogs = moneyLogsService.selectCompanyStoreOrderMoneyLogsList(moneyLogsMap);
+//        }
+//        List<FsStoreOrderAuditLogVO> auditLogs = orderAuditLogService.selectStoreOrderAuditLogVOByOrderId(order.getId());
+//        return R.ok().put("order", order).put("items", items).put("logs", logs).put("user", user).put("payments", payments).put("tuiMoneyLogs", tuiMoneyLogs)
+//                .put("auditLogs", auditLogs);
+//    }
+//
+//    @GetMapping(value = "/queryAddress/{id}")
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:queryAddress')")
+//    public R getAddress(@PathVariable("id") Long id)
+//    {
+//        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
+//        String address = order.getUserAddress();
+//        return R.ok().put("address", address);
+//    }
+//
+//    @GetMapping(value = "/queryPhone/{id}")
+//    @Log(title = "查看电话", businessType = BusinessType.GRANT)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:queryPhone')")
+//    public R getPhone(@PathVariable("id") Long id)
+//    {
+//        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
+//        String userPhone = order.getUserPhone();
+//        return R.ok().put("userPhone", userPhone);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:express')")
+//    @GetMapping(value = "/getExpress/{id}")
+//    public R getExpress(@PathVariable("id") Long id)
+//    {
+//        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(id);
+//        ExpressInfoDTO expressInfoDTO = null;
+//        if (StringUtils.isNotEmpty(order.getDeliveryId())) {
+//            String lastFourNumber = "";
+//            if (order.getDeliverySn().equals(ShipperCodeEnum.SF.getValue()) || order.getDeliverySn().equals(ShipperCodeEnum.ZTO.getValue())) {
+//                lastFourNumber = order.getUserPhone();
+//                if (lastFourNumber.length() == 11) {
+//                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
+//                }
+//            }
+//            expressInfoDTO = expressService.getExpressInfo(order.getOrderCode(), order.getDeliverySn(), order.getDeliveryId(), lastFourNumber);
+//        }
+//        return R.ok().put("data", expressInfoDTO);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:add')")
+//    @Log(title = "订单", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreOrderScrm fsStoreOrder)
+//    {
+//        return toAjax(fsStoreOrderService.insertFsStoreOrder(fsStoreOrder));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:edit')")
+//    @Log(title = "订单", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreOrderScrm fsStoreOrder)
+//    {
+//        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
+//    }
+//
+//    @Log(title = "修改订单itemJson", businessType = BusinessType.UPDATE)
+//    @GetMapping("/updateStoreOrderItemJson/{orderId}/{backendEditProductType}")
+//    public AjaxResult updateStoreOrderItemJson(@PathVariable("orderId") Long orderId, @PathVariable("backendEditProductType") Integer backendEditProductType)
+//    {
+//        return toAjax(fsStoreOrderService.updateStoreOrderItemJson(orderId, backendEditProductType));
+//    }
+//
+//    @Log(title = "修改物流", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:editDeliveryId')")
+//    @PutMapping("/editDeliveryId")
+//    public AjaxResult editDeliveryId(@RequestBody FsStoreOrderScrm fsStoreOrder)
+//    {
+//        return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
+//    }
+//
+//    @Log(title = "同步管易物流单号", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:updateErpOrder')")
+//    @PostMapping("/updateErpOrder")
+//    public R updateErpOrder(@Validated @RequestBody FsStoreOrderExpressEditParam param)
+//    {
+//        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderById(param.getOrderId());
+//        FsErpConfig erpConfig = configUtil.getErpConfig();
+//        List<Long> noErpCompany = erpConfig.getNoErpCompany();
+//        if (noErpCompany.contains(order.getCompanyId())) {
+//            logger.info("订单:{},相关公司不推送erp", order.getOrderCode());
+//            return R.ok("订单:" + order.getOrderCode() + "相关公司不推送erp");
+//        }
+//        IErpOrderService erpOrderService = getErpService();
+//        ErpOrderQueryRequert request = new ErpOrderQueryRequert();
+//        request.setCode(order.getExtendOrderId());
+//        ErpOrderQueryResponse response = erpOrderService.getScrmOrder(request);
+//        if (response.getOrders() != null && response.getOrders().size() > 0) {
+//            for (ErpOrderQuery orderQuery : response.getOrders()) {
+//                if (orderQuery.getDeliverys() != null && orderQuery.getDeliverys().size() > 0) {
+//                    for (ErpDeliverys delivery : orderQuery.getDeliverys()) {
+//                        if (delivery.getDelivery() && StringUtils.isNotEmpty(delivery.getMail_no())) {
+//                            fsStoreOrderService.updateDeliveryOrder(param.getOrderId(), delivery.getMail_no(), delivery.getExpress_code(), delivery.getExpress_name());
+//                            return R.ok();
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        return R.error("未查询到快递信息");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:remove')")
+//    @Log(title = "订单", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreOrderService.deleteFsStoreOrderByIds(ids));
+//    }
+//
+//    @PostMapping("/createUserOrder")
+//    public R createUserOrder(@Validated @RequestBody FsStoreOrderCreateUserParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.createUserOrder(param);
+//    }
+//
+//    @Log(title = "确认订单", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:finishOrder')")
+//    @PostMapping("/finishOrder")
+//    public R finishOrder(@Validated @RequestBody FsStoreOrderFinishParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.finishOrder(param.getOrderId());
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:auditPayRemain')")
+//    @PostMapping("/auditPayRemain")
+//    public R auditPayRemain(@Validated @RequestBody FsStoreOrderAuditPayRemainParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.auditPayRemain(param.getOrderId());
+//    }
+//
+//    @Log(title = "导入", businessType = BusinessType.IMPORT)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:importExpress')")
+//    @PostMapping("/importExpress")
+//    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+//    {
+//        ExcelUtil<StoreOrderExpressExportDTO> util = new ExcelUtil<StoreOrderExpressExportDTO>(StoreOrderExpressExportDTO.class);
+//        List<StoreOrderExpressExportDTO> list = util.importExcel(file.getInputStream());
+//        String message = fsStoreOrderService.importExpress(list, updateSupport);
+//        return AjaxResult.success(message);
+//    }
+//
+//    @GetMapping("/importTemplate")
+//    public AjaxResult importTemplate()
+//    {
+//        ExcelUtil<StoreOrderExpressExportDTO> util = new ExcelUtil<StoreOrderExpressExportDTO>(StoreOrderExpressExportDTO.class);
+//        return util.importTemplateExcel("物流回单数据");
+//    }
+//
+//    @GetMapping("/getStoreOrder")
+//    public R getStoreOrder(@RequestParam("orderCode") String orderCode)
+//    {
+//        FsStoreOrderVO vo = fsStoreOrderService.selectFsStoreOrderVOByOrderCode(orderCode);
+//        return R.ok().put("data", vo);
+//    }
+//
+//    @Log(title = "冻结、解冻佣金", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:editTuiMoney')")
+//    @PostMapping("/editTuiMoney")
+//    public R editTuiMoney(@Validated @RequestBody FsStoreOrderEditTuiMoneyParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.editTuiMoney(param);
+//    }
+//
+//    @Log(title = "退款", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:refundOrderMoney')")
+//    @PostMapping("/refundOrderMoney")
+//    public synchronized R refundOrderMoney(@Validated @RequestBody FsStoreOrderRefundParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.refundOrderMoney(param.getOrderId());
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:getEroOrder')")
+//    @GetMapping("/getEroOrder")
+//    public R getEroOrder(@RequestParam("extendOrderId") String extendOrderId)
+//    {
+//        IErpOrderService erpOrderService = getErpService();
+//        ErpOrderQueryRequert request = new ErpOrderQueryRequert();
+//        request.setCode(extendOrderId);
+//        ErpOrderQueryResponse response = erpOrderService.getScrmOrder(request);
+//        return R.ok().put("data", response);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:updateExpress')")
+//    @PostMapping("/updateExpress")
+//    public R updateExpress(@Validated @RequestBody FsStoreOrderExpressEditParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.updateExpress(param);
+//    }
+//
+//    @Log(title = "同步物流", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:syncExpress')")
+//    @PostMapping("/syncExpress")
+//    public R syncExpress(@Validated @RequestBody FsStoreOrderExpressEditParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.syncExpress(param);
+//    }
+//
+//    @Log(title = "分佣", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:addTuiMoney')")
+//    @PostMapping("/addTuiMoney")
+//    public R addTuiMoney(@Validated @RequestBody FsStoreOrderAddTuiMoneyParam param, HttpServletRequest request)
+//    {
+//        return fsStoreOrderService.addTuiMoney(param);
+//    }
+//
+//    @GetMapping("/getCustomerOrderList")
+//    public TableDataInfo getCustomerOrderList(FsStoreOrderParam param)
+//    {
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsCustomerStoreOrderListVO(param);
+//        if (list != null) {
+//            for (FsStoreOrderVO vo : list) {
+//                if (vo.getPhone() != null) {
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2"));
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2"));
+//                }
+//            }
+//        }
+//        return getDataTable(list);
+//    }
+//
+//    @Log(title = "手动推管易", businessType = BusinessType.INSERT)
+//    @ApiOperation("创建ERP订单")
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:createErpOrder')")
+//    @GetMapping("/createErpOrder")
+//    public R createErpOrder(@RequestParam("orderCode") String orderCode) throws Exception
+//    {
+//        logger.info("手动推管易订单号：{}", orderCode);
+//        FsStoreOrderScrm order = fsStoreOrderService.selectFsStoreOrderByOrderCode(orderCode);
+//        return fsStoreOrderService.createOmsOrder(order.getId());
+//    }
+//
+//    @GetMapping("/orderDimensionStatisticsList")
+//    public TableDataInfo orderDimensionStatisticsList(OrderStatisticsParam param)
+//    {
+//        if ("广州郑多燕".equals(cloudHostProper.getCompanyName())) {
+//            return getDataTable(fsStoreOrderService.selectZDYOrderSaleStatisticsList(param));
+//        }
+//        return getDataTable(fsStoreOrderService.selectOrderDimensionStatisticsList(param));
+//    }
+//
+//    @Log(title = "订单维度统计", businessType = BusinessType.EXPORT)
+//    @GetMapping("/orderDimensionStatisticsExport")
+//    public AjaxResult orderDimensionStatisticsExport(OrderStatisticsParam param)
+//    {
+//        List<OrderStatisticsVo> list = fsStoreOrderService.selectOrderDimensionStatisticsList(param);
+//        ExcelUtil<OrderStatisticsVo> util = new ExcelUtil<>(OrderStatisticsVo.class);
+//        return util.exportExcel(list, "订单员工维度统计");
+//    }
+//
+//    @GetMapping(value = "/queryErpPhone")
+//    public AjaxResult queryErpPhone()
+//    {
+//        SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("erp.phone");
+//        List<String> list = new ArrayList<>();
+//        if (sysConfig != null) {
+//            String configValue = sysConfig.getConfigValue();
+//            if (StringUtils.isNotEmpty(configValue)) {
+//                list = JSON.parseArray(configValue, String.class);
+//            }
+//        }
+//        return AjaxResult.success(list);
+//    }
+//
+//    @PostMapping(value = "/saveErpPhone")
+//    public AjaxResult saveErpPhone(@RequestBody List<String> phoneList)
+//    {
+//        phoneList = phoneList.stream().distinct().collect(Collectors.toList());
+//        SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("erp.phone");
+//        sysConfig.setConfigValue(JSON.toJSONString(phoneList));
+//        return AjaxResult.success(sysConfigMapper.updateConfig(sysConfig));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
+//    @Log(title = "订单", businessType = BusinessType.UPDATE)
+//    @PostMapping("/editErpPhone")
+//    public AjaxResult editErpPhone(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
+//    {
+//        param.setOpeName(SecurityUtils.getLoginUser().getUser().getNickName());
+//        List<String> erpPhone = param.getErpPhone();
+//        if (erpPhone == null || erpPhone.isEmpty()) {
+//            return AjaxResult.error("请选择手机号");
+//        }
+//        return toAjax(fsStoreOrderService.batchUpdateErpByOrderIds(param));
+//    }
+//
+//    @GetMapping("/getErpAccount")
+//    public R getErpAccount()
+//    {
+//        List<String> list = new ArrayList<>();
+//        if (CloudHostUtils.hasCloudHostName("金牛明医", "康年堂")) {
+//            List<FsDfAccount> erpAccounts = fsDfAccountService.selectFsDfAccountList(null);
+//            list = erpAccounts.stream().map(FsDfAccount::getLoginAccount).collect(Collectors.toList());
+//        }
+//        return R.ok().put("data", list);
+//    }
+//
+//    @Log(title = "手动推管易", businessType = BusinessType.INSERT)
+//    @ApiOperation("批量创建ERP订单")
+//    @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
+//    @PostMapping(value = "/batchCreateErpOrder")
+//    public R batchCreateErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
+//    {
+//        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+//        String loginAccount = param.getLoginAccount();
+//        if (StringUtils.isBlank(loginAccount)) {
+//            return R.error("未选择推送erp账户");
+//        }
+//        FsStoreOrderDf df = getDFInfo(loginAccount);
+//        if (df.getLoginAccount() == null) {
+//            return R.error("未查询到所选erp账户");
+//        }
+//        List<Long> orderIds = param.getOrderIds();
+//        if (orderIds == null || orderIds.isEmpty()) {
+//            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//                param.setPayTimeList(param.getPayTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//            }
+//            param.setNotHealth(1);
+//            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
+//        }
+//        if (orderIds.isEmpty()) {
+//            return R.ok();
+//        }
+//        orderIds.forEach(orderId -> {
+//            try {
+//                df.setOrderId(orderId);
+//                FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
+//                if (temp == null) {
+//                    df.setParcelQuantity(param.getParcelQuantity());
+//                    fsStoreOrderDfService.insertFsStoreOrderDf(df);
+//                    fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
+//                            nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
+//                }
+//                fsStoreOrderService.createOmsOrder(orderId);
+//                fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.PUSH_ORDER_ERP.getValue(),
+//                        nickName + " " + FsStoreOrderLogEnum.PUSH_ORDER_ERP.getDesc() + ":" + df.getLoginAccount());
+//            } catch (ParseException e) {
+//                throw new RuntimeException(e);
+//            }
+//        });
+//        return R.ok();
+//    }
+//
+//    @ApiOperation("批量设置订单账户")
+//    @PreAuthorize("@ss.hasPermi('his:storeOrder:createErpOrder')")
+//    @PostMapping(value = "/batchSetErpOrder")
+//    public R batchSetErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
+//    {
+//        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+//        String loginAccount = param.getLoginAccount();
+//        if (StringUtils.isBlank(loginAccount)) {
+//            return R.error("未选择erp账户");
+//        }
+//        FsStoreOrderDf df = getDFInfo(loginAccount);
+//        if (df.getLoginAccount() == null) {
+//            return R.error("未查询到所选erp账户");
+//        }
+//        List<Long> orderIds = param.getOrderIds();
+//        if (orderIds == null || orderIds.isEmpty()) {
+//            if (!StringUtils.isEmpty(param.getCreateTimeRange())) {
+//                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getPayTimeRange())) {
+//                param.setPayTimeList(param.getPayTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliveryImportTimeRange())) {
+//                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//            }
+//            if (!StringUtils.isEmpty(param.getDeliverySendTimeRange())) {
+//                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//            }
+//            param.setNotHealth(1);
+//            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
+//        }
+//        if (orderIds.isEmpty()) {
+//            return R.ok();
+//        }
+//        orderIds.forEach(orderId -> {
+//            df.setOrderId(orderId);
+//            FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
+//            df.setParcelQuantity(param.getParcelQuantity());
+//            if (temp != null) {
+//                df.setUpdateTime(new Date());
+//                fsStoreOrderDfService.updateFsStoreOrderDf(df);
+//            } else {
+//                fsStoreOrderDfService.insertFsStoreOrderDf(df);
+//            }
+//            fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
+//                    nickName + " " + FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
+//        });
+//        return R.ok();
+//    }
+//
+//    @ApiOperation("批量审核订单")
+//    @Log(title = "订单管理", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:batchAudit')")
+//    @PostMapping("/batchAudit")
+//    public R batchAuditOrder(@Validated @RequestBody FsStoreOrderBatchAuditParam param)
+//    {
+//        if (param.getOrderIds() == null || param.getOrderIds().isEmpty()) {
+//            return R.error("订单ID列表不能为空");
+//        }
+//        if (param.getIsAudit() == null) {
+//            return R.error("审核状态不能为空");
+//        }
+//        int count = fsStoreOrderService.batchAuditOrder(param);
+//        return R.ok("成功审核 " + count + " 条订单");
+//    }
+//
+//    @ApiOperation("订单备注")
+//    @Log(title = "订单管理", businessType = BusinessType.UPDATE)
+//    @PreAuthorize("@ss.hasPermi('store:storeOrder:remark')")
+//    @PostMapping("/remark")
+//    public R remark(@Validated @RequestBody FsStoreOrderScrm param)
+//    {
+//        if (param.getId() == null || param.getId() < 1) {
+//            return R.error("订单ID错误");
+//        }
+//        if (StringUtils.isEmpty(param.getOrderRemark())) {
+//            return R.error("订单备注不能为空");
+//        }
+//        return fsStoreOrderService.orderRemark(param);
+//    }
+//
+//    private SysRole isCheckPermission()
+//    {
+//        SysRole sysRole = new SysRole();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        boolean flag = user.isAdmin();
+//        if (flag) {
+//            sysRole.setIsCheckPhone(1);
+//            sysRole.setIsCheckAddress(1);
+//        } else {
+//            List<SysRole> roles = user.getRoles();
+//            if (roles != null && !roles.isEmpty()) {
+//                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
+//                return sysRoleService.getIsCheckPermission(roleIds);
+//            }
+//        }
+//        return sysRole;
+//    }
+//
+//    private FsStoreOrderDf getDFInfo(String loginAccount)
+//    {
+//        List<FsDfAccount> erpAccounts = fsDfAccountService.selectFsDfAccountList(null);
+//        FsStoreOrderDf df = new FsStoreOrderDf();
+//        for (FsDfAccount erpAccount : erpAccounts) {
+//            if (loginAccount.equals(erpAccount.getLoginAccount())) {
+//                df.setAppKey(erpAccount.getDfAppKey());
+//                df.setAppSecret(erpAccount.getDfAppsecret());
+//                df.setLoginAccount(loginAccount);
+//                df.setMonthlyCard(erpAccount.getMonthlyCard());
+//                df.setExpressProductCode(erpAccount.getExpressProductCode());
+//                df.setStatus(0);
+//                break;
+//            }
+//        }
+//        return df;
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreOrderStatusScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreOrderStatusScrm;
-import com.fs.hisStore.service.IFsStoreOrderStatusScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 订单操作记录 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreOrderStatusScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeOrderStatus")
-public class FsStoreOrderStatusScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreOrderStatusScrmService fsStoreOrderStatusService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreOrderStatusScrm fsStoreOrderStatus)
-    {
-        startPage();
-        List<FsStoreOrderStatusScrm> list = fsStoreOrderStatusService.selectFsStoreOrderStatusList(fsStoreOrderStatus);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:export')")
-    @Log(title = "订单操作记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreOrderStatusScrm fsStoreOrderStatus)
-    {
-        List<FsStoreOrderStatusScrm> list = fsStoreOrderStatusService.selectFsStoreOrderStatusList(fsStoreOrderStatus);
-        ExcelUtil<FsStoreOrderStatusScrm> util = new ExcelUtil<FsStoreOrderStatusScrm>(FsStoreOrderStatusScrm.class);
-        return util.exportExcel(list, "storeOrderStatus");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreOrderStatusService.selectFsStoreOrderStatusById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:add')")
-    @Log(title = "订单操作记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreOrderStatusScrm fsStoreOrderStatus)
-    {
-        return toAjax(fsStoreOrderStatusService.insertFsStoreOrderStatus(fsStoreOrderStatus));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:edit')")
-    @Log(title = "订单操作记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreOrderStatusScrm fsStoreOrderStatus)
-    {
-        return toAjax(fsStoreOrderStatusService.updateFsStoreOrderStatus(fsStoreOrderStatus));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:remove')")
-    @Log(title = "订单操作记录", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreOrderStatusService.deleteFsStoreOrderStatusByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreOrderStatusScrm;
+//import com.fs.hisStore.service.IFsStoreOrderStatusScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 订单操作记录 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreOrderStatusScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeOrderStatus")
+//public class FsStoreOrderStatusScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreOrderStatusScrmService fsStoreOrderStatusService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreOrderStatusScrm fsStoreOrderStatus)
+//    {
+//        startPage();
+//        List<FsStoreOrderStatusScrm> list = fsStoreOrderStatusService.selectFsStoreOrderStatusList(fsStoreOrderStatus);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:export')")
+//    @Log(title = "订单操作记录", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreOrderStatusScrm fsStoreOrderStatus)
+//    {
+//        List<FsStoreOrderStatusScrm> list = fsStoreOrderStatusService.selectFsStoreOrderStatusList(fsStoreOrderStatus);
+//        ExcelUtil<FsStoreOrderStatusScrm> util = new ExcelUtil<FsStoreOrderStatusScrm>(FsStoreOrderStatusScrm.class);
+//        return util.exportExcel(list, "storeOrderStatus");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreOrderStatusService.selectFsStoreOrderStatusById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:add')")
+//    @Log(title = "订单操作记录", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreOrderStatusScrm fsStoreOrderStatus)
+//    {
+//        return toAjax(fsStoreOrderStatusService.insertFsStoreOrderStatus(fsStoreOrderStatus));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:edit')")
+//    @Log(title = "订单操作记录", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreOrderStatusScrm fsStoreOrderStatus)
+//    {
+//        return toAjax(fsStoreOrderStatusService.updateFsStoreOrderStatus(fsStoreOrderStatus));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeOrderStatus:remove')")
+//    @Log(title = "订单操作记录", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreOrderStatusService.deleteFsStoreOrderStatusByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductAttrScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductAttrScrm;
-import com.fs.hisStore.service.IFsStoreProductAttrScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 商品属性 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductAttrScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeProductAttr")
-public class FsStoreProductAttrScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductAttrScrmService fsStoreProductAttrService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductAttrScrm fsStoreProductAttr)
-    {
-        startPage();
-        List<FsStoreProductAttrScrm> list = fsStoreProductAttrService.selectFsStoreProductAttrList(fsStoreProductAttr);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:export')")
-    @Log(title = "商品属性", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductAttrScrm fsStoreProductAttr)
-    {
-        List<FsStoreProductAttrScrm> list = fsStoreProductAttrService.selectFsStoreProductAttrList(fsStoreProductAttr);
-        ExcelUtil<FsStoreProductAttrScrm> util = new ExcelUtil<FsStoreProductAttrScrm>(FsStoreProductAttrScrm.class);
-        return util.exportExcel(list, "storeProductAttr");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreProductAttrService.selectFsStoreProductAttrById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:add')")
-    @Log(title = "商品属性", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductAttrScrm fsStoreProductAttr)
-    {
-        return toAjax(fsStoreProductAttrService.insertFsStoreProductAttr(fsStoreProductAttr));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:edit')")
-    @Log(title = "商品属性", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductAttrScrm fsStoreProductAttr)
-    {
-        return toAjax(fsStoreProductAttrService.updateFsStoreProductAttr(fsStoreProductAttr));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:remove')")
-    @Log(title = "商品属性", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreProductAttrService.deleteFsStoreProductAttrByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductAttrScrm;
+//import com.fs.hisStore.service.IFsStoreProductAttrScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 商品属性 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductAttrScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductAttr")
+//public class FsStoreProductAttrScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductAttrScrmService fsStoreProductAttrService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductAttrScrm fsStoreProductAttr)
+//    {
+//        startPage();
+//        List<FsStoreProductAttrScrm> list = fsStoreProductAttrService.selectFsStoreProductAttrList(fsStoreProductAttr);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:export')")
+//    @Log(title = "商品属性", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductAttrScrm fsStoreProductAttr)
+//    {
+//        List<FsStoreProductAttrScrm> list = fsStoreProductAttrService.selectFsStoreProductAttrList(fsStoreProductAttr);
+//        ExcelUtil<FsStoreProductAttrScrm> util = new ExcelUtil<FsStoreProductAttrScrm>(FsStoreProductAttrScrm.class);
+//        return util.exportExcel(list, "storeProductAttr");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreProductAttrService.selectFsStoreProductAttrById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:add')")
+//    @Log(title = "商品属性", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductAttrScrm fsStoreProductAttr)
+//    {
+//        return toAjax(fsStoreProductAttrService.insertFsStoreProductAttr(fsStoreProductAttr));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:edit')")
+//    @Log(title = "商品属性", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductAttrScrm fsStoreProductAttr)
+//    {
+//        return toAjax(fsStoreProductAttrService.updateFsStoreProductAttr(fsStoreProductAttr));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttr:remove')")
+//    @Log(title = "商品属性", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreProductAttrService.deleteFsStoreProductAttrByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductAttrValueScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
-import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 商品属性值 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductAttrValueScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeProductAttrValue")
-public class FsStoreProductAttrValueScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductAttrValueScrmService fsStoreProductAttrValueService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductAttrValueScrm fsStoreProductAttrValue)
-    {
-        startPage();
-        List<FsStoreProductAttrValueScrm> list = fsStoreProductAttrValueService.selectFsStoreProductAttrValueList(fsStoreProductAttrValue);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:export')")
-    @Log(title = "商品属性值", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductAttrValueScrm fsStoreProductAttrValue)
-    {
-        List<FsStoreProductAttrValueScrm> list = fsStoreProductAttrValueService.selectFsStoreProductAttrValueList(fsStoreProductAttrValue);
-        ExcelUtil<FsStoreProductAttrValueScrm> util = new ExcelUtil<FsStoreProductAttrValueScrm>(FsStoreProductAttrValueScrm.class);
-        return util.exportExcel(list, "storeProductAttrValue");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreProductAttrValueService.selectFsStoreProductAttrValueById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:add')")
-    @Log(title = "商品属性值", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductAttrValueScrm fsStoreProductAttrValue)
-    {
-        return toAjax(fsStoreProductAttrValueService.insertFsStoreProductAttrValue(fsStoreProductAttrValue));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:edit')")
-    @Log(title = "商品属性值", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductAttrValueScrm fsStoreProductAttrValue)
-    {
-        return toAjax(fsStoreProductAttrValueService.updateFsStoreProductAttrValue(fsStoreProductAttrValue));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:remove')")
-    @Log(title = "商品属性值", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreProductAttrValueService.deleteFsStoreProductAttrValueByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
+//import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 商品属性值 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductAttrValueScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductAttrValue")
+//public class FsStoreProductAttrValueScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductAttrValueScrmService fsStoreProductAttrValueService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductAttrValueScrm fsStoreProductAttrValue)
+//    {
+//        startPage();
+//        List<FsStoreProductAttrValueScrm> list = fsStoreProductAttrValueService.selectFsStoreProductAttrValueList(fsStoreProductAttrValue);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:export')")
+//    @Log(title = "商品属性值", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductAttrValueScrm fsStoreProductAttrValue)
+//    {
+//        List<FsStoreProductAttrValueScrm> list = fsStoreProductAttrValueService.selectFsStoreProductAttrValueList(fsStoreProductAttrValue);
+//        ExcelUtil<FsStoreProductAttrValueScrm> util = new ExcelUtil<FsStoreProductAttrValueScrm>(FsStoreProductAttrValueScrm.class);
+//        return util.exportExcel(list, "storeProductAttrValue");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreProductAttrValueService.selectFsStoreProductAttrValueById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:add')")
+//    @Log(title = "商品属性值", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductAttrValueScrm fsStoreProductAttrValue)
+//    {
+//        return toAjax(fsStoreProductAttrValueService.insertFsStoreProductAttrValue(fsStoreProductAttrValue));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:edit')")
+//    @Log(title = "商品属性值", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductAttrValueScrm fsStoreProductAttrValue)
+//    {
+//        return toAjax(fsStoreProductAttrValueService.updateFsStoreProductAttrValue(fsStoreProductAttrValue));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductAttrValue:remove')")
+//    @Log(title = "商品属性值", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreProductAttrValueService.deleteFsStoreProductAttrValueByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductCategoryScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductCategoryScrm;
-import com.fs.hisStore.service.IFsStoreProductCategoryScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 商品分类 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductCategoryScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-16
- */
-@RestController
-@RequestMapping("/store/store/storeProductCategory")
-public class FsStoreProductCategoryScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductCategoryScrmService fsStoreProductCategoryService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductCategoryScrm fsStoreProductCategory)
-    {
-        startPage();
-        List<FsStoreProductCategoryScrm> list = fsStoreProductCategoryService.selectFsStoreProductCategoryList(fsStoreProductCategory);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:export')")
-    @Log(title = "商品分类", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductCategoryScrm fsStoreProductCategory)
-    {
-        List<FsStoreProductCategoryScrm> list = fsStoreProductCategoryService.selectFsStoreProductCategoryList(fsStoreProductCategory);
-        ExcelUtil<FsStoreProductCategoryScrm> util = new ExcelUtil<FsStoreProductCategoryScrm>(FsStoreProductCategoryScrm.class);
-        return util.exportExcel(list, "商品分类");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:query')")
-    @GetMapping(value = "/{cateId}")
-    public AjaxResult getInfo(@PathVariable("cateId") Long cateId)
-    {
-        return AjaxResult.success(fsStoreProductCategoryService.selectFsStoreProductCategoryById(cateId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:add')")
-    @Log(title = "商品分类", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductCategoryScrm fsStoreProductCategory)
-    {
-        return toAjax(fsStoreProductCategoryService.insertFsStoreProductCategory(fsStoreProductCategory));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:edit')")
-    @Log(title = "商品分类", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductCategoryScrm fsStoreProductCategory)
-    {
-        return toAjax(fsStoreProductCategoryService.updateFsStoreProductCategory(fsStoreProductCategory));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:remove')")
-    @Log(title = "商品分类", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{cateIds}")
-    public AjaxResult remove(@PathVariable Long[] cateIds)
-    {
-        return toAjax(fsStoreProductCategoryService.deleteFsStoreProductCategoryByIds(cateIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductCategoryScrm;
+//import com.fs.hisStore.service.IFsStoreProductCategoryScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 商品分类 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductCategoryScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-16
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductCategory")
+//public class FsStoreProductCategoryScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductCategoryScrmService fsStoreProductCategoryService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductCategoryScrm fsStoreProductCategory)
+//    {
+//        startPage();
+//        List<FsStoreProductCategoryScrm> list = fsStoreProductCategoryService.selectFsStoreProductCategoryList(fsStoreProductCategory);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:export')")
+//    @Log(title = "商品分类", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductCategoryScrm fsStoreProductCategory)
+//    {
+//        List<FsStoreProductCategoryScrm> list = fsStoreProductCategoryService.selectFsStoreProductCategoryList(fsStoreProductCategory);
+//        ExcelUtil<FsStoreProductCategoryScrm> util = new ExcelUtil<FsStoreProductCategoryScrm>(FsStoreProductCategoryScrm.class);
+//        return util.exportExcel(list, "商品分类");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:query')")
+//    @GetMapping(value = "/{cateId}")
+//    public AjaxResult getInfo(@PathVariable("cateId") Long cateId)
+//    {
+//        return AjaxResult.success(fsStoreProductCategoryService.selectFsStoreProductCategoryById(cateId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:add')")
+//    @Log(title = "商品分类", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductCategoryScrm fsStoreProductCategory)
+//    {
+//        return toAjax(fsStoreProductCategoryService.insertFsStoreProductCategory(fsStoreProductCategory));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:edit')")
+//    @Log(title = "商品分类", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductCategoryScrm fsStoreProductCategory)
+//    {
+//        return toAjax(fsStoreProductCategoryService.updateFsStoreProductCategory(fsStoreProductCategory));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductCategory:remove')")
+//    @Log(title = "商品分类", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{cateIds}")
+//    public AjaxResult remove(@PathVariable Long[] cateIds)
+//    {
+//        return toAjax(fsStoreProductCategoryService.deleteFsStoreProductCategoryByIds(cateIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductDetailsScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductDetailsScrm;
-import com.fs.hisStore.service.IFsStoreProductDetailsScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 商品详情 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductDetailsScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeProductDetails")
-public class FsStoreProductDetailsScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductDetailsScrmService fsStoreProductDetailsService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductDetailsScrm fsStoreProductDetails)
-    {
-        startPage();
-        List<FsStoreProductDetailsScrm> list = fsStoreProductDetailsService.selectFsStoreProductDetailsList(fsStoreProductDetails);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:export')")
-    @Log(title = "商品详情", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductDetailsScrm fsStoreProductDetails)
-    {
-        List<FsStoreProductDetailsScrm> list = fsStoreProductDetailsService.selectFsStoreProductDetailsList(fsStoreProductDetails);
-        ExcelUtil<FsStoreProductDetailsScrm> util = new ExcelUtil<FsStoreProductDetailsScrm>(FsStoreProductDetailsScrm.class);
-        return util.exportExcel(list, "storeProductDetails");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:query')")
-    @GetMapping(value = "/{detailsId}")
-    public AjaxResult getInfo(@PathVariable("detailsId") Long detailsId)
-    {
-        return AjaxResult.success(fsStoreProductDetailsService.selectFsStoreProductDetailsById(detailsId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:add')")
-    @Log(title = "商品详情", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductDetailsScrm fsStoreProductDetails)
-    {
-        return toAjax(fsStoreProductDetailsService.insertFsStoreProductDetails(fsStoreProductDetails));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:edit')")
-    @Log(title = "商品详情", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductDetailsScrm fsStoreProductDetails)
-    {
-        return toAjax(fsStoreProductDetailsService.updateFsStoreProductDetails(fsStoreProductDetails));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:remove')")
-    @Log(title = "商品详情", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{detailsIds}")
-    public AjaxResult remove(@PathVariable Long[] detailsIds)
-    {
-        return toAjax(fsStoreProductDetailsService.deleteFsStoreProductDetailsByIds(detailsIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductDetailsScrm;
+//import com.fs.hisStore.service.IFsStoreProductDetailsScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 商品详情 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductDetailsScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductDetails")
+//public class FsStoreProductDetailsScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductDetailsScrmService fsStoreProductDetailsService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductDetailsScrm fsStoreProductDetails)
+//    {
+//        startPage();
+//        List<FsStoreProductDetailsScrm> list = fsStoreProductDetailsService.selectFsStoreProductDetailsList(fsStoreProductDetails);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:export')")
+//    @Log(title = "商品详情", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductDetailsScrm fsStoreProductDetails)
+//    {
+//        List<FsStoreProductDetailsScrm> list = fsStoreProductDetailsService.selectFsStoreProductDetailsList(fsStoreProductDetails);
+//        ExcelUtil<FsStoreProductDetailsScrm> util = new ExcelUtil<FsStoreProductDetailsScrm>(FsStoreProductDetailsScrm.class);
+//        return util.exportExcel(list, "storeProductDetails");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:query')")
+//    @GetMapping(value = "/{detailsId}")
+//    public AjaxResult getInfo(@PathVariable("detailsId") Long detailsId)
+//    {
+//        return AjaxResult.success(fsStoreProductDetailsService.selectFsStoreProductDetailsById(detailsId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:add')")
+//    @Log(title = "商品详情", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductDetailsScrm fsStoreProductDetails)
+//    {
+//        return toAjax(fsStoreProductDetailsService.insertFsStoreProductDetails(fsStoreProductDetails));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:edit')")
+//    @Log(title = "商品详情", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductDetailsScrm fsStoreProductDetails)
+//    {
+//        return toAjax(fsStoreProductDetailsService.updateFsStoreProductDetails(fsStoreProductDetails));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductDetails:remove')")
+//    @Log(title = "商品详情", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{detailsIds}")
+//    public AjaxResult remove(@PathVariable Long[] detailsIds)
+//    {
+//        return toAjax(fsStoreProductDetailsService.deleteFsStoreProductDetailsByIds(detailsIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductGroupScrmBridgeController.java

@@ -1,115 +1,115 @@
-package com.fs.admin.controller.store;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONUtil;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductScrm;
-import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
-import com.fs.hisStore.domain.FsStoreProductGroupScrm;
-import com.fs.hisStore.dto.StoreProductGroupDTO;
-import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
-import com.fs.hisStore.service.IFsStoreProductGroupScrmService;
-import com.fs.hisStore.service.IFsStoreProductScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 商品组合 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductGroupScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-11-23
- */
-@RestController
-@RequestMapping("/store/store/storeProductGroup")
-public class FsStoreProductGroupScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductGroupScrmService fsStoreProductGroupService;
-    @Autowired
-    private IFsStoreProductAttrValueScrmService attrValueService;
-    @Autowired
-    private IFsStoreProductScrmService storeProductService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductGroupScrm fsStoreProductGroup)
-    {
-        startPage();
-        List<FsStoreProductGroupScrm> list = fsStoreProductGroupService.selectFsStoreProductGroupList(fsStoreProductGroup);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:export')")
-    @Log(title = "商品组合", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductGroupScrm fsStoreProductGroup)
-    {
-        List<FsStoreProductGroupScrm> list = fsStoreProductGroupService.selectFsStoreProductGroupList(fsStoreProductGroup);
-        ExcelUtil<FsStoreProductGroupScrm> util = new ExcelUtil<FsStoreProductGroupScrm>(FsStoreProductGroupScrm.class);
-        return util.exportExcel(list, "storeProductGroup");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:query')")
-    @GetMapping(value = "/{groupId}")
-    public AjaxResult getInfo(@PathVariable("groupId") Long groupId)
-    {
-        FsStoreProductGroupScrm storeProductGroup = fsStoreProductGroupService.selectFsStoreProductGroupById(groupId);
-        JSONArray jsonArray = JSONUtil.parseArray(storeProductGroup.getProducts());
-        List<StoreProductGroupDTO> productGroupDTOS = JSONUtil.toList(jsonArray, StoreProductGroupDTO.class);
-        for (StoreProductGroupDTO dto : productGroupDTOS) {
-            FsStoreProductAttrValueScrm attrValue = attrValueService.selectFsStoreProductAttrValueById(dto.getId());
-            if (attrValue != null) {
-                FsStoreProductScrm product = storeProductService.selectFsStoreProductById(attrValue.getProductId());
-                if (product != null) {
-                    dto.setProductId(attrValue.getProductId());
-                    dto.setId(dto.getId());
-                    dto.setBarCode(attrValue.getBarCode());
-                    dto.setPrice(attrValue.getPrice());
-                    dto.setCount(dto.getCount());
-                    dto.setSku(attrValue.getSku());
-                    dto.setImage(attrValue.getImage());
-                    dto.setProductName(product.getProductName());
-                }
-            }
-        }
-        storeProductGroup.setProductList(productGroupDTOS);
-        return AjaxResult.success(storeProductGroup);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:add')")
-    @Log(title = "商品组合", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductGroupScrm fsStoreProductGroup)
-    {
-        String products = JSONUtil.toJsonStr(fsStoreProductGroup.getProductList());
-        fsStoreProductGroup.setProducts(products);
-        return toAjax(fsStoreProductGroupService.insertFsStoreProductGroup(fsStoreProductGroup));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:edit')")
-    @Log(title = "商品组合", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductGroupScrm fsStoreProductGroup)
-    {
-        String products = JSONUtil.toJsonStr(fsStoreProductGroup.getProductList());
-        fsStoreProductGroup.setProducts(products);
-        return toAjax(fsStoreProductGroupService.updateFsStoreProductGroup(fsStoreProductGroup));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:remove')")
-    @Log(title = "商品组合", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{groupIds}")
-    public AjaxResult remove(@PathVariable Long[] groupIds)
-    {
-        return toAjax(fsStoreProductGroupService.deleteFsStoreProductGroupByIds(groupIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import cn.hutool.json.JSONArray;
+//import cn.hutool.json.JSONUtil;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductScrm;
+//import com.fs.hisStore.domain.FsStoreProductAttrValueScrm;
+//import com.fs.hisStore.domain.FsStoreProductGroupScrm;
+//import com.fs.hisStore.dto.StoreProductGroupDTO;
+//import com.fs.hisStore.service.IFsStoreProductAttrValueScrmService;
+//import com.fs.hisStore.service.IFsStoreProductGroupScrmService;
+//import com.fs.hisStore.service.IFsStoreProductScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 商品组合 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductGroupScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-11-23
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductGroup")
+//public class FsStoreProductGroupScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductGroupScrmService fsStoreProductGroupService;
+//    @Autowired
+//    private IFsStoreProductAttrValueScrmService attrValueService;
+//    @Autowired
+//    private IFsStoreProductScrmService storeProductService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductGroupScrm fsStoreProductGroup)
+//    {
+//        startPage();
+//        List<FsStoreProductGroupScrm> list = fsStoreProductGroupService.selectFsStoreProductGroupList(fsStoreProductGroup);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:export')")
+//    @Log(title = "商品组合", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductGroupScrm fsStoreProductGroup)
+//    {
+//        List<FsStoreProductGroupScrm> list = fsStoreProductGroupService.selectFsStoreProductGroupList(fsStoreProductGroup);
+//        ExcelUtil<FsStoreProductGroupScrm> util = new ExcelUtil<FsStoreProductGroupScrm>(FsStoreProductGroupScrm.class);
+//        return util.exportExcel(list, "storeProductGroup");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:query')")
+//    @GetMapping(value = "/{groupId}")
+//    public AjaxResult getInfo(@PathVariable("groupId") Long groupId)
+//    {
+//        FsStoreProductGroupScrm storeProductGroup = fsStoreProductGroupService.selectFsStoreProductGroupById(groupId);
+//        JSONArray jsonArray = JSONUtil.parseArray(storeProductGroup.getProducts());
+//        List<StoreProductGroupDTO> productGroupDTOS = JSONUtil.toList(jsonArray, StoreProductGroupDTO.class);
+//        for (StoreProductGroupDTO dto : productGroupDTOS) {
+//            FsStoreProductAttrValueScrm attrValue = attrValueService.selectFsStoreProductAttrValueById(dto.getId());
+//            if (attrValue != null) {
+//                FsStoreProductScrm product = storeProductService.selectFsStoreProductById(attrValue.getProductId());
+//                if (product != null) {
+//                    dto.setProductId(attrValue.getProductId());
+//                    dto.setId(dto.getId());
+//                    dto.setBarCode(attrValue.getBarCode());
+//                    dto.setPrice(attrValue.getPrice());
+//                    dto.setCount(dto.getCount());
+//                    dto.setSku(attrValue.getSku());
+//                    dto.setImage(attrValue.getImage());
+//                    dto.setProductName(product.getProductName());
+//                }
+//            }
+//        }
+//        storeProductGroup.setProductList(productGroupDTOS);
+//        return AjaxResult.success(storeProductGroup);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:add')")
+//    @Log(title = "商品组合", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductGroupScrm fsStoreProductGroup)
+//    {
+//        String products = JSONUtil.toJsonStr(fsStoreProductGroup.getProductList());
+//        fsStoreProductGroup.setProducts(products);
+//        return toAjax(fsStoreProductGroupService.insertFsStoreProductGroup(fsStoreProductGroup));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:edit')")
+//    @Log(title = "商品组合", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductGroupScrm fsStoreProductGroup)
+//    {
+//        String products = JSONUtil.toJsonStr(fsStoreProductGroup.getProductList());
+//        fsStoreProductGroup.setProducts(products);
+//        return toAjax(fsStoreProductGroupService.updateFsStoreProductGroup(fsStoreProductGroup));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductGroup:remove')")
+//    @Log(title = "商品组合", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{groupIds}")
+//    public AjaxResult remove(@PathVariable Long[] groupIds)
+//    {
+//        return toAjax(fsStoreProductGroupService.deleteFsStoreProductGroupByIds(groupIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductRelationScrmBridgeController.java

@@ -1,59 +1,59 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.param.FsStoreProductRelationParam;
-import com.fs.hisStore.service.IFsStoreProductRelationScrmService;
-import com.fs.hisStore.vo.FsStoreProductRelationQueryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * 商品点赞和收藏 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductRelationScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeProductRelation")
-public class FsStoreProductRelationScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductRelationScrmService fsStoreProductRelationService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRelation:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductRelationParam param)
-    {
-        startPage();
-        List<FsStoreProductRelationQueryVO> list = fsStoreProductRelationService.selectFsStoreProductRelationListVO(param);
-        for (FsStoreProductRelationQueryVO vo : list){
-            vo.setPhone(ParseUtils.parsePhone(vo.getPhone()));
-        }
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRelation:export')")
-    @Log(title = "商品浏览记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductRelationParam param)
-    {
-        List<FsStoreProductRelationQueryVO> list = fsStoreProductRelationService.selectFsStoreProductRelationListVO(param);
-        for (FsStoreProductRelationQueryVO vo : list){
-            vo.setPhone(ParseUtils.parsePhone(vo.getPhone()));
-        }
-        ExcelUtil<FsStoreProductRelationQueryVO> util = new ExcelUtil<FsStoreProductRelationQueryVO>(FsStoreProductRelationQueryVO.class);
-        return util.exportExcel(list, "商品浏览记录");
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.ParseUtils;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.param.FsStoreProductRelationParam;
+//import com.fs.hisStore.service.IFsStoreProductRelationScrmService;
+//import com.fs.hisStore.vo.FsStoreProductRelationQueryVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.List;
+//
+///**
+// * 商品点赞和收藏 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductRelationScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductRelation")
+//public class FsStoreProductRelationScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductRelationScrmService fsStoreProductRelationService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRelation:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductRelationParam param)
+//    {
+//        startPage();
+//        List<FsStoreProductRelationQueryVO> list = fsStoreProductRelationService.selectFsStoreProductRelationListVO(param);
+//        for (FsStoreProductRelationQueryVO vo : list){
+//            vo.setPhone(ParseUtils.parsePhone(vo.getPhone()));
+//        }
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRelation:export')")
+//    @Log(title = "商品浏览记录", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductRelationParam param)
+//    {
+//        List<FsStoreProductRelationQueryVO> list = fsStoreProductRelationService.selectFsStoreProductRelationListVO(param);
+//        for (FsStoreProductRelationQueryVO vo : list){
+//            vo.setPhone(ParseUtils.parsePhone(vo.getPhone()));
+//        }
+//        ExcelUtil<FsStoreProductRelationQueryVO> util = new ExcelUtil<FsStoreProductRelationQueryVO>(FsStoreProductRelationQueryVO.class);
+//        return util.exportExcel(list, "商品浏览记录");
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductReplyScrmBridgeController.java

@@ -1,93 +1,93 @@
-package com.fs.admin.controller.store;
-
-import cn.hutool.core.date.DateTime;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductReplyScrm;
-import com.fs.hisStore.service.IFsStoreProductReplyScrmService;
-import com.fs.hisStore.vo.FsStoreProductReplyVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 评论 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductReplyScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeProductReply")
-public class FsStoreProductReplyScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductReplyScrmService fsStoreProductReplyService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductReply:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductReplyScrm fsStoreProductReply)
-    {
-        startPage();
-        fsStoreProductReply.setIsDel(0);
-        List<FsStoreProductReplyVO> list = fsStoreProductReplyService.selectFsStoreProductReplyListVO(fsStoreProductReply);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductReply:export')")
-    @Log(title = "评论", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductReplyScrm fsStoreProductReply)
-    {
-        List<FsStoreProductReplyScrm> list = fsStoreProductReplyService.selectFsStoreProductReplyList(fsStoreProductReply);
-        ExcelUtil<FsStoreProductReplyScrm> util = new ExcelUtil<FsStoreProductReplyScrm>(FsStoreProductReplyScrm.class);
-        return util.exportExcel(list, "storeProductReply");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductReply:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreProductReplyService.selectFsStoreProductReplyById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductReply:add')")
-    @Log(title = "评论", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductReplyScrm fsStoreProductReply)
-    {
-        return toAjax(fsStoreProductReplyService.insertFsStoreProductReply(fsStoreProductReply));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductReply:edit')")
-    @Log(title = "评论", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductReplyScrm fsStoreProductReply)
-    {
-        return toAjax(fsStoreProductReplyService.updateFsStoreProductReply(fsStoreProductReply));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductReply:remove')")
-    @Log(title = "评论", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreProductReplyService.deleteFsStoreProductReplyByIds(ids));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductReply:reply')")
-    @Log(title = "评论回复", businessType = BusinessType.INSERT)
-    @PostMapping("/reply")
-    public AjaxResult reply(@RequestBody FsStoreProductReplyScrm fsStoreProductReply)
-    {
-        fsStoreProductReply.setIsReply(1);
-        fsStoreProductReply.setReplyTime(new DateTime());
-        return toAjax(fsStoreProductReplyService.updateFsStoreProductReply(fsStoreProductReply));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import cn.hutool.core.date.DateTime;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductReplyScrm;
+//import com.fs.hisStore.service.IFsStoreProductReplyScrmService;
+//import com.fs.hisStore.vo.FsStoreProductReplyVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 评论 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductReplyScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductReply")
+//public class FsStoreProductReplyScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductReplyScrmService fsStoreProductReplyService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductReply:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductReplyScrm fsStoreProductReply)
+//    {
+//        startPage();
+//        fsStoreProductReply.setIsDel(0);
+//        List<FsStoreProductReplyVO> list = fsStoreProductReplyService.selectFsStoreProductReplyListVO(fsStoreProductReply);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductReply:export')")
+//    @Log(title = "评论", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductReplyScrm fsStoreProductReply)
+//    {
+//        List<FsStoreProductReplyScrm> list = fsStoreProductReplyService.selectFsStoreProductReplyList(fsStoreProductReply);
+//        ExcelUtil<FsStoreProductReplyScrm> util = new ExcelUtil<FsStoreProductReplyScrm>(FsStoreProductReplyScrm.class);
+//        return util.exportExcel(list, "storeProductReply");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductReply:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreProductReplyService.selectFsStoreProductReplyById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductReply:add')")
+//    @Log(title = "评论", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductReplyScrm fsStoreProductReply)
+//    {
+//        return toAjax(fsStoreProductReplyService.insertFsStoreProductReply(fsStoreProductReply));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductReply:edit')")
+//    @Log(title = "评论", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductReplyScrm fsStoreProductReply)
+//    {
+//        return toAjax(fsStoreProductReplyService.updateFsStoreProductReply(fsStoreProductReply));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductReply:remove')")
+//    @Log(title = "评论", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreProductReplyService.deleteFsStoreProductReplyByIds(ids));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductReply:reply')")
+//    @Log(title = "评论回复", businessType = BusinessType.INSERT)
+//    @PostMapping("/reply")
+//    public AjaxResult reply(@RequestBody FsStoreProductReplyScrm fsStoreProductReply)
+//    {
+//        fsStoreProductReply.setIsReply(1);
+//        fsStoreProductReply.setReplyTime(new DateTime());
+//        return toAjax(fsStoreProductReplyService.updateFsStoreProductReply(fsStoreProductReply));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductRuleScrmBridgeController.java

@@ -1,101 +1,101 @@
-package com.fs.admin.controller.store;
-
-import cn.hutool.json.JSONUtil;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductRuleScrm;
-import com.fs.hisStore.param.FsStoreProductRuleParam;
-import com.fs.hisStore.service.IFsStoreProductRuleScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 商品规格 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductRuleScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeProductRule")
-public class FsStoreProductRuleScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductRuleScrmService fsStoreProductRuleService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRule:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductRuleScrm fsStoreProductRule)
-    {
-        startPage();
-        fsStoreProductRule.setIsDel(0);
-        List<FsStoreProductRuleScrm> list = fsStoreProductRuleService.selectFsStoreProductRuleList(fsStoreProductRule);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRule:export')")
-    @Log(title = "商品规格", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductRuleScrm fsStoreProductRule)
-    {
-        List<FsStoreProductRuleScrm> list = fsStoreProductRuleService.selectFsStoreProductRuleList(fsStoreProductRule);
-        ExcelUtil<FsStoreProductRuleScrm> util = new ExcelUtil<FsStoreProductRuleScrm>(FsStoreProductRuleScrm.class);
-        return util.exportExcel(list, "storeProductRule");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRule:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Integer id)
-    {
-        return AjaxResult.success(fsStoreProductRuleService.selectFsStoreProductRuleById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRule:add')")
-    @Log(title = "商品规格", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductRuleParam fsStoreProductRule)
-    {
-        FsStoreProductRuleScrm rule = new FsStoreProductRuleScrm();
-        rule.setRuleName(fsStoreProductRule.getRuleName());
-        rule.setRuleValue(JSONUtil.toJsonStr(fsStoreProductRule.getRuleValue()));
-        rule.setIsDel(0);
-        return toAjax(fsStoreProductRuleService.insertFsStoreProductRule(rule));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRule:edit')")
-    @Log(title = "商品规格", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductRuleParam fsStoreProductRule)
-    {
-        FsStoreProductRuleScrm rule = new FsStoreProductRuleScrm();
-        rule.setId(fsStoreProductRule.getId());
-        rule.setRuleName(fsStoreProductRule.getRuleName());
-        rule.setRuleValue(JSONUtil.toJsonStr(fsStoreProductRule.getRuleValue()));
-        rule.setIsDel(0);
-        return toAjax(fsStoreProductRuleService.updateFsStoreProductRule(rule));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductRule:remove')")
-    @Log(title = "商品规格", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Integer[] ids)
-    {
-        return toAjax(fsStoreProductRuleService.deleteFsStoreProductRuleByIds(ids));
-    }
-
-    @GetMapping("/getAllList")
-    public R getAllList(FsStoreProductRuleScrm fsStoreProductRule)
-    {
-        fsStoreProductRule.setIsDel(0);
-        List<FsStoreProductRuleScrm> list = fsStoreProductRuleService.selectFsStoreProductRuleList(fsStoreProductRule);
-        return R.ok().put("data", list);
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import cn.hutool.json.JSONUtil;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductRuleScrm;
+//import com.fs.hisStore.param.FsStoreProductRuleParam;
+//import com.fs.hisStore.service.IFsStoreProductRuleScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 商品规格 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductRuleScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductRule")
+//public class FsStoreProductRuleScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductRuleScrmService fsStoreProductRuleService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRule:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductRuleScrm fsStoreProductRule)
+//    {
+//        startPage();
+//        fsStoreProductRule.setIsDel(0);
+//        List<FsStoreProductRuleScrm> list = fsStoreProductRuleService.selectFsStoreProductRuleList(fsStoreProductRule);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRule:export')")
+//    @Log(title = "商品规格", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductRuleScrm fsStoreProductRule)
+//    {
+//        List<FsStoreProductRuleScrm> list = fsStoreProductRuleService.selectFsStoreProductRuleList(fsStoreProductRule);
+//        ExcelUtil<FsStoreProductRuleScrm> util = new ExcelUtil<FsStoreProductRuleScrm>(FsStoreProductRuleScrm.class);
+//        return util.exportExcel(list, "storeProductRule");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRule:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Integer id)
+//    {
+//        return AjaxResult.success(fsStoreProductRuleService.selectFsStoreProductRuleById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRule:add')")
+//    @Log(title = "商品规格", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductRuleParam fsStoreProductRule)
+//    {
+//        FsStoreProductRuleScrm rule = new FsStoreProductRuleScrm();
+//        rule.setRuleName(fsStoreProductRule.getRuleName());
+//        rule.setRuleValue(JSONUtil.toJsonStr(fsStoreProductRule.getRuleValue()));
+//        rule.setIsDel(0);
+//        return toAjax(fsStoreProductRuleService.insertFsStoreProductRule(rule));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRule:edit')")
+//    @Log(title = "商品规格", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductRuleParam fsStoreProductRule)
+//    {
+//        FsStoreProductRuleScrm rule = new FsStoreProductRuleScrm();
+//        rule.setId(fsStoreProductRule.getId());
+//        rule.setRuleName(fsStoreProductRule.getRuleName());
+//        rule.setRuleValue(JSONUtil.toJsonStr(fsStoreProductRule.getRuleValue()));
+//        rule.setIsDel(0);
+//        return toAjax(fsStoreProductRuleService.updateFsStoreProductRule(rule));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductRule:remove')")
+//    @Log(title = "商品规格", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Integer[] ids)
+//    {
+//        return toAjax(fsStoreProductRuleService.deleteFsStoreProductRuleByIds(ids));
+//    }
+//
+//    @GetMapping("/getAllList")
+//    public R getAllList(FsStoreProductRuleScrm fsStoreProductRule)
+//    {
+//        fsStoreProductRule.setIsDel(0);
+//        List<FsStoreProductRuleScrm> list = fsStoreProductRuleService.selectFsStoreProductRuleList(fsStoreProductRule);
+//        return R.ok().put("data", list);
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreProductTemplateScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreProductTemplateScrm;
-import com.fs.hisStore.service.IFsStoreProductTemplateScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 商品模板 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreProductTemplateScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeProductTemplate")
-public class FsStoreProductTemplateScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreProductTemplateScrmService fsStoreProductTemplateService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreProductTemplateScrm fsStoreProductTemplate)
-    {
-        startPage();
-        List<FsStoreProductTemplateScrm> list = fsStoreProductTemplateService.selectFsStoreProductTemplateList(fsStoreProductTemplate);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:export')")
-    @Log(title = "商品模板", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreProductTemplateScrm fsStoreProductTemplate)
-    {
-        List<FsStoreProductTemplateScrm> list = fsStoreProductTemplateService.selectFsStoreProductTemplateList(fsStoreProductTemplate);
-        ExcelUtil<FsStoreProductTemplateScrm> util = new ExcelUtil<FsStoreProductTemplateScrm>(FsStoreProductTemplateScrm.class);
-        return util.exportExcel(list, "storeProductTemplate");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:query')")
-    @GetMapping(value = "/{tempId}")
-    public AjaxResult getInfo(@PathVariable("tempId") Long tempId)
-    {
-        return AjaxResult.success(fsStoreProductTemplateService.selectFsStoreProductTemplateById(tempId));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:add')")
-    @Log(title = "商品模板", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreProductTemplateScrm fsStoreProductTemplate)
-    {
-        return toAjax(fsStoreProductTemplateService.insertFsStoreProductTemplate(fsStoreProductTemplate));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:edit')")
-    @Log(title = "商品模板", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreProductTemplateScrm fsStoreProductTemplate)
-    {
-        return toAjax(fsStoreProductTemplateService.updateFsStoreProductTemplate(fsStoreProductTemplate));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:remove')")
-    @Log(title = "商品模板", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{tempIds}")
-    public AjaxResult remove(@PathVariable Long[] tempIds)
-    {
-        return toAjax(fsStoreProductTemplateService.deleteFsStoreProductTemplateByIds(tempIds));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreProductTemplateScrm;
+//import com.fs.hisStore.service.IFsStoreProductTemplateScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 商品模板 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreProductTemplateScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeProductTemplate")
+//public class FsStoreProductTemplateScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreProductTemplateScrmService fsStoreProductTemplateService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreProductTemplateScrm fsStoreProductTemplate)
+//    {
+//        startPage();
+//        List<FsStoreProductTemplateScrm> list = fsStoreProductTemplateService.selectFsStoreProductTemplateList(fsStoreProductTemplate);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:export')")
+//    @Log(title = "商品模板", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreProductTemplateScrm fsStoreProductTemplate)
+//    {
+//        List<FsStoreProductTemplateScrm> list = fsStoreProductTemplateService.selectFsStoreProductTemplateList(fsStoreProductTemplate);
+//        ExcelUtil<FsStoreProductTemplateScrm> util = new ExcelUtil<FsStoreProductTemplateScrm>(FsStoreProductTemplateScrm.class);
+//        return util.exportExcel(list, "storeProductTemplate");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:query')")
+//    @GetMapping(value = "/{tempId}")
+//    public AjaxResult getInfo(@PathVariable("tempId") Long tempId)
+//    {
+//        return AjaxResult.success(fsStoreProductTemplateService.selectFsStoreProductTemplateById(tempId));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:add')")
+//    @Log(title = "商品模板", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreProductTemplateScrm fsStoreProductTemplate)
+//    {
+//        return toAjax(fsStoreProductTemplateService.insertFsStoreProductTemplate(fsStoreProductTemplate));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:edit')")
+//    @Log(title = "商品模板", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreProductTemplateScrm fsStoreProductTemplate)
+//    {
+//        return toAjax(fsStoreProductTemplateService.updateFsStoreProductTemplate(fsStoreProductTemplate));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeProductTemplate:remove')")
+//    @Log(title = "商品模板", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{tempIds}")
+//    public AjaxResult remove(@PathVariable Long[] tempIds)
+//    {
+//        return toAjax(fsStoreProductTemplateService.deleteFsStoreProductTemplateByIds(tempIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreShopStaffScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreShopStaffScrm;
-import com.fs.hisStore.service.IFsStoreShopStaffScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 门店店员 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreShopStaffScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeShopStaff")
-public class FsStoreShopStaffScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreShopStaffScrmService fsStoreShopStaffService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreShopStaffScrm fsStoreShopStaff)
-    {
-        startPage();
-        List<FsStoreShopStaffScrm> list = fsStoreShopStaffService.selectFsStoreShopStaffList(fsStoreShopStaff);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:export')")
-    @Log(title = "门店店员", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreShopStaffScrm fsStoreShopStaff)
-    {
-        List<FsStoreShopStaffScrm> list = fsStoreShopStaffService.selectFsStoreShopStaffList(fsStoreShopStaff);
-        ExcelUtil<FsStoreShopStaffScrm> util = new ExcelUtil<FsStoreShopStaffScrm>(FsStoreShopStaffScrm.class);
-        return util.exportExcel(list, "storeShopStaff");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreShopStaffService.selectFsStoreShopStaffById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:add')")
-    @Log(title = "门店店员", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreShopStaffScrm fsStoreShopStaff)
-    {
-        return toAjax(fsStoreShopStaffService.insertFsStoreShopStaff(fsStoreShopStaff));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:edit')")
-    @Log(title = "门店店员", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreShopStaffScrm fsStoreShopStaff)
-    {
-        return toAjax(fsStoreShopStaffService.updateFsStoreShopStaff(fsStoreShopStaff));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:remove')")
-    @Log(title = "门店店员", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreShopStaffService.deleteFsStoreShopStaffByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreShopStaffScrm;
+//import com.fs.hisStore.service.IFsStoreShopStaffScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 门店店员 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreShopStaffScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeShopStaff")
+//public class FsStoreShopStaffScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreShopStaffScrmService fsStoreShopStaffService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreShopStaffScrm fsStoreShopStaff)
+//    {
+//        startPage();
+//        List<FsStoreShopStaffScrm> list = fsStoreShopStaffService.selectFsStoreShopStaffList(fsStoreShopStaff);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:export')")
+//    @Log(title = "门店店员", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreShopStaffScrm fsStoreShopStaff)
+//    {
+//        List<FsStoreShopStaffScrm> list = fsStoreShopStaffService.selectFsStoreShopStaffList(fsStoreShopStaff);
+//        ExcelUtil<FsStoreShopStaffScrm> util = new ExcelUtil<FsStoreShopStaffScrm>(FsStoreShopStaffScrm.class);
+//        return util.exportExcel(list, "storeShopStaff");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreShopStaffService.selectFsStoreShopStaffById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:add')")
+//    @Log(title = "门店店员", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreShopStaffScrm fsStoreShopStaff)
+//    {
+//        return toAjax(fsStoreShopStaffService.insertFsStoreShopStaff(fsStoreShopStaff));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:edit')")
+//    @Log(title = "门店店员", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreShopStaffScrm fsStoreShopStaff)
+//    {
+//        return toAjax(fsStoreShopStaffService.updateFsStoreShopStaff(fsStoreShopStaff));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeShopStaff:remove')")
+//    @Log(title = "门店店员", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreShopStaffService.deleteFsStoreShopStaffByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/FsStoreVisitScrmBridgeController.java

@@ -1,80 +1,80 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.FsStoreVisitScrm;
-import com.fs.hisStore.service.IFsStoreVisitScrmService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 产品浏览分析 Bridge Controller (fs-admin端)
- * 桥接 hisStore.FsStoreVisitScrmController，供平台总后台跨租户管理
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/storeVisit")
-public class FsStoreVisitScrmBridgeController extends BaseController
-{
-    @Autowired
-    private IFsStoreVisitScrmService fsStoreVisitService;
-
-    @PreAuthorize("@ss.hasPermi('store:storeVisit:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsStoreVisitScrm fsStoreVisit)
-    {
-        startPage();
-        List<FsStoreVisitScrm> list = fsStoreVisitService.selectFsStoreVisitList(fsStoreVisit);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeVisit:export')")
-    @Log(title = "产品浏览分析", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsStoreVisitScrm fsStoreVisit)
-    {
-        List<FsStoreVisitScrm> list = fsStoreVisitService.selectFsStoreVisitList(fsStoreVisit);
-        ExcelUtil<FsStoreVisitScrm> util = new ExcelUtil<FsStoreVisitScrm>(FsStoreVisitScrm.class);
-        return util.exportExcel(list, "storeVisit");
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeVisit:query')")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(fsStoreVisitService.selectFsStoreVisitById(id));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeVisit:add')")
-    @Log(title = "产品浏览分析", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsStoreVisitScrm fsStoreVisit)
-    {
-        return toAjax(fsStoreVisitService.insertFsStoreVisit(fsStoreVisit));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeVisit:edit')")
-    @Log(title = "产品浏览分析", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreVisitScrm fsStoreVisit)
-    {
-        return toAjax(fsStoreVisitService.updateFsStoreVisit(fsStoreVisit));
-    }
-
-    @PreAuthorize("@ss.hasPermi('store:storeVisit:remove')")
-    @Log(title = "产品浏览分析", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(fsStoreVisitService.deleteFsStoreVisitByIds(ids));
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.FsStoreVisitScrm;
+//import com.fs.hisStore.service.IFsStoreVisitScrmService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 产品浏览分析 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.FsStoreVisitScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// * @date 2022-03-15
+// */
+//@RestController
+//@RequestMapping("/store/store/storeVisit")
+//public class FsStoreVisitScrmBridgeController extends BaseController
+//{
+//    @Autowired
+//    private IFsStoreVisitScrmService fsStoreVisitService;
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeVisit:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsStoreVisitScrm fsStoreVisit)
+//    {
+//        startPage();
+//        List<FsStoreVisitScrm> list = fsStoreVisitService.selectFsStoreVisitList(fsStoreVisit);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeVisit:export')")
+//    @Log(title = "产品浏览分析", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsStoreVisitScrm fsStoreVisit)
+//    {
+//        List<FsStoreVisitScrm> list = fsStoreVisitService.selectFsStoreVisitList(fsStoreVisit);
+//        ExcelUtil<FsStoreVisitScrm> util = new ExcelUtil<FsStoreVisitScrm>(FsStoreVisitScrm.class);
+//        return util.exportExcel(list, "storeVisit");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeVisit:query')")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") Long id)
+//    {
+//        return AjaxResult.success(fsStoreVisitService.selectFsStoreVisitById(id));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeVisit:add')")
+//    @Log(title = "产品浏览分析", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsStoreVisitScrm fsStoreVisit)
+//    {
+//        return toAjax(fsStoreVisitService.insertFsStoreVisit(fsStoreVisit));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeVisit:edit')")
+//    @Log(title = "产品浏览分析", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsStoreVisitScrm fsStoreVisit)
+//    {
+//        return toAjax(fsStoreVisitService.updateFsStoreVisit(fsStoreVisit));
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('store:storeVisit:remove')")
+//    @Log(title = "产品浏览分析", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable Long[] ids)
+//    {
+//        return toAjax(fsStoreVisitService.deleteFsStoreVisitByIds(ids));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/admin/controller/store/SysOperlogScrmBridgeController.java

@@ -1,61 +1,61 @@
-package com.fs.admin.controller.store;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.hisStore.domain.SysOperLogScrm;
-import com.fs.hisStore.param.StoreOperMainQueryParam;
-import com.fs.hisStore.service.ISysOperLogScrmService;
-import com.fs.hisStore.vo.StoreOperMainVO;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 操作日志 Bridge Controller (fs-admin端)
- * 桥接 hisStore.SysOperlogScrmController，供平台总后台跨租户管理
- *
- * @author fs
- */
-@RestController
-@RequestMapping("/store/operlogScrm")
-public class SysOperlogScrmBridgeController extends BaseController
-{
-    private final ISysOperLogScrmService operLogService;
-
-    public SysOperlogScrmBridgeController(ISysOperLogScrmService operLogService) {
-        this.operLogService = operLogService;
-    }
-
-    @PreAuthorize("@ss.hasPermi('his:storeLog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(SysOperLogScrm operLog)
-    {
-        startPage();
-        List<SysOperLogScrm> list = operLogService.selectOperLogList(operLog);
-        return getDataTable(list);
-    }
-
-    @PreAuthorize("@ss.hasPermi('his:storeLog:list')")
-    @GetMapping("/getMains")
-    public R getMains(StoreOperMainQueryParam operLog)
-    {
-        List<StoreOperMainVO> list = operLogService.getMains(operLog);
-        return R.ok().put("data", list);
-    }
-
-    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('his:storeLog:export')")
-    @GetMapping("/export")
-    public AjaxResult export(SysOperLogScrm operLog)
-    {
-        List<SysOperLogScrm> list = operLogService.selectOperLogList(operLog);
-        ExcelUtil<SysOperLogScrm> util = new ExcelUtil<>(SysOperLogScrm.class);
-        return util.exportExcel(list, "操作日志");
-    }
-}
+//package com.fs.admin.controller.store;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.hisStore.domain.SysOperLogScrm;
+//import com.fs.hisStore.param.StoreOperMainQueryParam;
+//import com.fs.hisStore.service.ISysOperLogScrmService;
+//import com.fs.hisStore.vo.StoreOperMainVO;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.List;
+//
+///**
+// * 操作日志 Bridge Controller (fs-admin端)
+// * 桥接 hisStore.SysOperlogScrmController，供平台总后台跨租户管理
+// *
+// * @author fs
+// */
+//@RestController
+//@RequestMapping("/store/operlogScrm")
+//public class SysOperlogScrmBridgeController extends BaseController
+//{
+//    private final ISysOperLogScrmService operLogService;
+//
+//    public SysOperlogScrmBridgeController(ISysOperLogScrmService operLogService) {
+//        this.operLogService = operLogService;
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('his:storeLog:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(SysOperLogScrm operLog)
+//    {
+//        startPage();
+//        List<SysOperLogScrm> list = operLogService.selectOperLogList(operLog);
+//        return getDataTable(list);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('his:storeLog:list')")
+//    @GetMapping("/getMains")
+//    public R getMains(StoreOperMainQueryParam operLog)
+//    {
+//        List<StoreOperMainVO> list = operLogService.getMains(operLog);
+//        return R.ok().put("data", list);
+//    }
+//
+//    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('his:storeLog:export')")
+//    @GetMapping("/export")
+//    public AjaxResult export(SysOperLogScrm operLog)
+//    {
+//        List<SysOperLogScrm> list = operLogService.selectOperLogList(operLog);
+//        ExcelUtil<SysOperLogScrm> util = new ExcelUtil<>(SysOperLogScrm.class);
+//        return util.exportExcel(list, "操作日志");
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/billing/controller/WalletController.java

@@ -4,7 +4,6 @@ import com.fs.billing.dto.TenantBillingRequests;
 import com.fs.billing.service.BillingServices;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.SecurityUtils;
-import com.fs.framework.security.LoginUser;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 

fs-admin-saas/src/main/java/com/fs/chat/controller/ChatMsgController.java

@@ -9,12 +9,11 @@ import com.fs.chat.vo.ChatMsgListCVO;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -96,25 +95,26 @@ public class ChatMsgController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ChatMsg chatMsg)
     {
-        if (chatMsg.getStatus()!=null){
-            return toAjax(chatMsgService.updateChatMsg(chatMsg));
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        ChatMsg map = chatMsgService.selectChatMsgByMsgId(chatMsg.getMsgId());
-        ChatMsgLogs logs = new ChatMsgLogs();
-        logs.setMsgId(chatMsg.getMsgId());
-        logs.setLogsType(2);
-        if (chatMsg.getContent()!=null&&!chatMsg.getContent().equals("")){
-            logs.setContent(chatMsg.getContent());
-        }
-        String userContent = chatMsgService.selectUserContent(map.getMsgId(), map.getUserId(),map.getRoleId());
-        logs.setSContent(map.getContent());
-        logs.setUserContent(userContent);
-        logs.setCreateBy(loginUser.getCompanyUser().getNickName());
-        logs.setCompanyId(0L);
-        chatMsgLogsService.insertChatMsgLogs(logs);
-
-        return toAjax(chatMsgService.updateChatMsg(chatMsg));
+//        if (chatMsg.getStatus()!=null){
+//            return toAjax(chatMsgService.updateChatMsg(chatMsg));
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        ChatMsg map = chatMsgService.selectChatMsgByMsgId(chatMsg.getMsgId());
+//        ChatMsgLogs logs = new ChatMsgLogs();
+//        logs.setMsgId(chatMsg.getMsgId());
+//        logs.setLogsType(2);
+//        if (chatMsg.getContent()!=null&&!chatMsg.getContent().equals("")){
+//            logs.setContent(chatMsg.getContent());
+//        }
+//        String userContent = chatMsgService.selectUserContent(map.getMsgId(), map.getUserId(),map.getRoleId());
+//        logs.setSContent(map.getContent());
+//        logs.setUserContent(userContent);
+//        logs.setCreateBy(loginUser.getCompanyUser().getNickName());
+//        logs.setCompanyId(0L);
+//        chatMsgLogsService.insertChatMsgLogs(logs);
+//
+//        return toAjax(chatMsgService.updateChatMsg(chatMsg));
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/company/controller/workflow/LobsterPromptController.java

@@ -0,0 +1,109 @@
+package com.fs.company.controller.workflow;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.model.LoginUser;
+import com.fs.common.utils.ServletUtils;
+import com.fs.company.domain.LobsterSystemPrompt;
+import com.fs.company.param.LobsterPromptParam;
+import com.fs.company.service.workflow.ILobsterPromptService;
+import com.fs.framework.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * 龙虾系统提示词管理Controller
+ * 表: lobster_system_prompt
+ * 页面: Prompt管理 → 增删改查 + 租户/行业筛选 + 缓存刷新
+ */
+@RestController
+@RequestMapping("/workflow/lobster/prompt")
+public class LobsterPromptController extends BaseController {
+
+    @Autowired
+    private ILobsterPromptService promptService;
+
+    @Autowired
+    private TokenService tokenService;
+
+    @PreAuthorize("@ss.hasPermi('workflow:lobster:query')")
+    @GetMapping("/list")
+    public AjaxResult list(@RequestParam(defaultValue = "1") int page,
+                           @RequestParam(defaultValue = "10") int size,
+                           @RequestParam(required = false) String category,
+                           @RequestParam(required = false) String search) {
+        Map<String, Object> result = promptService.listPrompts(page, size, category, search);
+        return AjaxResult.success(result);
+    }
+
+    @PreAuthorize("@ss.hasPermi('workflow:lobster:query')")
+    @GetMapping("/{id}")
+    public AjaxResult getById(@PathVariable Long id) {
+        LobsterSystemPrompt row = promptService.getById(id);
+        return AjaxResult.success(row);
+    }
+
+    @PreAuthorize("@ss.hasPermi('workflow:lobster:edit')")
+    @PostMapping
+    public AjaxResult create(@RequestBody LobsterPromptParam param) {
+        if (param.getPromptContent() == null || param.getPromptContent().isEmpty()) {
+            return AjaxResult.error("提示词内容不能为空");
+        }
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+
+        LobsterSystemPrompt prompt = new LobsterSystemPrompt();
+        prompt.setPromptKey(UUID.randomUUID().toString());
+        prompt.setPromptName(param.getPromptName() != null ? param.getPromptName() : "自定义提示词");
+        prompt.setPromptCategory(param.getPromptCategory() != null ? param.getPromptCategory() : "custom");
+        prompt.setPromptContent(param.getPromptContent());
+        prompt.setModelName(param.getModelName() != null ? param.getModelName() : "doubao-lite");
+        prompt.setSystemRole(param.getSystemRole());
+        prompt.setIndustryType(param.getIndustryType());
+
+        promptService.create(prompt, loginUser.getUsername(), null);
+        return AjaxResult.success("创建成功");
+    }
+
+    @PreAuthorize("@ss.hasPermi('workflow:lobster:edit')")
+    @PutMapping("/{id}")
+    public AjaxResult update(@PathVariable Long id, @RequestBody LobsterPromptParam param) {
+        LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+
+        LobsterSystemPrompt prompt = new LobsterSystemPrompt();
+        prompt.setPromptName(param.getPromptName());
+        prompt.setPromptCategory(param.getPromptCategory());
+        prompt.setPromptContent(param.getPromptContent());
+        prompt.setModelName(param.getModelName());
+        prompt.setSystemRole(param.getSystemRole());
+        prompt.setIndustryType(param.getIndustryType());
+
+        promptService.update(id, prompt, null);
+        return AjaxResult.success("更新成功");
+    }
+
+    @PreAuthorize("@ss.hasPermi('workflow:lobster:edit')")
+    @DeleteMapping("/{id}")
+    public AjaxResult delete(@PathVariable Long id) {
+        int rows = promptService.softDelete(id);
+        if (rows == 0) {
+            return AjaxResult.error("删除失败：记录不存在");
+        }
+        return AjaxResult.success("删除成功");
+    }
+
+    @GetMapping("/categories")
+    public AjaxResult categories() {
+        List<String> cats = promptService.getCategories();
+        return AjaxResult.success(cats);
+    }
+
+    @PreAuthorize("@ss.hasPermi('workflow:lobster:edit')")
+    @PostMapping("/refresh-cache")
+    public AjaxResult refreshCache() {
+        promptService.refreshCache();
+        return AjaxResult.success("缓存已刷新");
+    }
+}

fs-admin-saas/src/main/java/com/fs/course/controller/FsCourseLinkController.java

@@ -4,8 +4,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;

fs-admin-saas/src/main/java/com/fs/course/controller/FsCoursePlaySourceConfigController.java

@@ -12,8 +12,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -26,7 +24,7 @@ import com.fs.course.param.FsCoursePlaySourceConfigEditParam;
 import com.fs.course.param.MiniProgramAgreementParam;
 import com.fs.course.service.IFsCoursePlaySourceConfigService;
 import com.fs.course.vo.FsCoursePlaySourceConfigVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.MiniProgramAgreement;
 import com.fs.his.service.MiniProgramAgreementService;
 import com.fs.system.service.ISysConfigService;
@@ -57,28 +55,29 @@ public class FsCoursePlaySourceConfigController extends BaseController {
                               @RequestParam(required = false, defaultValue = "10") Integer pageSize,
                               @RequestParam(required = false) Long companyId
     ) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("name", name);
-        params.put("appid", appid);
-        params.put("isMall", isMall);
-        params.put("companyId", companyId);
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        Long userId = null;
-        Long deptId = null;
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-            deptId = loginUser.getDeptId();
-            if(config.getDept() == null || !config.getDept()){
-                userId = loginUser.getUserId();
-            }
-        }
-        params.put("userId", userId);
-        params.put("deptId", deptId);
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<FsCoursePlaySourceConfigVO> list = fsCoursePlaySourceConfigService.selectCoursePlaySourceConfigVOListByMap(params);
-        return getDataTable(list);
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("name", name);
+//        params.put("appid", appid);
+//        params.put("isMall", isMall);
+//        params.put("companyId", companyId);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        Long userId = null;
+//        Long deptId = null;
+//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+//            deptId = loginUser.getDeptId();
+//            if(config.getDept() == null || !config.getDept()){
+//                userId = loginUser.getUserId();
+//            }
+//        }
+//        params.put("userId", userId);
+//        params.put("deptId", deptId);
+//
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<FsCoursePlaySourceConfigVO> list = fsCoursePlaySourceConfigService.selectCoursePlaySourceConfigVOListByMap(params);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('course:playSourceConfig:query')")
@@ -98,23 +97,24 @@ public class FsCoursePlaySourceConfigController extends BaseController {
     @Log(title = "点播播放源配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Valid @RequestBody FsCoursePlaySourceConfigCreateParam param) {
-        Wrapper<FsCoursePlaySourceConfig> queryWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaQuery()
-                .eq(FsCoursePlaySourceConfig::getAppid, param.getAppid())
-                .eq(FsCoursePlaySourceConfig::getIsDel, 0);
-        if (fsCoursePlaySourceConfigService.count(queryWrapper) > 0) {
-            return AjaxResult.error("appid已存在");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        FsCoursePlaySourceConfig config = new FsCoursePlaySourceConfig();
-        config.setCreateUserId(loginUser.getUserId());
-        config.setCreateDeptId(loginUser.getDeptId());
-        BeanUtils.copyProperties(param, config);
-
-        config.setIsDel(0);
-        config.setCreateTime(LocalDateTime.now());
-        config.setUpdateTime(LocalDateTime.now());
-        fsCoursePlaySourceConfigService.save(config);
-        return AjaxResult.success();
+//        Wrapper<FsCoursePlaySourceConfig> queryWrapper = Wrappers.<FsCoursePlaySourceConfig>lambdaQuery()
+//                .eq(FsCoursePlaySourceConfig::getAppid, param.getAppid())
+//                .eq(FsCoursePlaySourceConfig::getIsDel, 0);
+//        if (fsCoursePlaySourceConfigService.count(queryWrapper) > 0) {
+//            return AjaxResult.error("appid已存在");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        FsCoursePlaySourceConfig config = new FsCoursePlaySourceConfig();
+//        config.setCreateUserId(loginUser.getUserId());
+//        config.setCreateDeptId(loginUser.getDeptId());
+//        BeanUtils.copyProperties(param, config);
+//
+//        config.setIsDel(0);
+//        config.setCreateTime(LocalDateTime.now());
+//        config.setUpdateTime(LocalDateTime.now());
+//        fsCoursePlaySourceConfigService.save(config);
+//        return AjaxResult.success();
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('course:playSourceConfig:edit')")
@@ -176,17 +176,18 @@ public class FsCoursePlaySourceConfigController extends BaseController {
 
     @GetMapping("/listAll")
     public R listAll(Long companyId) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        QueryWrapper<FsCoursePlaySourceConfig> queryWrapper = new QueryWrapper<FsCoursePlaySourceConfig>().eq("is_del", 0);
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-            queryWrapper.eq("create_user_id", loginUser.getUserId()).eq(config.getDept() == null || !config.getDept(), "create_dept_id", loginUser.getDeptId());
-        }
-        if(companyId != null){
-            queryWrapper.and(e -> e.eq("company_id", companyId).or().isNull("company_id"));
-        }
-        return R.ok().put("data", fsCoursePlaySourceConfigService.list(queryWrapper));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        QueryWrapper<FsCoursePlaySourceConfig> queryWrapper = new QueryWrapper<FsCoursePlaySourceConfig>().eq("is_del", 0);
+//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+//            queryWrapper.eq("create_user_id", loginUser.getUserId()).eq(config.getDept() == null || !config.getDept(), "create_dept_id", loginUser.getDeptId());
+//        }
+//        if(companyId != null){
+//            queryWrapper.and(e -> e.eq("company_id", companyId).or().isNull("company_id"));
+//        }
+//        return R.ok().put("data", fsCoursePlaySourceConfigService.list(queryWrapper));
+        throw new RuntimeException("未实现");
     }
 
 

fs-admin-saas/src/main/java/com/fs/course/controller/FsCourseQuestionBankController.java

@@ -5,7 +5,6 @@ import cn.hutool.json.JSONUtil;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -15,7 +14,7 @@ import com.fs.course.domain.FsCourseQuestionBank;
 import com.fs.course.dto.FsCourseQuestionBankImportDTO;
 import com.fs.course.dto.ImportResultDTO;
 import com.fs.course.service.IFsCourseQuestionBankService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -50,16 +49,17 @@ public class FsCourseQuestionBankController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsCourseQuestionBank fsCourseQuestionBank)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null;
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsCourseQuestionBank.setUserId(userId);
-        }
-        List<FsCourseQuestionBank> list = fsCourseQuestionBankService.selectFsCourseQuestionBankList(fsCourseQuestionBank);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null;
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsCourseQuestionBank.setUserId(userId);
+//        }
+//        List<FsCourseQuestionBank> list = fsCourseQuestionBankService.selectFsCourseQuestionBankList(fsCourseQuestionBank);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -70,17 +70,18 @@ public class FsCourseQuestionBankController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsCourseQuestionBank fsCourseQuestionBank)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null;
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsCourseQuestionBank.setUserId(userId);
-        }
-
-        List<FsCourseQuestionBankImportDTO> list = fsCourseQuestionBankService.exportData(fsCourseQuestionBank);
-        ExcelUtil<FsCourseQuestionBankImportDTO> util = new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
-        return util.exportExcel(list, "题库数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null;
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsCourseQuestionBank.setUserId(userId);
+//        }
+//
+//        List<FsCourseQuestionBankImportDTO> list = fsCourseQuestionBankService.exportData(fsCourseQuestionBank);
+//        ExcelUtil<FsCourseQuestionBankImportDTO> util = new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
+//        return util.exportExcel(list, "题库数据");
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('course:courseQuestionBank:exportFail')")
@@ -111,16 +112,17 @@ public class FsCourseQuestionBankController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsCourseQuestionBank fsCourseQuestionBank)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsCourseQuestionBank.setCreateBy(loginUser.getCompanyUser().getNickName());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsCourseQuestionBank.setUserId(userId);
-        }
-
-        return toAjax(fsCourseQuestionBankService.insertFsCourseQuestionBank(fsCourseQuestionBank));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsCourseQuestionBank.setCreateBy(loginUser.getCompanyUser().getNickName());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsCourseQuestionBank.setUserId(userId);
+//        }
+//
+//        return toAjax(fsCourseQuestionBankService.insertFsCourseQuestionBank(fsCourseQuestionBank));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -157,33 +159,34 @@ public class FsCourseQuestionBankController extends BaseController
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
 
-        ExcelUtil<FsCourseQuestionBankImportDTO> util =
-                new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
-        List<FsCourseQuestionBankImportDTO> list =
-                util.importExcel(file.getInputStream());
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-
-        // 读取配置
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-
-        // 绑定状态控制 userId
-        Long finalUserId = (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound())
-                ? userId
-                : null;
-
-        // 调用 service
-        ImportResultDTO result =
-                fsCourseQuestionBankService.importData(list, loginUser.getCompanyUser().getNickName(), finalUserId);
-
-        // 返回 message + failList
-        Map<String, Object> resp = new HashMap<>();
-        resp.put("message", result.buildResultMessage());
-        resp.put("failList", result.getFailureList());
-
-        return AjaxResult.success(resp);
+//        ExcelUtil<FsCourseQuestionBankImportDTO> util =
+//                new ExcelUtil<>(FsCourseQuestionBankImportDTO.class);
+//        List<FsCourseQuestionBankImportDTO> list =
+//                util.importExcel(file.getInputStream());
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//
+//        // 读取配置
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//
+//        // 绑定状态控制 userId
+//        Long finalUserId = (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound())
+//                ? userId
+//                : null;
+//
+//        // 调用 service
+//        ImportResultDTO result =
+//                fsCourseQuestionBankService.importData(list, loginUser.getCompanyUser().getNickName(), finalUserId);
+//
+//        // 返回 message + failList
+//        Map<String, Object> resp = new HashMap<>();
+//        resp.put("message", result.buildResultMessage());
+//        resp.put("failList", result.getFailureList());
+//
+//        return AjaxResult.success(resp);
+        throw new RuntimeException("未实现");
     }
 
     @GetMapping(value = "/getByIds")

fs-admin-saas/src/main/java/com/fs/course/controller/FsCourseRedPacketLogController.java

@@ -4,7 +4,6 @@ import java.util.*;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.utils.ServletUtils;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.FsUserCoursePeriod;
@@ -13,7 +12,7 @@ import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.course.param.FsCourseRedPacketLogParam;
 import com.fs.course.service.IFsUserCoursePeriodService;
 import com.fs.course.vo.FsCourseRedPacketLogListPVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
@@ -183,17 +182,18 @@ public class FsCourseRedPacketLogController extends BaseController
     @GetMapping("/courseList")
     public R courseList()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        List<OptionsVO> optionsVOS;
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            optionsVOS = fsUserCourseMapper.selectFsUserCourseAllListByUserId(userId);
-        }else{
-            optionsVOS = fsUserCourseMapper.selectFsUserCourseAllList();
-        }
-        return R.ok().put("list", optionsVOS);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        List<OptionsVO> optionsVOS;
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            optionsVOS = fsUserCourseMapper.selectFsUserCourseAllListByUserId(userId);
+//        }else{
+//            optionsVOS = fsUserCourseMapper.selectFsUserCourseAllList();
+//        }
+//        return R.ok().put("list", optionsVOS);
+        throw new RuntimeException("未实现");
     }
 
     @GetMapping("/courseListByCompanyId/{companyId}")

fs-admin-saas/src/main/java/com/fs/course/controller/FsUserCourseCategoryController.java

@@ -3,10 +3,9 @@ package com.fs.course.controller;
 import java.util.List;
 
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.utils.ServletUtils;
 import com.fs.course.dto.FsCourseCategoryImportDTO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsStoreProductCategory;
 import com.fs.his.vo.FsStoreProductCategoryVO;
 
@@ -62,15 +61,16 @@ public class FsUserCourseCategoryController extends BaseController
     @GetMapping("/list")
     public AjaxResult list(FsUserCourseCategory fsUserCourseCategory)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseCategory.setUserId(userId);
-        }
-        List<FsUserCourseCategory> list = fsUserCourseCategoryService.selectFsUserCourseCategoryList(fsUserCourseCategory);
-        return AjaxResult.success(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseCategory.setUserId(userId);
+//        }
+//        List<FsUserCourseCategory> list = fsUserCourseCategoryService.selectFsUserCourseCategoryList(fsUserCourseCategory);
+//        return AjaxResult.success(list);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -81,16 +81,17 @@ public class FsUserCourseCategoryController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsUserCourseCategory fsUserCourseCategory)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseCategory.setUserId(userId);
-        }
-        List<FsUserCourseCategory> list = fsUserCourseCategoryService.selectFsUserCourseCategoryList(fsUserCourseCategory);
-        ExcelUtil<FsUserCourseCategory> util = new ExcelUtil<FsUserCourseCategory>(FsUserCourseCategory.class);
-        return util.exportExcel(list, "课堂分类数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseCategory.setUserId(userId);
+//        }
+//        List<FsUserCourseCategory> list = fsUserCourseCategoryService.selectFsUserCourseCategoryList(fsUserCourseCategory);
+//        ExcelUtil<FsUserCourseCategory> util = new ExcelUtil<FsUserCourseCategory>(FsUserCourseCategory.class);
+//        return util.exportExcel(list, "课堂分类数据");
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -111,14 +112,15 @@ public class FsUserCourseCategoryController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsUserCourseCategory fsUserCourseCategory)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseCategory.setUserId(userId);
-        }
-        return toAjax(fsUserCourseCategoryService.insertFsUserCourseCategory(fsUserCourseCategory));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseCategory.setUserId(userId);
+//        }
+//        return toAjax(fsUserCourseCategoryService.insertFsUserCourseCategory(fsUserCourseCategory));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -157,16 +159,17 @@ public class FsUserCourseCategoryController extends BaseController
     @GetMapping("/getCatePidList")
     public R getCatePidList()
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(userId);
-            return R.ok().put("data", list);
-        }
-        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList();
-        return R.ok().put("data", list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList(userId);
+//            return R.ok().put("data", list);
+//        }
+//        List<OptionsVO> list = fsUserCourseCategoryService.selectFsUserCourseCategoryPidList();
+//        return R.ok().put("data", list);
+        throw new RuntimeException("未实现");
     }
 
     //获取总分类下子分类
@@ -188,18 +191,19 @@ public class FsUserCourseCategoryController extends BaseController
     @PreAuthorize("@ss.hasPermi('course:userCourseCategory:importData')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file) throws Exception {
-        ExcelUtil<FsCourseCategoryImportDTO> util = new ExcelUtil<>(FsCourseCategoryImportDTO.class);
-        List<FsCourseCategoryImportDTO> list = util.importExcel(file.getInputStream());
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isEmpty(config.getIsBound()) || !config.getIsBound()){
-            userId = null;
-        }
-
-        return AjaxResult.success(fsUserCourseCategoryService.importData(list, userId));
+//        ExcelUtil<FsCourseCategoryImportDTO> util = new ExcelUtil<>(FsCourseCategoryImportDTO.class);
+//        List<FsCourseCategoryImportDTO> list = util.importExcel(file.getInputStream());
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isEmpty(config.getIsBound()) || !config.getIsBound()){
+//            userId = null;
+//        }
+//
+//        return AjaxResult.success(fsUserCourseCategoryService.importData(list, userId));
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('course:userCourseCategory:exportFail')")

fs-admin-saas/src/main/java/com/fs/course/controller/FsUserCourseController.java

@@ -7,7 +7,6 @@ import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -18,7 +17,7 @@ import com.fs.course.params.FsUserCourseConfigParam;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.course.service.IFsUserCourseVideoService;
 import com.fs.course.vo.FsUserCourseListPVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.RedisCacheUtil;
 import com.fs.his.vo.OptionsVO;
 import com.fs.qw.param.FsUserCourseRedPageParam;
@@ -63,16 +62,17 @@ public class FsUserCourseController extends BaseController {
     @PreAuthorize("@ss.hasPermi('course:userCourse:list')")
     @GetMapping("/list")
     public TableDataInfo list(FsUserCourse fsUserCourse) {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            fsUserCourse.setUserId(userId);
-        }
-        List<FsUserCourseListPVO> list = fsUserCourseService.selectFsUserCourseListPVO(fsUserCourse);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            fsUserCourse.setUserId(userId);
+//        }
+//        List<FsUserCourseListPVO> list = fsUserCourseService.selectFsUserCourseListPVO(fsUserCourse);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -81,16 +81,17 @@ public class FsUserCourseController extends BaseController {
     @PreAuthorize("@ss.hasPermi('course:userCourse:publicList')")
     @GetMapping("/publicList")
     public TableDataInfo publicList(FsUserCourse fsUserCourse) {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            fsUserCourse.setUserId(userId);
-        }
-        List<FsUserCourseListPVO> list = fsUserCourseService.selectFsUserCourseListPVO(fsUserCourse);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            fsUserCourse.setUserId(userId);
+//        }
+//        List<FsUserCourseListPVO> list = fsUserCourseService.selectFsUserCourseListPVO(fsUserCourse);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -100,16 +101,17 @@ public class FsUserCourseController extends BaseController {
     @Log(title = "课程", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(FsUserCourse fsUserCourse) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            fsUserCourse.setUserId(userId);
-        }
-        List<FsUserCourse> list = fsUserCourseService.selectFsUserCourseList(fsUserCourse);
-        ExcelUtil<FsUserCourse> util = new ExcelUtil<FsUserCourse>(FsUserCourse.class);
-        return util.exportExcel(list, "课程数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            fsUserCourse.setUserId(userId);
+//        }
+//        List<FsUserCourse> list = fsUserCourseService.selectFsUserCourseList(fsUserCourse);
+//        ExcelUtil<FsUserCourse> util = new ExcelUtil<FsUserCourse>(FsUserCourse.class);
+//        return util.exportExcel(list, "课程数据");
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -119,16 +121,17 @@ public class FsUserCourseController extends BaseController {
     @Log(title = "课程", businessType = BusinessType.EXPORT)
     @GetMapping("/publicExport")
     public AjaxResult publicExport(FsUserCourse fsUserCourse) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            fsUserCourse.setUserId(userId);
-        }
-        List<FsUserCourse> list = fsUserCourseService.selectFsUserCourseList(fsUserCourse);
-        ExcelUtil<FsUserCourse> util = new ExcelUtil<FsUserCourse>(FsUserCourse.class);
-        return util.exportExcel(list, "课程数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            fsUserCourse.setUserId(userId);
+//        }
+//        List<FsUserCourse> list = fsUserCourseService.selectFsUserCourseList(fsUserCourse);
+//        ExcelUtil<FsUserCourse> util = new ExcelUtil<FsUserCourse>(FsUserCourse.class);
+//        return util.exportExcel(list, "课程数据");
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -156,17 +159,18 @@ public class FsUserCourseController extends BaseController {
     @Log(title = "课程", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FsUserCourse fsUserCourse) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            fsUserCourse.setUserId(userId);
-        }
-        fsUserCourseService.insertFsUserCourse(fsUserCourse);
-        redisCacheUtil.delRedisKey("getCourseList");
-
-        return toAjax(1);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            fsUserCourse.setUserId(userId);
+//        }
+//        fsUserCourseService.insertFsUserCourse(fsUserCourse);
+//        redisCacheUtil.delRedisKey("getCourseList");
+//
+//        return toAjax(1);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -176,17 +180,18 @@ public class FsUserCourseController extends BaseController {
     @Log(title = "课程", businessType = BusinessType.INSERT)
     @PostMapping("/public")
     public AjaxResult publicAdd(@RequestBody FsUserCourse fsUserCourse) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            fsUserCourse.setUserId(userId);
-        }
-        fsUserCourseService.insertFsUserCourse(fsUserCourse);
-        redisCacheUtil.delRedisKey("getCourseList");
-
-        return toAjax(1);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = (loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : null);
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            fsUserCourse.setUserId(userId);
+//        }
+//        fsUserCourseService.insertFsUserCourse(fsUserCourse);
+//        redisCacheUtil.delRedisKey("getCourseList");
+//
+//        return toAjax(1);
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/course/controller/FsUserCourseTrainingCampController.java

@@ -5,7 +5,6 @@ import cn.hutool.json.JSONUtil;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.SortUtils;
@@ -15,7 +14,7 @@ import com.fs.course.dto.FsUserCourseTrainingCampDTO;
 import com.fs.course.dto.FsUserCourseTrainingCampUpdateDTO;
 import com.fs.course.service.IFsUserCourseTrainingCampService;
 import com.fs.course.vo.FsUserCourseTrainingCampVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
@@ -49,22 +48,23 @@ public class FsUserCourseTrainingCampController {
                            @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                            @RequestParam(required = false, defaultValue = "10") Integer pageSize)
     {
-        Map<String, Object> params = new HashMap<>();
-        params.put("trainingCampName", trainingCampName);
-        params.put("scs", SortUtils.parseSort(scs));
-        params.put("userId", userId);
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userIds = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            params.put("userIds", userIds);
-        }
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<FsUserCourseTrainingCampVO> list = fsUserCourseTrainingCampService.selectFsUserCourseTrainingCampVOListByMap(params);
-        return AjaxResult.success(new PageInfo<>(list));
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("trainingCampName", trainingCampName);
+//        params.put("scs", SortUtils.parseSort(scs));
+//        params.put("userId", userId);
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userIds = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            params.put("userIds", userIds);
+//        }
+//
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<FsUserCourseTrainingCampVO> list = fsUserCourseTrainingCampService.selectFsUserCourseTrainingCampVOListByMap(params);
+//        return AjaxResult.success(new PageInfo<>(list));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -77,16 +77,17 @@ public class FsUserCourseTrainingCampController {
     @PostMapping
     public AjaxResult add(@Valid @RequestBody FsUserCourseTrainingCampDTO params) {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userIds = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseTrainingCampService.add(params,userIds);
-            return AjaxResult.success();
-        }
-        fsUserCourseTrainingCampService.add(params,null);
-        return AjaxResult.success();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userIds = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseTrainingCampService.add(params,userIds);
+//            return AjaxResult.success();
+//        }
+//        fsUserCourseTrainingCampService.add(params,null);
+//        return AjaxResult.success();
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/course/controller/FsUserCourseVideoController.java

@@ -6,7 +6,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -22,7 +21,7 @@ import com.fs.course.param.CourseVideoUpdates;
 import com.fs.course.service.IFsUserCourseService;
 import com.fs.course.service.IFsUserCourseVideoService;
 import com.fs.course.vo.FsUserCourseVideoChooseVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
@@ -67,16 +66,17 @@ public class FsUserCourseVideoController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsUserCourseVideo fsUserCourseVideo)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseVideo.setUserId(userId);
-        }
-        startPage();
-        List<FsUserCourseVideo> list = fsUserCourseVideoService.selectFsUserCourseVideoList(fsUserCourseVideo);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseVideo.setUserId(userId);
+//        }
+//        startPage();
+//        List<FsUserCourseVideo> list = fsUserCourseVideoService.selectFsUserCourseVideoList(fsUserCourseVideo);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -87,16 +87,17 @@ public class FsUserCourseVideoController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsUserCourseVideo fsUserCourseVideo)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseVideo.setUserId(userId);
-        }
-        List<FsUserCourseVideo> list = fsUserCourseVideoService.selectFsUserCourseVideoList(fsUserCourseVideo);
-        ExcelUtil<FsUserCourseVideo> util = new ExcelUtil<FsUserCourseVideo>(FsUserCourseVideo.class);
-        return util.exportExcel(list, "课堂视频数据");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseVideo.setUserId(userId);
+//        }
+//        List<FsUserCourseVideo> list = fsUserCourseVideoService.selectFsUserCourseVideoList(fsUserCourseVideo);
+//        ExcelUtil<FsUserCourseVideo> util = new ExcelUtil<FsUserCourseVideo>(FsUserCourseVideo.class);
+//        return util.exportExcel(list, "课堂视频数据");
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -106,14 +107,15 @@ public class FsUserCourseVideoController extends BaseController
     @GetMapping(value = "/{videoId}")
     public AjaxResult getInfo(@PathVariable("videoId") Long videoId)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId,userId));
-        }
-        return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId,null));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId,userId));
+//        }
+//        return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId,null));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -124,21 +126,22 @@ public class FsUserCourseVideoController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsUserCourseVideo fsUserCourseVideo)
     {
-        Long count = fsUserCourseVideoMapper.selectFsUserCourseVideoByCourseSort(fsUserCourseVideo.getCourseId(),fsUserCourseVideo.getCourseSort());
-        if (count>0){
-            return AjaxResult.error("课程排序重复");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseVideo.setUserId(userId);
-        }
-        // 设置项目ID
-        FsUserCourse fsUserCourse = fsUserCourseService.selectFsUserCourseByCourseId(fsUserCourseVideo.getCourseId());
-        fsUserCourseVideo.setProjectId(fsUserCourse.getProject());
-        return toAjax(fsUserCourseVideoService.insertFsUserCourseVideo(fsUserCourseVideo));
+//        Long count = fsUserCourseVideoMapper.selectFsUserCourseVideoByCourseSort(fsUserCourseVideo.getCourseId(),fsUserCourseVideo.getCourseSort());
+//        if (count>0){
+//            return AjaxResult.error("课程排序重复");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseVideo.setUserId(userId);
+//        }
+//        // 设置项目ID
+//        FsUserCourse fsUserCourse = fsUserCourseService.selectFsUserCourseByCourseId(fsUserCourseVideo.getCourseId());
+//        fsUserCourseVideo.setProjectId(fsUserCourse.getProject());
+//        return toAjax(fsUserCourseVideoService.insertFsUserCourseVideo(fsUserCourseVideo));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -167,16 +170,17 @@ public class FsUserCourseVideoController extends BaseController
     @GetMapping("/getVideoListByCourseId")
     public TableDataInfo getVideoListByCourseId(FsUserCourseVideo fsUserCourseVideo)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            fsUserCourseVideo.setUserId(userId);
-        }
-        List<FsUserCourseVideo> list = fsUserCourseVideoService.selectFsUserCourseVideoListByCourseId(fsUserCourseVideo);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            fsUserCourseVideo.setUserId(userId);
+//        }
+//        List<FsUserCourseVideo> list = fsUserCourseVideoService.selectFsUserCourseVideoListByCourseId(fsUserCourseVideo);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     @GetMapping("/getVideoListByCourseIdAll")
@@ -210,18 +214,19 @@ public class FsUserCourseVideoController extends BaseController
     }
     @PostMapping("/batchSaveVideo")
     public R batchSaveVideo(@RequestBody BatchVideoSvae vo){
-        // 设置项目ID
-        FsUserCourse fsUserCourse = fsUserCourseService.selectFsUserCourseByCourseId(vo.getCourseId());
-        vo.setProjectId(fsUserCourse.getProject());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            vo.setUserId(userId);
-        }
-        fsUserCourseVideoService.batchSaveVideo(vo);
-        return R.ok();
+//        // 设置项目ID
+//        FsUserCourse fsUserCourse = fsUserCourseService.selectFsUserCourseByCourseId(vo.getCourseId());
+//        vo.setProjectId(fsUserCourse.getProject());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            vo.setUserId(userId);
+//        }
+//        fsUserCourseVideoService.batchSaveVideo(vo);
+//        return R.ok();
+        throw new RuntimeException("未实现");
     }
     @PostMapping("/batchUpdateRed")
     @Log(title = "按课程批量保存设置红包金额", businessType = BusinessType.UPDATE)
@@ -249,20 +254,21 @@ public class FsUserCourseVideoController extends BaseController
     public R getChooseCourseVideoList(@RequestParam(required = false) Long courseId,
                                       @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                       @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getCompanyUser().getUserId();
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-
-        Map<String,Object> params = new HashMap<>();
-        params.put("courseId", courseId);
-        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
-            params.put("userId", userId);
-        }
-
-        PageHelper.startPage(pageNum, pageSize);
-        List<FsUserCourseVideoChooseVO> list = fsUserCourseVideoService.getChooseCourseVideoListByMap(params);
-        return R.ok().put("data", new PageInfo<>(list));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//
+//        Map<String,Object> params = new HashMap<>();
+//        params.put("courseId", courseId);
+//        if (ObjectUtil.isNotEmpty(config.getIsBound())&&config.getIsBound()){
+//            params.put("userId", userId);
+//        }
+//
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<FsUserCourseVideoChooseVO> list = fsUserCourseVideoService.getChooseCourseVideoListByMap(params);
+//        return R.ok().put("data", new PageInfo<>(list));
+        throw new RuntimeException("未实现");
     }
 
     @ApiOperation("视频下架")

fs-admin-saas/src/main/java/com/fs/course/controller/FsVideoResourceController.java

@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -20,7 +19,7 @@ import com.fs.course.service.IFsUserCourseVideoService;
 import com.fs.course.service.IFsUserVideoService;
 import com.fs.course.service.IFsVideoResourceService;
 import com.fs.course.vo.FsVideoResourceVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
@@ -68,29 +67,30 @@ public class FsVideoResourceController extends BaseController {
                               @RequestParam(required = false) Integer typeSubId,
                               @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                               @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("resourceName", resourceName);
-        params.put("fileName", fileName);
-        params.put("typeId", typeId);
-        params.put("typeSubId", typeSubId);
-        LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = null;
-        if (json != null && !json.isEmpty()) {
-            try {
-                config = JSONUtil.toBean(json, CourseConfig.class);
-            } catch (Exception e) {
-                log.warn("解析course.config失败: {}", e.getMessage());
-            }
-        }
-        if (config != null && ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            if (loginUser.getCompanyUser() != null) {
-                params.put("userId", loginUser.getCompanyUser().getUserId());
-            }
-        }
-        PageHelper.startPage(pageNum, pageSize);
-        List<FsVideoResourceVO> list = fsVideoResourceService.selectVideoResourceListByMap(params);
-        return getDataTable(list);
+//        Map<String, Object> params = new HashMap<>();
+//        params.put("resourceName", resourceName);
+//        params.put("fileName", fileName);
+//        params.put("typeId", typeId);
+//        params.put("typeSubId", typeSubId);
+//        LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = null;
+//        if (json != null && !json.isEmpty()) {
+//            try {
+//                config = JSONUtil.toBean(json, CourseConfig.class);
+//            } catch (Exception e) {
+//                log.warn("解析course.config失败: {}", e.getMessage());
+//            }
+//        }
+//        if (config != null && ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            if (loginUser.getCompanyUser() != null) {
+//                params.put("userId", loginUser.getCompanyUser().getUserId());
+//            }
+//        }
+//        PageHelper.startPage(pageNum, pageSize);
+//        List<FsVideoResourceVO> list = fsVideoResourceService.selectVideoResourceListByMap(params);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
 
@@ -110,33 +110,34 @@ public class FsVideoResourceController extends BaseController {
     @Log(title = "视频素材库", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FsVideoResource fsVideoResource) {
-        LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = null;
-        if (json != null && !json.isEmpty()) {
-            try {
-                config = JSONUtil.toBean(json, CourseConfig.class);
-            } catch (Exception e) {
-                log.warn("解析course.config失败: {}", e.getMessage());
-            }
-        }
-        if (config != null && ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
-            if (loginUser.getCompanyUser() != null) {
-                fsVideoResource.setUserId(loginUser.getCompanyUser().getUserId());
-            }
-        }
-
-        fsVideoResource.setCreateTime(LocalDateTime.now());
-        boolean save = fsVideoResourceService.save(fsVideoResource);
-        if (save&&StringUtils.isNotEmpty(fsVideoResource.getHsyVid())){
-            try {
-                fsUserCourseVideoService.updateMediaPublishStatus(fsVideoResource.getHsyVid());
-                log.info("更新视频发布状态成功，hsyVid: {}", fsVideoResource.getHsyVid());
-            } catch (Exception e) {
-                log.error("更新视频发布状态失败，hsyVid: {}, 错误: {}", fsVideoResource.getHsyVid(), e.getMessage());
-            }
-        }
-        return AjaxResult.success();
+//        LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = null;
+//        if (json != null && !json.isEmpty()) {
+//            try {
+//                config = JSONUtil.toBean(json, CourseConfig.class);
+//            } catch (Exception e) {
+//                log.warn("解析course.config失败: {}", e.getMessage());
+//            }
+//        }
+//        if (config != null && ObjectUtil.isNotEmpty(config.getIsBound()) && config.getIsBound()) {
+//            if (loginUser.getCompanyUser() != null) {
+//                fsVideoResource.setUserId(loginUser.getCompanyUser().getUserId());
+//            }
+//        }
+//
+//        fsVideoResource.setCreateTime(LocalDateTime.now());
+//        boolean save = fsVideoResourceService.save(fsVideoResource);
+//        if (save&&StringUtils.isNotEmpty(fsVideoResource.getHsyVid())){
+//            try {
+//                fsUserCourseVideoService.updateMediaPublishStatus(fsVideoResource.getHsyVid());
+//                log.info("更新视频发布状态成功，hsyVid: {}", fsVideoResource.getHsyVid());
+//            } catch (Exception e) {
+//                log.error("更新视频发布状态失败，hsyVid: {}, 错误: {}", fsVideoResource.getHsyVid(), e.getMessage());
+//            }
+//        }
+//        return AjaxResult.success();
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -211,42 +212,43 @@ public class FsVideoResourceController extends BaseController {
     @Log(title = "视频素材库", businessType = BusinessType.INSERT)
     @PostMapping("/batchAddVideoResource")
     public AjaxResult batchAddVideoResource(@RequestBody List<FsVideoResource> list) {
-        if (Objects.isNull(list) || list.isEmpty()) {
-            return AjaxResult.error("数据不能为空");
-        }
-        LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = null;
-        if (json != null && !json.isEmpty()) {
-            try {
-                config = JSONUtil.toBean(json, CourseConfig.class);
-            } catch (Exception e) {
-                log.warn("解析course.config失败: {}", e.getMessage());
-            }
-        }
-        final CourseConfig finalConfig = config;
-        list.forEach(v -> {
-            v.setCreateTime(LocalDateTime.now());
-            if (finalConfig != null && ObjectUtil.isNotEmpty(finalConfig.getIsBound()) && finalConfig.getIsBound()) {
-                if (loginUser.getCompanyUser() != null) {
-                    v.setUserId(loginUser.getCompanyUser().getUserId());
-                }
-            }
-        });
-        boolean saveStatus = fsVideoResourceService.saveBatch(list);
-        if (saveStatus) {
-            list.forEach(fsVideoResource -> {
-                // 检查hsyVid是否存在且不为空
-                if (ObjectUtil.isNotEmpty(fsVideoResource.getHsyVid())) {
-                    try {
-                        fsUserCourseVideoService.updateMediaPublishStatus(fsVideoResource.getHsyVid());
-                        log.info("更新视频发布状态成功，hsyVid: {}", fsVideoResource.getHsyVid());
-                    } catch (Exception e) {
-                        log.error("更新视频发布状态失败，hsyVid: {}, 错误: {}", fsVideoResource.getHsyVid(), e.getMessage());
-                    }
-                }
-            });
-        }
-        return AjaxResult.success();
+//        if (Objects.isNull(list) || list.isEmpty()) {
+//            return AjaxResult.error("数据不能为空");
+//        }
+//        LoginUser loginUser = (LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = null;
+//        if (json != null && !json.isEmpty()) {
+//            try {
+//                config = JSONUtil.toBean(json, CourseConfig.class);
+//            } catch (Exception e) {
+//                log.warn("解析course.config失败: {}", e.getMessage());
+//            }
+//        }
+//        final CourseConfig finalConfig = config;
+//        list.forEach(v -> {
+//            v.setCreateTime(LocalDateTime.now());
+//            if (finalConfig != null && ObjectUtil.isNotEmpty(finalConfig.getIsBound()) && finalConfig.getIsBound()) {
+//                if (loginUser.getCompanyUser() != null) {
+//                    v.setUserId(loginUser.getCompanyUser().getUserId());
+//                }
+//            }
+//        });
+//        boolean saveStatus = fsVideoResourceService.saveBatch(list);
+//        if (saveStatus) {
+//            list.forEach(fsVideoResource -> {
+//                // 检查hsyVid是否存在且不为空
+//                if (ObjectUtil.isNotEmpty(fsVideoResource.getHsyVid())) {
+//                    try {
+//                        fsUserCourseVideoService.updateMediaPublishStatus(fsVideoResource.getHsyVid());
+//                        log.info("更新视频发布状态成功，hsyVid: {}", fsVideoResource.getHsyVid());
+//                    } catch (Exception e) {
+//                        log.error("更新视频发布状态失败，hsyVid: {}, 错误: {}", fsVideoResource.getHsyVid(), e.getMessage());
+//                    }
+//                }
+//            });
+//        }
+//        return AjaxResult.success();
+        throw new RuntimeException("未实现");
     }
 }

fs-admin-saas/src/main/java/com/fs/crm/controller/CrmCustomerAssignController.java

@@ -4,7 +4,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -12,7 +11,7 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.crm.domain.CrmCustomerAssign;
 import com.fs.crm.service.ICrmCustomerAssignService;
 import com.fs.crm.vo.CrmCustomerAssignListVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -72,9 +71,10 @@ public class CrmCustomerAssignController extends BaseController
     @PostMapping("/cancel")
     public R cancel(@RequestBody CrmCustomerAssign crmCustomerAssign)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        return crmCustomerAssignService.cancel(crmCustomerAssign,operName);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        return crmCustomerAssignService.cancel(crmCustomerAssign,operName);
+        throw new RuntimeException("未实现");
     }
 
 

fs-admin-saas/src/main/java/com/fs/crm/controller/CrmCustomerController.java

@@ -6,8 +6,6 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysRole;
 import com.fs.common.core.domain.entity.SysUser;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -21,7 +19,7 @@ import com.fs.crm.param.*;
 import com.fs.crm.service.ICrmCustomerService;
 import com.fs.crm.vo.CrmCustomerExportVO;
 import com.fs.crm.vo.CrmCustomerListVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysRoleService;
 import com.github.pagehelper.PageHelper;
 import org.springframework.beans.BeanUtils;
@@ -127,12 +125,13 @@ public class CrmCustomerController extends BaseController
     @PostMapping("/importLineData")
     public AjaxResult importLineData(MultipartFile file) throws Exception
     {
-        ExcelUtil<CrmLineCustomerImportParam> util = new ExcelUtil<CrmLineCustomerImportParam>(CrmLineCustomerImportParam.class);
-        List<CrmLineCustomerImportParam> list = util.importExcel(file.getInputStream());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        String message = crmCustomerService.importLineCustomer(list, operName);
-        return AjaxResult.success(message);
+//        ExcelUtil<CrmLineCustomerImportParam> util = new ExcelUtil<CrmLineCustomerImportParam>(CrmLineCustomerImportParam.class);
+//        List<CrmLineCustomerImportParam> list = util.importExcel(file.getInputStream());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        String message = crmCustomerService.importLineCustomer(list, operName);
+//        return AjaxResult.success(message);
+        throw new RuntimeException("未实现");
     }
 
     //下载模板
@@ -172,18 +171,20 @@ public class CrmCustomerController extends BaseController
     @PreAuthorize("@ss.hasPermi('crm:customer:assign')")
     @PostMapping("/assign")
     public R assign(@RequestBody CrmCustomeAssignCompanyParam crmCustomer) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        return crmCustomerService.assignCompany(crmCustomer,loginUser.getUsername(),loginUser.getCompanyUser().getUserId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        return crmCustomerService.assignCompany(crmCustomer,loginUser.getUsername(),loginUser.getCompanyUser().getUserId());
+        throw new RuntimeException("未实现");
     }
 
     //批量分配客户给公司
     @PreAuthorize("@ss.hasPermi('crm:customer:assign')")
     @PostMapping("/assignCrmToCompany")
     public R assignCrmToCompany(@RequestBody CrmCompanyAssignParam crmCustomer) {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String operName = loginUser.getUsername();
-        return crmCustomerService.assignCompanys(crmCustomer,loginUser.getUsername(),loginUser.getCompanyUser().getUserId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String operName = loginUser.getUsername();
+//        return crmCustomerService.assignCompanys(crmCustomer,loginUser.getUsername(),loginUser.getCompanyUser().getUserId());
+        throw new RuntimeException("未实现");
     }
 
 
@@ -213,20 +214,21 @@ public class CrmCustomerController extends BaseController
     @Autowired
     private ISysRoleService sysRoleService;
     private SysRole isCheckPermission() {
-        SysRole sysRole = new SysRole();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        boolean flag = user.isAdmin();
-        if (flag) {
-            sysRole.setIsCheckPhone(1);
-            sysRole.setIsCheckAddress(1);
-        } else {
-            List<SysRole> roles = user.getRoles();
-            if (roles != null && !roles.isEmpty()) {
-                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
-                return sysRoleService.getIsCheckPermission(roleIds);
-            }
-        }
-        return sysRole;
+//        SysRole sysRole = new SysRole();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        boolean flag = user.isAdmin();
+//        if (flag) {
+//            sysRole.setIsCheckPhone(1);
+//            sysRole.setIsCheckAddress(1);
+//        } else {
+//            List<SysRole> roles = user.getRoles();
+//            if (roles != null && !roles.isEmpty()) {
+//                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
+//                return sysRoleService.getIsCheckPermission(roleIds);
+//            }
+//        }
+//        return sysRole;
+        throw new RuntimeException("未实现");
     }
 
 

fs-admin-saas/src/main/java/com/fs/crm/controller/CrmCustomerThirdController.java

@@ -3,14 +3,13 @@ package com.fs.crm.controller;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.crm.domain.CrmCustomerThird;
 import com.fs.crm.service.ICrmCustomerThirdService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -76,9 +75,10 @@ public class CrmCustomerThirdController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CrmCustomerThird crmCustomerThird)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        crmCustomerThird.setCreateUserId(loginUser.getCompanyUser().getUserId());
-        return toAjax(crmCustomerThirdService.insertCrmCustomerThird(crmCustomerThird));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        crmCustomerThird.setCreateUserId(loginUser.getCompanyUser().getUserId());
+//        return toAjax(crmCustomerThirdService.insertCrmCustomerThird(crmCustomerThird));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -89,9 +89,10 @@ public class CrmCustomerThirdController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody CrmCustomerThird crmCustomerThird)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        crmCustomerThird.setUpdateUserId(loginUser.getCompanyUser().getUserId());
-        return toAjax(crmCustomerThirdService.updateCrmCustomerThird(crmCustomerThird));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        crmCustomerThird.setUpdateUserId(loginUser.getCompanyUser().getUserId());
+//        return toAjax(crmCustomerThirdService.updateCrmCustomerThird(crmCustomerThird));
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/crm/controller/ReportController.java

@@ -2,14 +2,13 @@ package com.fs.crm.controller;
 
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.crm.domain.Report;
-import com.fs.framework.service.TokenService;
 import com.fs.crm.param.ReportParam;
 import com.fs.crm.service.ReportService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,26 +27,28 @@ public class ReportController extends BaseController {
     @GetMapping("/reportList")
     public TableDataInfo getReport(ReportParam param, HttpServletRequest request)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        Long userId = loginUser.getCompanyUser().getUserId();
-        param.setCompanyUserId(userId);
-        List<Report> list = reportService.getReport(param);
-        return getDataTable(list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        param.setCompanyUserId(userId);
+//        List<Report> list = reportService.getReport(param);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
     @GetMapping("/export")
     public AjaxResult export(ReportParam param,HttpServletRequest request)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(request);
-
-        Long userId = loginUser.getCompanyUser().getUserId();
-        param.setCompanyUserId(userId);
-        List<Report> list = reportService.getReport(param);
-        if (CollectionUtils.isEmpty(list)){
-            return AjaxResult.error("请选择导出数据");
-        }
-        ExcelUtil<Report> util = new ExcelUtil<Report>(Report.class);
-        return util.exportExcel(list, "report");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(request);
+//
+//        Long userId = loginUser.getCompanyUser().getUserId();
+//        param.setCompanyUserId(userId);
+//        List<Report> list = reportService.getReport(param);
+//        if (CollectionUtils.isEmpty(list)){
+//            return AjaxResult.error("请选择导出数据");
+//        }
+//        ExcelUtil<Report> util = new ExcelUtil<Report>(Report.class);
+//        return util.exportExcel(list, "report");
+        throw new RuntimeException("未实现");
     }
 
 }

fs-admin-saas/src/main/java/com/fs/his/controller/FsCompanyController.java

@@ -6,7 +6,6 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.enums.DataSourceType;
 import com.fs.common.utils.SecurityUtils;
 import com.fs.common.utils.ServletUtils;
@@ -24,7 +23,7 @@ import com.fs.core.utils.OrderCodeUtils;
 import com.fs.course.config.CourseConfig;
 import com.fs.framework.datasource.DynamicDataSourceContextHolder;
 import com.fs.framework.datasource.TenantDataSourceManager;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.mapper.FsDoctorMapper;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
@@ -88,30 +87,32 @@ public class FsCompanyController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(Company company)
     {
-        startPage();
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-            company.setDeptId(loginUser.getDeptId());
-        }
-        List<CompanyVO> list = companyService.selectCompanyListVO(company);
-        return getDataTable(list);
+//        startPage();
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+//            company.setDeptId(loginUser.getDeptId());
+//        }
+//        List<CompanyVO> list = companyService.selectCompanyListVO(company);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     @GetMapping("/companyList")
     public R companyList()
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Long depId = null;
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-            depId = loginUser.getDeptId();
-        }
-        List<OptionsVO> list = companyService.selectAllCompanyList(depId);
-        return R.ok().put("data",list);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long depId = null;
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+//            depId = loginUser.getDeptId();
+//        }
+//        List<OptionsVO> list = companyService.selectAllCompanyList(depId);
+//        return R.ok().put("data",list);
+        throw new RuntimeException("未实现");
     }
     /**
      * 导出诊所管理列表
@@ -160,17 +161,18 @@ public class FsCompanyController extends BaseController {
     @PostMapping
     public R add(@RequestBody Company company, HttpServletRequest request)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        String json = configService.selectConfigByKey("course.config");
-        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-            company.setDeptId(loginUser.getDeptId());
-        }
-
-        if (isQuantityExceeded(request)){
-            return R.error("公司数量已达上限");
-        }
-        return companyService.insertCompany(company);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        String json = configService.selectConfigByKey("course.config");
+//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+//            company.setDeptId(loginUser.getDeptId());
+//        }
+//
+//        if (isQuantityExceeded(request)){
+//            return R.error("公司数量已达上限");
+//        }
+//        return companyService.insertCompany(company);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -226,22 +228,23 @@ public class FsCompanyController extends BaseController {
     @RepeatSubmit
     public R recharge(@RequestBody CompanyRechargeParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyRecharge recharge=new CompanyRecharge();
-        String orderSn =  OrderCodeUtils.getOrderSn();
-        if(StringUtils.isEmpty(orderSn)){
-            return R.error("订单生成失败，请重试");
-        }
-        recharge.setRechargeNo(orderSn);
-        recharge.setCompanyId(param.getCompanyId());
-        recharge.setMoney(param.getMoney());
-        recharge.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
-        recharge.setIsAudit(0);
-        recharge.setStatus(0);
-        recharge.setRemark(param.getRemark());
-        recharge.setPayType(3);
-        rechargeService.insertCompanyRecharge(recharge);
-        return R.ok("提交成功,等待审核");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyRecharge recharge=new CompanyRecharge();
+//        String orderSn =  OrderCodeUtils.getOrderSn();
+//        if(StringUtils.isEmpty(orderSn)){
+//            return R.error("订单生成失败，请重试");
+//        }
+//        recharge.setRechargeNo(orderSn);
+//        recharge.setCompanyId(param.getCompanyId());
+//        recharge.setMoney(param.getMoney());
+//        recharge.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
+//        recharge.setIsAudit(0);
+//        recharge.setStatus(0);
+//        recharge.setRemark(param.getRemark());
+//        recharge.setPayType(3);
+//        rechargeService.insertCompanyRecharge(recharge);
+//        return R.ok("提交成功,等待审核");
+        throw new RuntimeException("未实现");
 
     }
 
@@ -260,23 +263,24 @@ public class FsCompanyController extends BaseController {
     @RepeatSubmit
     public R redRecharge(@RequestBody CompanyRechargeParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyRecharge redRecharge=new CompanyRecharge();
-        String orderSn =  OrderCodeUtils.getOrderSn();
-        if(StringUtils.isEmpty(orderSn)){
-            return R.error("订单生成失败，请重试");
-        }
-        redRecharge.setRechargeNo(orderSn);
-        redRecharge.setCompanyId(param.getCompanyId());
-        redRecharge.setMoney(param.getMoney());
-        redRecharge.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
-        redRecharge.setIsAudit(0);
-        redRecharge.setStatus(0);
-        redRecharge.setRemark(param.getRemark());
-        redRecharge.setPayType(3);
-        redRecharge.setBusinessType(1);// 红包充值
-        rechargeService.insertCompanyRecharge(redRecharge);
-        return R.ok("提交成功,等待审核");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyRecharge redRecharge=new CompanyRecharge();
+//        String orderSn =  OrderCodeUtils.getOrderSn();
+//        if(StringUtils.isEmpty(orderSn)){
+//            return R.error("订单生成失败，请重试");
+//        }
+//        redRecharge.setRechargeNo(orderSn);
+//        redRecharge.setCompanyId(param.getCompanyId());
+//        redRecharge.setMoney(param.getMoney());
+//        redRecharge.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
+//        redRecharge.setIsAudit(0);
+//        redRecharge.setStatus(0);
+//        redRecharge.setRemark(param.getRemark());
+//        redRecharge.setPayType(3);
+//        redRecharge.setBusinessType(1);// 红包充值
+//        rechargeService.insertCompanyRecharge(redRecharge);
+//        return R.ok("提交成功,等待审核");
+        throw new RuntimeException("未实现");
 
     }
 
@@ -287,21 +291,22 @@ public class FsCompanyController extends BaseController {
     @RepeatSubmit
     public R redDeduct(@RequestBody CompanyDeductParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        CompanyDeduct deduct=new CompanyDeduct();
-        String orderSn =  OrderCodeUtils.getOrderSn();
-        if(StringUtils.isEmpty(orderSn)){
-            return R.error("订单生成失败，请重试");
-        }
-        deduct.setDeductNo(orderSn);
-        deduct.setCompanyId(param.getCompanyId());
-        deduct.setMoney(param.getMoney());
-        deduct.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
-        deduct.setIsAudit(0);
-        deduct.setRemark(param.getRemark());
-        deduct.setBusinessType(1); // 红包扣款
-        deductService.insertCompanyDeduct(deduct);
-        return R.ok("提交成功,等待审核");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        CompanyDeduct deduct=new CompanyDeduct();
+//        String orderSn =  OrderCodeUtils.getOrderSn();
+//        if(StringUtils.isEmpty(orderSn)){
+//            return R.error("订单生成失败，请重试");
+//        }
+//        deduct.setDeductNo(orderSn);
+//        deduct.setCompanyId(param.getCompanyId());
+//        deduct.setMoney(param.getMoney());
+//        deduct.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
+//        deduct.setIsAudit(0);
+//        deduct.setRemark(param.getRemark());
+//        deduct.setBusinessType(1); // 红包扣款
+//        deductService.insertCompanyDeduct(deduct);
+//        return R.ok("提交成功,等待审核");
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('his:company:deduct')")
@@ -311,22 +316,23 @@ public class FsCompanyController extends BaseController {
     @RepeatSubmit
     public R deduct(@RequestBody CompanyDeductParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        Company company = companyService.selectCompanyById(param.getCompanyId());
-        CompanyDeduct deduct=new CompanyDeduct();
-        String orderSn =  OrderCodeUtils.getOrderSn();
-        if(StringUtils.isEmpty(orderSn)){
-            return R.error("订单生成失败，请重试");
-        }
-        deduct.setDeductNo(orderSn);
-        deduct.setCompanyId(param.getCompanyId());
-        deduct.setMoney(param.getMoney());
-        deduct.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
-        deduct.setIsAudit(0);
-        deduct.setBalance(company.getMoney());
-        deduct.setRemark(param.getRemark());
-        deductService.insertCompanyDeduct(deduct);
-        return R.ok("提交成功,等待审核");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        Company company = companyService.selectCompanyById(param.getCompanyId());
+//        CompanyDeduct deduct=new CompanyDeduct();
+//        String orderSn =  OrderCodeUtils.getOrderSn();
+//        if(StringUtils.isEmpty(orderSn)){
+//            return R.error("订单生成失败，请重试");
+//        }
+//        deduct.setDeductNo(orderSn);
+//        deduct.setCompanyId(param.getCompanyId());
+//        deduct.setMoney(param.getMoney());
+//        deduct.setCreateUserId(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getUserId() : loginUser.getUserId());
+//        deduct.setIsAudit(0);
+//        deduct.setBalance(company.getMoney());
+//        deduct.setRemark(param.getRemark());
+//        deductService.insertCompanyDeduct(deduct);
+//        return R.ok("提交成功,等待审核");
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/his/controller/FsCompanyDeductController.java

@@ -1,4 +1,5 @@
 package com.fs.his.controller;
+import com.fs.framework.web.service.TokenService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -8,7 +9,6 @@ import java.util.List;
 
 import com.fs.common.annotation.RepeatSubmit;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
@@ -18,8 +18,6 @@ import com.fs.company.service.ICompanyDeductService;
 import com.fs.company.service.ICompanyMoneyLogsService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyDeductVO;
-import com.fs.framework.service.TokenService;
-import lombok.Synchronized;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -134,37 +132,38 @@ public class FsCompanyDeductController extends BaseController
     @RepeatSubmit
     public R audit(@RequestBody CompanyDeduct param)
     {
-        CompanyDeduct deduct=companyDeductService.selectCompanyDeductById(param.getDeductId());
-        if(deduct.getIsAudit()!=0){
-            return R.error("非法操作");
-        }
-        deduct.setIsAudit(param.getIsAudit());
-        deduct.setRemark(param.getRemark());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if(deduct.getIsAudit()==1){
-            if(1==param.getBusinessType()){// 红包充值
-                // 更新红包充值余额redis字段
-                companyService.redPacketTopUpCompany(deduct.getCompanyId(),deduct.getMoney(),"2");
-            }else {
-                Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
-                company.setMoney(company.getMoney().subtract(deduct.getMoney()));
-                deduct.setBalance(company.getMoney());
-                companyService.updateCompany(company);
-                //生成流水
-                CompanyMoneyLogs log=new CompanyMoneyLogs();
-                log.setCompanyId(deduct.getCompanyId());
-                log.setMoney(deduct.getMoney().multiply(new BigDecimal(-1)));
-                log.setRemark(deduct.getRemark());
-                log.setLogsType(2);
-                log.setBalance(company.getMoney());
-                log.setCreateTime(new Date());
-                moneyLogsService.insertCompanyMoneyLogs(log);
-            }
-        }
-        deduct.setAuditTime(new Date());
-        deduct.setAuditUserId(loginUser.getCompanyUser().getUserId());
-        companyDeductService.updateCompanyDeduct(deduct);
-        return R.ok("操作成功");
+//        CompanyDeduct deduct=companyDeductService.selectCompanyDeductById(param.getDeductId());
+//        if(deduct.getIsAudit()!=0){
+//            return R.error("非法操作");
+//        }
+//        deduct.setIsAudit(param.getIsAudit());
+//        deduct.setRemark(param.getRemark());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if(deduct.getIsAudit()==1){
+//            if(1==param.getBusinessType()){// 红包充值
+//                // 更新红包充值余额redis字段
+//                companyService.redPacketTopUpCompany(deduct.getCompanyId(),deduct.getMoney(),"2");
+//            }else {
+//                Company company=companyService.selectCompanyByIdForUpdate(deduct.getCompanyId());
+//                company.setMoney(company.getMoney().subtract(deduct.getMoney()));
+//                deduct.setBalance(company.getMoney());
+//                companyService.updateCompany(company);
+//                //生成流水
+//                CompanyMoneyLogs log=new CompanyMoneyLogs();
+//                log.setCompanyId(deduct.getCompanyId());
+//                log.setMoney(deduct.getMoney().multiply(new BigDecimal(-1)));
+//                log.setRemark(deduct.getRemark());
+//                log.setLogsType(2);
+//                log.setBalance(company.getMoney());
+//                log.setCreateTime(new Date());
+//                moneyLogsService.insertCompanyMoneyLogs(log);
+//            }
+//        }
+//        deduct.setAuditTime(new Date());
+//        deduct.setAuditUserId(loginUser.getCompanyUser().getUserId());
+//        companyDeductService.updateCompanyDeduct(deduct);
+//        return R.ok("操作成功");
+        throw new RuntimeException("未实现");
 
     }
 

fs-admin-saas/src/main/java/com/fs/his/controller/FsCompanyRechargeController.java

@@ -1,4 +1,5 @@
 package com.fs.his.controller;
+import com.fs.framework.web.service.TokenService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -6,7 +7,6 @@ import java.util.Date;
 import java.util.List;
 
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
@@ -16,7 +16,6 @@ import com.fs.company.service.ICompanyMoneyLogsService;
 import com.fs.company.service.ICompanyRechargeService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyRechargeVO;
-import com.fs.framework.service.TokenService;
 import lombok.Synchronized;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -132,42 +131,43 @@ public class FsCompanyRechargeController extends BaseController
     @Synchronized
     public R audit(@RequestBody CompanyRecharge param)
     {
-        CompanyRecharge companyRecharge=companyRechargeService.selectCompanyRechargeById(param.getRechargeId());
-        if(companyRecharge.getIsAudit()!=0){
-            return R.error("非法操作");
-        }
-        companyRecharge.setIsAudit(param.getIsAudit());
-        companyRecharge.setRemark(param.getRemark());
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        if(companyRecharge.getIsAudit()==1){
-            if(1==companyRecharge.getBusinessType()){// 红包充值
-                // 更新红包充值余额redis字段
-                companyService.redPacketTopUpCompany(companyRecharge.getCompanyId(),companyRecharge.getMoney(),"1");
-            }else {
-                Company company=companyService.selectCompanyByIdForUpdate(companyRecharge.getCompanyId());
-                company.setMoney(company.getMoney().add(companyRecharge.getMoney()));
-                companyRecharge.setBalance(company.getMoney());
-                companyService.updateCompany(company);
-                //生成流水
-                CompanyMoneyLogs log=new CompanyMoneyLogs();
-                log.setCompanyId(companyRecharge.getCompanyId());
-                log.setMoney(companyRecharge.getMoney());
-                log.setRemark(companyRecharge.getRemark());
-                log.setLogsType(1);
-                log.setBalance(company.getMoney());
-                log.setCreateTime(new Date());
-                moneyLogsService.insertCompanyMoneyLogs(log);
-
-            }
-            companyRecharge.setPayTime(new Date());
-            companyRecharge.setStatus(1);
-
-        }
-
-        companyRecharge.setAuditTime(new Date());
-        companyRecharge.setAuditUserId(loginUser.getCompanyUser().getUserId());
-        companyRechargeService.updateCompanyRecharge(companyRecharge);
-        return R.ok("操作成功");
+//        CompanyRecharge companyRecharge=companyRechargeService.selectCompanyRechargeById(param.getRechargeId());
+//        if(companyRecharge.getIsAudit()!=0){
+//            return R.error("非法操作");
+//        }
+//        companyRecharge.setIsAudit(param.getIsAudit());
+//        companyRecharge.setRemark(param.getRemark());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        if(companyRecharge.getIsAudit()==1){
+//            if(1==companyRecharge.getBusinessType()){// 红包充值
+//                // 更新红包充值余额redis字段
+//                companyService.redPacketTopUpCompany(companyRecharge.getCompanyId(),companyRecharge.getMoney(),"1");
+//            }else {
+//                Company company=companyService.selectCompanyByIdForUpdate(companyRecharge.getCompanyId());
+//                company.setMoney(company.getMoney().add(companyRecharge.getMoney()));
+//                companyRecharge.setBalance(company.getMoney());
+//                companyService.updateCompany(company);
+//                //生成流水
+//                CompanyMoneyLogs log=new CompanyMoneyLogs();
+//                log.setCompanyId(companyRecharge.getCompanyId());
+//                log.setMoney(companyRecharge.getMoney());
+//                log.setRemark(companyRecharge.getRemark());
+//                log.setLogsType(1);
+//                log.setBalance(company.getMoney());
+//                log.setCreateTime(new Date());
+//                moneyLogsService.insertCompanyMoneyLogs(log);
+//
+//            }
+//            companyRecharge.setPayTime(new Date());
+//            companyRecharge.setStatus(1);
+//
+//        }
+//
+//        companyRecharge.setAuditTime(new Date());
+//        companyRecharge.setAuditUserId(loginUser.getCompanyUser().getUserId());
+//        companyRechargeService.updateCompanyRecharge(companyRecharge);
+//        return R.ok("操作成功");
+        throw new RuntimeException("未实现");
     }
 
 }

fs-admin-saas/src/main/java/com/fs/his/controller/FsPhysicalReportTemplateController.java

@@ -2,9 +2,8 @@ package com.fs.his.controller;
 
 import java.util.List;
 
-import com.fs.framework.security.LoginUser;
 import com.fs.common.utils.ServletUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -83,9 +82,10 @@ public class FsPhysicalReportTemplateController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsPhysicalReportTemplate fsPhysicalReportTemplate)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsPhysicalReportTemplate.setCreateBy(String.valueOf(loginUser.getUserId()));
-        return toAjax(fsPhysicalReportTemplateService.insertFsPhysicalReportTemplate(fsPhysicalReportTemplate));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsPhysicalReportTemplate.setCreateBy(String.valueOf(loginUser.getUserId()));
+//        return toAjax(fsPhysicalReportTemplateService.insertFsPhysicalReportTemplate(fsPhysicalReportTemplate));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -96,9 +96,10 @@ public class FsPhysicalReportTemplateController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsPhysicalReportTemplate fsPhysicalReportTemplate)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsPhysicalReportTemplate.setUpdateBy(String.valueOf(loginUser.getUserId()));
-        return toAjax(fsPhysicalReportTemplateService.updateFsPhysicalReportTemplate(fsPhysicalReportTemplate));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsPhysicalReportTemplate.setUpdateBy(String.valueOf(loginUser.getUserId()));
+//        return toAjax(fsPhysicalReportTemplateService.updateFsPhysicalReportTemplate(fsPhysicalReportTemplate));
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/his/controller/FsPhysicalReportTemplateFieldController.java

@@ -3,11 +3,10 @@ package com.fs.his.controller;
 import java.util.List;
 
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.dto.FsPhysicalReportTemplateFieldDTO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -128,13 +127,14 @@ public class FsPhysicalReportTemplateFieldController extends BaseController {
     @Log(title = "体检报告模板字段", businessType = BusinessType.INSERT)
     @PostMapping("/saveTemplate")
     public AjaxResult saveTemplate(@RequestBody FsPhysicalReportTemplateFieldDTO fieldDTO) {
-        if (StringUtils.isNull(fieldDTO.getTemplateId())) {
-            throw new ServiceException("操作失败,模板ID不能为空！");
-        } else if (fieldDTO.getTemplateFieldList().isEmpty()) {
-            throw new ServiceException("操作失败,字段列表不能为空！");
-        }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fieldDTO.setCreateBy(String.valueOf(loginUser.getUserId()));
-        return toAjax(fsPhysicalReportTemplateFieldService.saveFsPhysicalReportTemplateField(fieldDTO));
+//        if (StringUtils.isNull(fieldDTO.getTemplateId())) {
+//            throw new ServiceException("操作失败,模板ID不能为空！");
+//        } else if (fieldDTO.getTemplateFieldList().isEmpty()) {
+//            throw new ServiceException("操作失败,字段列表不能为空！");
+//        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fieldDTO.setCreateBy(String.valueOf(loginUser.getUserId()));
+//        return toAjax(fsPhysicalReportTemplateFieldService.saveFsPhysicalReportTemplateField(fieldDTO));
+        throw new RuntimeException("未实现");
     }
 }

fs-admin-saas/src/main/java/com/fs/his/controller/FsStoreAfterSalesController.java

@@ -5,11 +5,9 @@ import java.util.Date;
 import java.util.List;
 
 import cn.hutool.core.date.DateTime;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.domain.FsStoreAfterSalesLogs;
 import com.fs.his.domain.FsUser;
@@ -66,26 +64,27 @@ public class FsStoreAfterSalesController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(FsStoreAfterSalesParam fsStoreAfterSales)
     {
-        startPage();
-        //根据订单权限查询相关公司订单
-        try {
-            Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
-            if (companyId!=null){
-                if (fsStoreAfterSales.getCompanyId()!=null){
-                    if (!companyId.equals(fsStoreAfterSales.getCompanyId())) {
-                        return getDataTable(new ArrayList<FsStoreAfterSalesListVO>());
-                    }
-                }
-                fsStoreAfterSales.setCompanyId(companyId);
-            }
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-        if(!StringUtils.isEmpty(fsStoreAfterSales.getCreateTimeRange())){
-            fsStoreAfterSales.setCreateTimeList(fsStoreAfterSales.getCreateTimeRange().split("--"));
-        }
-        List<FsStoreAfterSalesListVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesListVO(fsStoreAfterSales);
-        return getDataTable(list);
+//        startPage();
+//        //根据订单权限查询相关公司订单
+//        try {
+//            Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
+//            if (companyId!=null){
+//                if (fsStoreAfterSales.getCompanyId()!=null){
+//                    if (!companyId.equals(fsStoreAfterSales.getCompanyId())) {
+//                        return getDataTable(new ArrayList<FsStoreAfterSalesListVO>());
+//                    }
+//                }
+//                fsStoreAfterSales.setCompanyId(companyId);
+//            }
+//        } catch (Exception e) {
+//            System.out.println(e.getMessage());
+//        }
+//        if(!StringUtils.isEmpty(fsStoreAfterSales.getCreateTimeRange())){
+//            fsStoreAfterSales.setCreateTimeList(fsStoreAfterSales.getCreateTimeRange().split("--"));
+//        }
+//        List<FsStoreAfterSalesListVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesListVO(fsStoreAfterSales);
+//        return getDataTable(list);
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -96,44 +95,45 @@ public class FsStoreAfterSalesController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsStoreAfterSalesParam fsStoreAfterSales)
     {
-        if (fsStoreAfterSalesService.isEntityNull(fsStoreAfterSales)){
-            return AjaxResult.error("请筛选数据导出");
-        }
-        Integer exportType1 = exportTaskService.isExportType1(SecurityUtils.getUserId());
-        if (exportType1>0){
-            return AjaxResult.error("你已经有正在导出的任务");
-        }
-        //根据订单权限查询相关公司订单
-        try {
-            Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
-            if (companyId!=null){
-                if (fsStoreAfterSales.getCompanyId()!=null){
-                    if (!companyId.equals(fsStoreAfterSales.getCompanyId())) {
-                        return AjaxResult.error("请筛选数据自己公司数据");
-                    }
-                }
-                fsStoreAfterSales.setCompanyId(companyId);
-            }
-        } catch (Exception e) {
-            System.out.println(e.getMessage());
-        }
-        if(!StringUtils.isEmpty(fsStoreAfterSales.getCreateTimeRange())){
-            fsStoreAfterSales.setCreateTimeList(fsStoreAfterSales.getCreateTimeRange().split("--"));
-        }
-        logger.info("tc>\n【售后记录导出】：{}", SecurityUtils.getUserId());
-        List<FsStoreAfterSalesExcelVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesExcelListVO(fsStoreAfterSales);
-
-        FsExportTask task=new FsExportTask();
-        task.setTaskType(11);
-        task.setStatus(0);
-        task.setStartTime(new Date());
-        task.setRemark("售后记录导出");
-        task.setSysType(1);
-        task.setUserId(SecurityUtils.getUserId());
-        exportTaskService.insertFsExportTask(task);
-        fsStoreAfterSales.setTaskId(task.getTaskId());
-        fsStoreAfterSalesService.exportData(fsStoreAfterSales);
-        return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());
+//        if (fsStoreAfterSalesService.isEntityNull(fsStoreAfterSales)){
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        Integer exportType1 = exportTaskService.isExportType1(SecurityUtils.getUserId());
+//        if (exportType1>0){
+//            return AjaxResult.error("你已经有正在导出的任务");
+//        }
+//        //根据订单权限查询相关公司订单
+//        try {
+//            Long companyId = SecurityUtils.getLoginUser().getUser().getCompanyId();
+//            if (companyId!=null){
+//                if (fsStoreAfterSales.getCompanyId()!=null){
+//                    if (!companyId.equals(fsStoreAfterSales.getCompanyId())) {
+//                        return AjaxResult.error("请筛选数据自己公司数据");
+//                    }
+//                }
+//                fsStoreAfterSales.setCompanyId(companyId);
+//            }
+//        } catch (Exception e) {
+//            System.out.println(e.getMessage());
+//        }
+//        if(!StringUtils.isEmpty(fsStoreAfterSales.getCreateTimeRange())){
+//            fsStoreAfterSales.setCreateTimeList(fsStoreAfterSales.getCreateTimeRange().split("--"));
+//        }
+//        logger.info("tc>\n【售后记录导出】：{}", SecurityUtils.getUserId());
+//        List<FsStoreAfterSalesExcelVO> list = fsStoreAfterSalesService.selectFsStoreAfterSalesExcelListVO(fsStoreAfterSales);
+//
+//        FsExportTask task=new FsExportTask();
+//        task.setTaskType(11);
+//        task.setStatus(0);
+//        task.setStartTime(new Date());
+//        task.setRemark("售后记录导出");
+//        task.setSysType(1);
+//        task.setUserId(SecurityUtils.getUserId());
+//        exportTaskService.insertFsExportTask(task);
+//        fsStoreAfterSales.setTaskId(task.getTaskId());
+//        fsStoreAfterSalesService.exportData(fsStoreAfterSales);
+//        return new AjaxResult(200,"后台正在导出,请等待...任务ID:"+task.getTaskId(),task.getTaskId());
+        throw new RuntimeException("未实现");
 
     }
 
@@ -164,17 +164,18 @@ public class FsStoreAfterSalesController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody FsStoreAfterSales fsStoreAfterSales)
     {
-        fsStoreAfterSales.setStatus(2);
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        //操作记录
-        FsStoreAfterSalesLogs logs = new FsStoreAfterSalesLogs();
-        logs.setChangeTime(new DateTime());
-        logs.setChangeType(2);
-        logs.setOperator(loginUser.getCompanyUser().getNickName());
-        logs.setStoreAfterSalesId(fsStoreAfterSales.getId());
-        logs.setChangeMessage(FsStoreAfterSalesStatusEnum.STATUS_2.getDesc());
-        fsStoreAfterSalesLogsService.insertFsStoreAfterSalesLogs(logs);
-        return toAjax(fsStoreAfterSalesService.updateFsStoreAfterSales(fsStoreAfterSales));
+//        fsStoreAfterSales.setStatus(2);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        //操作记录
+//        FsStoreAfterSalesLogs logs = new FsStoreAfterSalesLogs();
+//        logs.setChangeTime(new DateTime());
+//        logs.setChangeType(2);
+//        logs.setOperator(loginUser.getCompanyUser().getNickName());
+//        logs.setStoreAfterSalesId(fsStoreAfterSales.getId());
+//        logs.setChangeMessage(FsStoreAfterSalesStatusEnum.STATUS_2.getDesc());
+//        fsStoreAfterSalesLogsService.insertFsStoreAfterSalesLogs(logs);
+//        return toAjax(fsStoreAfterSalesService.updateFsStoreAfterSales(fsStoreAfterSales));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -227,9 +228,10 @@ public class FsStoreAfterSalesController extends BaseController
     @Log(title = "平台审核", businessType = BusinessType.UPDATE)
     public AjaxResult auditing(@RequestBody FsStoreAfterSales fsStoreAfterSales)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
-        return toAjax(fsStoreAfterSalesService.auditing(fsStoreAfterSales));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
+//        return toAjax(fsStoreAfterSalesService.auditing(fsStoreAfterSales));
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('his:storeAfterSales:depot')")
@@ -237,9 +239,10 @@ public class FsStoreAfterSalesController extends BaseController
     @PutMapping("/depotAuditing")
     public AjaxResult depotAuditing(@RequestBody FsStoreAfterSales fsStoreAfterSales)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
-        return toAjax(fsStoreAfterSalesService.depotAuditing(fsStoreAfterSales));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
+//        return toAjax(fsStoreAfterSalesService.depotAuditing(fsStoreAfterSales));
+        throw new RuntimeException("未实现");
     }
     /**
      * 审核
@@ -249,9 +252,10 @@ public class FsStoreAfterSalesController extends BaseController
     @PutMapping("/noAuditing")
     public AjaxResult noAuditing(@RequestBody FsStoreAfterSales fsStoreAfterSales)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
-        return toAjax(fsStoreAfterSalesService.noAuditing(fsStoreAfterSales));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
+//        return toAjax(fsStoreAfterSalesService.noAuditing(fsStoreAfterSales));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -262,9 +266,10 @@ public class FsStoreAfterSalesController extends BaseController
     @PutMapping("/tuiMoney")
     public AjaxResult tuiMoney(@RequestBody FsStoreAfterSales fsStoreAfterSales)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
-        return toAjax(fsStoreAfterSalesService.refundMoney(fsStoreAfterSales));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsStoreAfterSales.setOperator(loginUser.getCompanyUser().getNickName());
+//        return toAjax(fsStoreAfterSalesService.refundMoney(fsStoreAfterSales));
+        throw new RuntimeException("未实现");
     }
 
 }

fs-admin-saas/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -10,8 +10,6 @@ import com.alibaba.fastjson.JSON;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysRole;
 import com.fs.common.core.domain.entity.SysUser;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.common.utils.*;
 import com.fs.company.param.CompanyStoreOrderMoneyLogsListParam;
 import com.fs.company.service.ICompanyMoneyLogsService;
@@ -26,7 +24,7 @@ import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.dto.df.BspOrderResponse;
 import com.fs.erp.dto.df.DFConfigVo;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.config.FsSysConfig;
 import com.fs.his.domain.*;
 import com.fs.his.dto.ExpressInfoDTO;
@@ -704,17 +702,18 @@ public class FsStoreOrderController extends BaseController
     @PutMapping("/afterSales")
     public AjaxResult afterSales(@RequestBody FsStoreOrderSalesParam fsStoreOrder)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        fsStoreOrder.setOperator(loginUser.getCompanyUser().getNickName());
-        if (fsStoreOrder.getRefundAmount() != null){
-            if (fsStoreOrder.getRefundList()!=null && !fsStoreOrder.getRefundList().isEmpty()){
-                return toAjax(fsStoreOrderService.afterSalesByProduct(fsStoreOrder));
-            } else {
-                return AjaxResult.error("没有选择需要退款的商品!");
-            }
-        } else {
-            return toAjax(fsStoreOrderService.afterSales(fsStoreOrder));
-        }
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        fsStoreOrder.setOperator(loginUser.getCompanyUser().getNickName());
+//        if (fsStoreOrder.getRefundAmount() != null){
+//            if (fsStoreOrder.getRefundList()!=null && !fsStoreOrder.getRefundList().isEmpty()){
+//                return toAjax(fsStoreOrderService.afterSalesByProduct(fsStoreOrder));
+//            } else {
+//                return AjaxResult.error("没有选择需要退款的商品!");
+//            }
+//        } else {
+//            return toAjax(fsStoreOrderService.afterSales(fsStoreOrder));
+//        }
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/hisStore/controller/FsIntegralGoodsController.java

@@ -1,130 +1,130 @@
-package com.fs.hisStore.controller;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.his.domain.FsIntegralGoods;
-import com.fs.his.service.IFsIntegralGoodsService;
-import com.fs.his.utils.RedisCacheUtil;
-import com.fs.his.vo.FsIntegralGoodsListVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-
-/**
- * 积分商品Controller
- *
- * @author fs
- * @date 2023-11-02
- */
-@RestController
-@RequestMapping("/his/integralGoods")
-public class FsIntegralGoodsController extends BaseController
-{
-    @Autowired
-    private IFsIntegralGoodsService fsIntegralGoodsService;
-    @Autowired
-    RedisCacheUtil redisCacheUtil;
-    /**
-     * 查询积分商品列表
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralGoods:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsIntegralGoods fsIntegralGoods)
-    {
-        startPage();
-        List<FsIntegralGoodsListVO> list = fsIntegralGoodsService.selectFsIntegralGoodsListVO(fsIntegralGoods);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出积分商品列表
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralGoods:export')")
-    @Log(title = "积分商品", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsIntegralGoods fsIntegralGoods)
-    {
-        List<FsIntegralGoods> list = fsIntegralGoodsService.selectFsIntegralGoodsList(fsIntegralGoods);
-        ExcelUtil<FsIntegralGoods> util = new ExcelUtil<FsIntegralGoods>(FsIntegralGoods.class);
-        return util.exportExcel(list, "积分商品数据");
-    }
-
-    /**
-     * 获取积分商品详细信息
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralGoods:query')")
-    @GetMapping(value = "/{goodsId}")
-    public AjaxResult getInfo(@PathVariable("goodsId") Long goodsId)
-    {
-        return AjaxResult.success(fsIntegralGoodsService.selectFsIntegralGoodsByGoodsId(goodsId));
-    }
-
-
-    @Log(title = "商品导入", businessType = BusinessType.IMPORT)
-    @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        redisCacheUtil.delRedisKey("getIntegralGoodsList");
-        redisCacheUtil.delRedisKey("getIntegralGoodsById");
-        ExcelUtil<FsIntegralGoods> util = new ExcelUtil<>(FsIntegralGoods.class);
-        List<FsIntegralGoods> list = util.importExcel(file.getInputStream());
-        String message = fsIntegralGoodsService.importIntegralGoodsService(list);
-        return AjaxResult.success(message);
-    }
-
-    @GetMapping("/importTemplate")
-    public AjaxResult importTemplate()
-    {
-        ExcelUtil<FsIntegralGoods> util = new ExcelUtil<>(FsIntegralGoods.class);
-        return util.importTemplateExcel("商品数据");
-    }
-
-
-    /**
-     * 新增积分商品
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralGoods:add')")
-    @Log(title = "积分商品", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody FsIntegralGoods fsIntegralGoods)
-    {
-        redisCacheUtil.delRedisKey("getIntegralGoodsList");
-        redisCacheUtil.delRedisKey("getIntegralGoodsById");
-        return toAjax(fsIntegralGoodsService.insertFsIntegralGoods(fsIntegralGoods));
-    }
-
-    /**
-     * 修改积分商品
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralGoods:edit')")
-    @Log(title = "积分商品", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsIntegralGoods fsIntegralGoods)
-    {
-
-        redisCacheUtil.delRedisKey("getIntegralGoodsList");
-        redisCacheUtil.delSpringCacheKey("getIntegralGoodsById", fsIntegralGoods.getGoodsId());
-        redisCacheUtil.delRedisKey("getIntegralGoodsById");
-        return toAjax(fsIntegralGoodsService.updateFsIntegralGoods(fsIntegralGoods));
-    }
-
-    /**
-     * 删除积分商品
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralGoods:remove')")
-    @Log(title = "积分商品", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{goodsIds}")
-    public AjaxResult remove(@PathVariable Long[] goodsIds)
-    {
-        redisCacheUtil.delRedisKey("getIntegralGoodsList");
-        redisCacheUtil.delRedisKey("getIntegralGoodsById");
-        return toAjax(fsIntegralGoodsService.deleteFsIntegralGoodsByGoodsIds(goodsIds));
-    }
-}
+//package com.fs.hisStore.controller;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.his.domain.FsIntegralGoods;
+//import com.fs.his.service.IFsIntegralGoodsService;
+//import com.fs.his.utils.RedisCacheUtil;
+//import com.fs.his.vo.FsIntegralGoodsListVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.util.List;
+//
+///**
+// * 积分商品Controller
+// *
+// * @author fs
+// * @date 2023-11-02
+// */
+//@RestController
+//@RequestMapping("/his/integralGoods")
+//public class FsIntegralGoodsController extends BaseController
+//{
+//    @Autowired
+//    private IFsIntegralGoodsService fsIntegralGoodsService;
+//    @Autowired
+//    RedisCacheUtil redisCacheUtil;
+//    /**
+//     * 查询积分商品列表
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralGoods:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsIntegralGoods fsIntegralGoods)
+//    {
+//        startPage();
+//        List<FsIntegralGoodsListVO> list = fsIntegralGoodsService.selectFsIntegralGoodsListVO(fsIntegralGoods);
+//        return getDataTable(list);
+//    }
+//
+//    /**
+//     * 导出积分商品列表
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralGoods:export')")
+//    @Log(title = "积分商品", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsIntegralGoods fsIntegralGoods)
+//    {
+//        List<FsIntegralGoods> list = fsIntegralGoodsService.selectFsIntegralGoodsList(fsIntegralGoods);
+//        ExcelUtil<FsIntegralGoods> util = new ExcelUtil<FsIntegralGoods>(FsIntegralGoods.class);
+//        return util.exportExcel(list, "积分商品数据");
+//    }
+//
+//    /**
+//     * 获取积分商品详细信息
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralGoods:query')")
+//    @GetMapping(value = "/{goodsId}")
+//    public AjaxResult getInfo(@PathVariable("goodsId") Long goodsId)
+//    {
+//        return AjaxResult.success(fsIntegralGoodsService.selectFsIntegralGoodsByGoodsId(goodsId));
+//    }
+//
+//
+//    @Log(title = "商品导入", businessType = BusinessType.IMPORT)
+//    @PostMapping("/importData")
+//    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+//    {
+//        redisCacheUtil.delRedisKey("getIntegralGoodsList");
+//        redisCacheUtil.delRedisKey("getIntegralGoodsById");
+//        ExcelUtil<FsIntegralGoods> util = new ExcelUtil<>(FsIntegralGoods.class);
+//        List<FsIntegralGoods> list = util.importExcel(file.getInputStream());
+//        String message = fsIntegralGoodsService.importIntegralGoodsService(list);
+//        return AjaxResult.success(message);
+//    }
+//
+//    @GetMapping("/importTemplate")
+//    public AjaxResult importTemplate()
+//    {
+//        ExcelUtil<FsIntegralGoods> util = new ExcelUtil<>(FsIntegralGoods.class);
+//        return util.importTemplateExcel("商品数据");
+//    }
+//
+//
+//    /**
+//     * 新增积分商品
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralGoods:add')")
+//    @Log(title = "积分商品", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody FsIntegralGoods fsIntegralGoods)
+//    {
+//        redisCacheUtil.delRedisKey("getIntegralGoodsList");
+//        redisCacheUtil.delRedisKey("getIntegralGoodsById");
+//        return toAjax(fsIntegralGoodsService.insertFsIntegralGoods(fsIntegralGoods));
+//    }
+//
+//    /**
+//     * 修改积分商品
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralGoods:edit')")
+//    @Log(title = "积分商品", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsIntegralGoods fsIntegralGoods)
+//    {
+//
+//        redisCacheUtil.delRedisKey("getIntegralGoodsList");
+//        redisCacheUtil.delSpringCacheKey("getIntegralGoodsById", fsIntegralGoods.getGoodsId());
+//        redisCacheUtil.delRedisKey("getIntegralGoodsById");
+//        return toAjax(fsIntegralGoodsService.updateFsIntegralGoods(fsIntegralGoods));
+//    }
+//
+//    /**
+//     * 删除积分商品
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralGoods:remove')")
+//    @Log(title = "积分商品", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{goodsIds}")
+//    public AjaxResult remove(@PathVariable Long[] goodsIds)
+//    {
+//        redisCacheUtil.delRedisKey("getIntegralGoodsList");
+//        redisCacheUtil.delRedisKey("getIntegralGoodsById");
+//        return toAjax(fsIntegralGoodsService.deleteFsIntegralGoodsByGoodsIds(goodsIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/hisStore/controller/FsIntegralOrderController.java

@@ -1,182 +1,182 @@
-package com.fs.hisStore.controller;
-
-import cn.hutool.core.lang.TypeReference;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.his.domain.FsIntegralGoods;
-import com.fs.his.domain.FsIntegralOrder;
-import com.fs.his.dto.ExpressInfoDTO;
-import com.fs.his.enums.ShipperCodeEnum;
-import com.fs.his.mapper.FsIntegralGoodsMapper;
-import com.fs.his.param.FsIntegralOrderCreateParam;
-import com.fs.his.param.FsIntegralOrderParam;
-import com.fs.his.service.IFsExpressService;
-import com.fs.his.service.IFsIntegralOrderService;
-import com.fs.his.utils.PhoneUtil;
-import com.fs.his.vo.FsIntegralOrderListVO;
-import com.fs.his.vo.FsIntegralOrderPVO;
-import com.fs.his.vo.FsStoreProductDeliverExcelVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.*;
-
-import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
-import static com.fs.his.utils.PhoneUtil.decryptPhone;
-
-/**
- * 积分商品订单Controller
- *
- * @author fs
- * @date 2023-11-02
- */
-@RestController
-@RequestMapping("/his/integralOrder")
-public class FsIntegralOrderController extends BaseController
-{
-    @Autowired
-    private IFsIntegralOrderService fsIntegralOrderService;
-    @Autowired
-    private IFsExpressService expressService;
-
-    @Autowired
-    private FsIntegralGoodsMapper fsIntegralGoodsMapper;
-    /**
-     * 查询积分商品订单列表
-     */
-    @PreAuthorize("@ss.hasPermi('his:integralOrder:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsIntegralOrderParam fsIntegralOrder)
-    {
-        startPage();
-        List<FsIntegralOrderListVO> list = fsIntegralOrderService.selectFsIntegralOrderListVO(fsIntegralOrder);
-        for (FsIntegralOrderListVO vo : list) {
-            vo.setUserPhone(decryptAutoPhoneMk(vo.getUserPhone()));
-        }
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出积分商品订单列表
-     */
-    @PreAuthorize("@ss.hasPermi('his:integralOrder:export')")
-    @Log(title = "积分商品订单", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsIntegralOrder fsIntegralOrder) {
-        return fsIntegralOrderService.export(fsIntegralOrder);
-    }
-    /**
-     * 发货
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:sendGoods')")
-    @PutMapping("/sendGoods")
-    public AjaxResult sendGoods(@RequestBody FsIntegralOrder fsIntegralOrder)
-    {
-        return toAjax(fsIntegralOrderService.sendGoods(fsIntegralOrder));
-    }
-
-    @GetMapping("/importTemplate")
-    public AjaxResult sendExport()
-    {
-        ExcelUtil<FsStoreProductDeliverExcelVO> util = new ExcelUtil<>(FsStoreProductDeliverExcelVO.class);
-        return util.importTemplateExcel("导入运单号");
-    }
-    @Log(title = "导入运单号", businessType = BusinessType.IMPORT)
-    @PostMapping("/importData")
-    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
-    {
-        ExcelUtil<FsStoreProductDeliverExcelVO> util = new ExcelUtil<>(FsStoreProductDeliverExcelVO.class);
-        List<FsStoreProductDeliverExcelVO> list = util.importExcel(file.getInputStream());
-        String message = fsIntegralOrderService.importProductDeliver(list);
-        return AjaxResult.success(message);
-    }
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:express')")
-    @GetMapping(value = "/getExpress/{id}")
-    public R getExpress(@PathVariable("id") Long id)
-    {
-        FsIntegralOrder fsIntegralOrder = fsIntegralOrderService.selectFsIntegralOrderByOrderId(id);
-        ExpressInfoDTO expressInfoDTO=null;
-        if(StringUtils.isNotEmpty(fsIntegralOrder.getDeliverySn())){
-            String lastFourNumber = "";
-            if (fsIntegralOrder.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
-
-                lastFourNumber = fsIntegralOrder.getUserPhone();
-                if (lastFourNumber.length() == 11) {
-                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
-                }
-            }
-            expressInfoDTO=expressService.getExpressInfo(fsIntegralOrder.getOrderCode(),fsIntegralOrder.getDeliveryCode(),fsIntegralOrder.getDeliverySn(),lastFourNumber);
-        }
-        return R.ok().put("data",expressInfoDTO);
-    }
-    /**
-     * 获取积分商品订单详细信息
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:query')")
-    @GetMapping(value = "/{orderId}")
-    public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
-    {
-        FsIntegralOrderPVO order = fsIntegralOrderService.selectFsIntegralOrderPVO(orderId);
-
-        order.setUserPhone(decryptAutoPhoneMk(order.getUserPhone()));
-        return AjaxResult.success(order);
-    }
-
-    @GetMapping(value = "/queryPhone/{orderId}")
-    @Log(title = "积分订单电话", businessType = BusinessType.GRANT)
-    @PreAuthorize("@ss.hasPermi('his:integralOrder:queryPhone')")
-    public R getPhone(@PathVariable("orderId") Long orderId)
-    {
-        FsIntegralOrderPVO order = fsIntegralOrderService.selectFsIntegralOrderPVO(orderId);
-        String userPhone = order.getUserPhone();
-        if (userPhone.length()>11){
-            userPhone = decryptPhone(userPhone);
-        }
-        return R.ok().put("userPhone",userPhone);
-    }
-
-    /**
-     * 新增积分商品订单
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:add')")
-    @Log(title = "积分商品订单", businessType = BusinessType.INSERT)
-    @PostMapping
-    public R add(@RequestBody FsIntegralOrderCreateParam param)
-    {
-        return fsIntegralOrderService.createOrder(param);
-    }
-
-    /**
-     * 修改积分商品订单
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:edit')")
-    @Log(title = "积分商品订单", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody FsIntegralOrder fsIntegralOrder)
-    {
-        return toAjax(fsIntegralOrderService.updateFsIntegralOrder(fsIntegralOrder));
-    }
-
-    /**
-     * 删除积分商品订单
-     */
-//    @PreAuthorize("@ss.hasPermi('his:integralOrder:remove')")
-    @Log(title = "积分商品订单", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{orderIds}")
-    public AjaxResult remove(@PathVariable Long[] orderIds)
-    {
-        return toAjax(fsIntegralOrderService.deleteFsIntegralOrderByOrderIds(orderIds));
-    }
-}
+//package com.fs.hisStore.controller;
+//
+//import cn.hutool.core.lang.TypeReference;
+//import cn.hutool.core.util.ObjectUtil;
+//import cn.hutool.core.util.StrUtil;
+//import cn.hutool.json.JSONUtil;
+//import com.alibaba.fastjson.JSONObject;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.domain.R;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.StringUtils;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import com.fs.his.domain.FsIntegralGoods;
+//import com.fs.his.domain.FsIntegralOrder;
+//import com.fs.his.dto.ExpressInfoDTO;
+//import com.fs.his.enums.ShipperCodeEnum;
+//import com.fs.his.mapper.FsIntegralGoodsMapper;
+//import com.fs.his.param.FsIntegralOrderCreateParam;
+//import com.fs.his.param.FsIntegralOrderParam;
+//import com.fs.his.service.IFsExpressService;
+//import com.fs.his.service.IFsIntegralOrderService;
+//import com.fs.his.utils.PhoneUtil;
+//import com.fs.his.vo.FsIntegralOrderListVO;
+//import com.fs.his.vo.FsIntegralOrderPVO;
+//import com.fs.his.vo.FsStoreProductDeliverExcelVO;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//import org.springframework.web.multipart.MultipartFile;
+//
+//import java.util.*;
+//
+//import static com.fs.his.utils.PhoneUtil.decryptAutoPhoneMk;
+//import static com.fs.his.utils.PhoneUtil.decryptPhone;
+//
+///**
+// * 积分商品订单Controller
+// *
+// * @author fs
+// * @date 2023-11-02
+// */
+//@RestController
+//@RequestMapping("/his/integralOrder")
+//public class FsIntegralOrderController extends BaseController
+//{
+//    @Autowired
+//    private IFsIntegralOrderService fsIntegralOrderService;
+//    @Autowired
+//    private IFsExpressService expressService;
+//
+//    @Autowired
+//    private FsIntegralGoodsMapper fsIntegralGoodsMapper;
+//    /**
+//     * 查询积分商品订单列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('his:integralOrder:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(FsIntegralOrderParam fsIntegralOrder)
+//    {
+//        startPage();
+//        List<FsIntegralOrderListVO> list = fsIntegralOrderService.selectFsIntegralOrderListVO(fsIntegralOrder);
+//        for (FsIntegralOrderListVO vo : list) {
+//            vo.setUserPhone(decryptAutoPhoneMk(vo.getUserPhone()));
+//        }
+//        return getDataTable(list);
+//    }
+//
+//    /**
+//     * 导出积分商品订单列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('his:integralOrder:export')")
+//    @Log(title = "积分商品订单", businessType = BusinessType.EXPORT)
+//    @GetMapping("/export")
+//    public AjaxResult export(FsIntegralOrder fsIntegralOrder) {
+//        return fsIntegralOrderService.export(fsIntegralOrder);
+//    }
+//    /**
+//     * 发货
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralOrder:sendGoods')")
+//    @PutMapping("/sendGoods")
+//    public AjaxResult sendGoods(@RequestBody FsIntegralOrder fsIntegralOrder)
+//    {
+//        return toAjax(fsIntegralOrderService.sendGoods(fsIntegralOrder));
+//    }
+//
+//    @GetMapping("/importTemplate")
+//    public AjaxResult sendExport()
+//    {
+//        ExcelUtil<FsStoreProductDeliverExcelVO> util = new ExcelUtil<>(FsStoreProductDeliverExcelVO.class);
+//        return util.importTemplateExcel("导入运单号");
+//    }
+//    @Log(title = "导入运单号", businessType = BusinessType.IMPORT)
+//    @PostMapping("/importData")
+//    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+//    {
+//        ExcelUtil<FsStoreProductDeliverExcelVO> util = new ExcelUtil<>(FsStoreProductDeliverExcelVO.class);
+//        List<FsStoreProductDeliverExcelVO> list = util.importExcel(file.getInputStream());
+//        String message = fsIntegralOrderService.importProductDeliver(list);
+//        return AjaxResult.success(message);
+//    }
+////    @PreAuthorize("@ss.hasPermi('his:integralOrder:express')")
+//    @GetMapping(value = "/getExpress/{id}")
+//    public R getExpress(@PathVariable("id") Long id)
+//    {
+//        FsIntegralOrder fsIntegralOrder = fsIntegralOrderService.selectFsIntegralOrderByOrderId(id);
+//        ExpressInfoDTO expressInfoDTO=null;
+//        if(StringUtils.isNotEmpty(fsIntegralOrder.getDeliverySn())){
+//            String lastFourNumber = "";
+//            if (fsIntegralOrder.getDeliveryCode().equals(ShipperCodeEnum.SF.getValue())) {
+//
+//                lastFourNumber = fsIntegralOrder.getUserPhone();
+//                if (lastFourNumber.length() == 11) {
+//                    lastFourNumber = StrUtil.sub(lastFourNumber, lastFourNumber.length(), -4);
+//                }
+//            }
+//            expressInfoDTO=expressService.getExpressInfo(fsIntegralOrder.getOrderCode(),fsIntegralOrder.getDeliveryCode(),fsIntegralOrder.getDeliverySn(),lastFourNumber);
+//        }
+//        return R.ok().put("data",expressInfoDTO);
+//    }
+//    /**
+//     * 获取积分商品订单详细信息
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralOrder:query')")
+//    @GetMapping(value = "/{orderId}")
+//    public AjaxResult getInfo(@PathVariable("orderId") Long orderId)
+//    {
+//        FsIntegralOrderPVO order = fsIntegralOrderService.selectFsIntegralOrderPVO(orderId);
+//
+//        order.setUserPhone(decryptAutoPhoneMk(order.getUserPhone()));
+//        return AjaxResult.success(order);
+//    }
+//
+//    @GetMapping(value = "/queryPhone/{orderId}")
+//    @Log(title = "积分订单电话", businessType = BusinessType.GRANT)
+//    @PreAuthorize("@ss.hasPermi('his:integralOrder:queryPhone')")
+//    public R getPhone(@PathVariable("orderId") Long orderId)
+//    {
+//        FsIntegralOrderPVO order = fsIntegralOrderService.selectFsIntegralOrderPVO(orderId);
+//        String userPhone = order.getUserPhone();
+//        if (userPhone.length()>11){
+//            userPhone = decryptPhone(userPhone);
+//        }
+//        return R.ok().put("userPhone",userPhone);
+//    }
+//
+//    /**
+//     * 新增积分商品订单
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralOrder:add')")
+//    @Log(title = "积分商品订单", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public R add(@RequestBody FsIntegralOrderCreateParam param)
+//    {
+//        return fsIntegralOrderService.createOrder(param);
+//    }
+//
+//    /**
+//     * 修改积分商品订单
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralOrder:edit')")
+//    @Log(title = "积分商品订单", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody FsIntegralOrder fsIntegralOrder)
+//    {
+//        return toAjax(fsIntegralOrderService.updateFsIntegralOrder(fsIntegralOrder));
+//    }
+//
+//    /**
+//     * 删除积分商品订单
+//     */
+////    @PreAuthorize("@ss.hasPermi('his:integralOrder:remove')")
+//    @Log(title = "积分商品订单", businessType = BusinessType.DELETE)
+//	@DeleteMapping("/{orderIds}")
+//    public AjaxResult remove(@PathVariable Long[] orderIds)
+//    {
+//        return toAjax(fsIntegralOrderService.deleteFsIntegralOrderByOrderIds(orderIds));
+//    }
+//}

fs-admin-saas/src/main/java/com/fs/hisStore/controller/FsStoreAfterSalesScrmController.java

@@ -5,14 +5,12 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ParseUtils;
-import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsUser;
 import com.fs.his.service.IFsUserService;
 import com.fs.hisStore.domain.FsStoreAfterSalesItemScrm;
@@ -40,7 +38,6 @@ import java.text.ParseException;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-import com.fs.framework.security.SecurityUtils;
 
 /**
  * 售后记录Controller
@@ -219,8 +216,6 @@ public class FsStoreAfterSalesScrmController extends BaseController
     //平台审核
     public R audit1(@RequestBody FsStoreAfterSalesAudit1Param param)
     {
-        com.fs.framework.security.LoginUser loginUser = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser.getCompanyUser() != null ? loginUser.getCompanyUser().getNickName() : "");
         return fsStoreAfterSalesService.audit1(param);
     }
 
@@ -229,8 +224,6 @@ public class FsStoreAfterSalesScrmController extends BaseController
     //仓库审核
     public R audit2(@RequestBody FsStoreAfterSalesAudit2Param param)
     {
-        com.fs.framework.security.LoginUser loginUser2 = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser2.getCompanyUser() != null ? loginUser2.getCompanyUser().getNickName() : "");
         return fsStoreAfterSalesService.audit2(param);
     }
     //财务审核
@@ -238,16 +231,12 @@ public class FsStoreAfterSalesScrmController extends BaseController
     @PostMapping("/refund")
     public R refund(@RequestBody FsStoreAfterSalesRefundParam param)
     {
-        com.fs.framework.security.LoginUser loginUser3 = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser3.getCompanyUser() != null ? loginUser3.getCompanyUser().getNickName() : "");
         return fsStoreAfterSalesService.refundMoney(param);
     }
     //平台撤销
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:cancel')")
     @PostMapping("/cancel")
     public R cancel(@RequestBody FsStoreAfterSalesCancelParam param) throws ParseException {
-        com.fs.framework.security.LoginUser loginUser4 = SecurityUtils.getLoginUser();
-        param.setOperator(loginUser4.getCompanyUser() != null ? loginUser4.getCompanyUser().getNickName() : "");
         return fsStoreAfterSalesService.cancel(param);
     }
 

fs-admin-saas/src/main/java/com/fs/hisStore/controller/FsStoreHealthOrderScrmController.java

@@ -7,7 +7,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.CloudHostUtils;
@@ -18,7 +17,7 @@ import com.fs.company.service.ICompanyMoneyLogsService;
 import com.fs.config.saas.ProjectConfig;
 import com.fs.course.dto.FsOrderDeliveryNoteDTO;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsStoreOrderDf;
 import com.fs.his.service.IFsStoreOrderDfService;
 import com.fs.his.service.IFsUserService;
@@ -83,82 +82,83 @@ public class FsStoreHealthOrderScrmController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('store:healthStoreOrder:list')")
       @PostMapping("/healthList")
       public TableDataInfo healthStoreList(@RequestBody FsStoreOrderParam param) {
-          PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getPayTimeRange())){
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setIsHealth("1");
-        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-        //金牛需求 区别其他项目 status = 6 (金牛代服管家) ,其他项目请避免使用订单状态status = 6
-        TableDataInfo dataTable = getDataTable(list);
-        if (CloudHostUtils.hasCloudHostName("康年堂")){
-            dataTable.setMsg("knt");
-        }
-        if (list != null) {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderVO vo : list) {
-                if(StringUtils.isNotEmpty(vo.getPhone())){
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (StringUtils.isNotEmpty(vo.getUserPhone())){
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (CloudHostUtils.hasCloudHostName("康年堂")){
-                    //查询顺丰代服账号
-                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
-                    if (df != null){
-                        vo.setErpAccount(df.getLoginAccount());
-                    }
-                }
-                //
-                if (loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) {
-                    if((vo.getCost() !=null && vo.getTotalNum() != null)){
-                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                    }
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setPayDelivery(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-
-            }
-        }
-        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
-        BeanUtils.copyProperties(dataTable, vo);
-        if (dataTable.getTotal()>0){
-            Map<String, BigDecimal> statistics= fsStoreOrderService.selectFsStoreOrderStatistics(param);
-            if (statistics != null && statistics.size() >= 3){
-                vo.setPayPriceTotal(statistics.get("pay_price").toString());
-                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
-                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
-            }else {
-                vo.setPayPriceTotal("0");
-                vo.setPayMoneyTotal("0");
-                vo.setPayRemainTotal("0");
-            }
-            //商品数量合计
-            String productStatistics= fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
-            if (StringUtils.isNotBlank(productStatistics)){
-                vo.setProductInfo(productStatistics);
-            } else {
-                vo.setProductInfo("");
-            }
-
-        }
-        return vo;
+//          PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setIsHealth("1");
+//        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//        //金牛需求 区别其他项目 status = 6 (金牛代服管家) ,其他项目请避免使用订单状态status = 6
+//        TableDataInfo dataTable = getDataTable(list);
+//        if (CloudHostUtils.hasCloudHostName("康年堂")){
+//            dataTable.setMsg("knt");
+//        }
+//        if (list != null) {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderVO vo : list) {
+//                if(StringUtils.isNotEmpty(vo.getPhone())){
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (StringUtils.isNotEmpty(vo.getUserPhone())){
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (CloudHostUtils.hasCloudHostName("康年堂")){
+//                    //查询顺丰代服账号
+//                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
+//                    if (df != null){
+//                        vo.setErpAccount(df.getLoginAccount());
+//                    }
+//                }
+//                //
+//                if (loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) {
+//                    if((vo.getCost() !=null && vo.getTotalNum() != null)){
+//                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                    }
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setPayDelivery(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//
+//            }
+//        }
+//        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
+//        BeanUtils.copyProperties(dataTable, vo);
+//        if (dataTable.getTotal()>0){
+//            Map<String, BigDecimal> statistics= fsStoreOrderService.selectFsStoreOrderStatistics(param);
+//            if (statistics != null && statistics.size() >= 3){
+//                vo.setPayPriceTotal(statistics.get("pay_price").toString());
+//                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
+//                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
+//            }else {
+//                vo.setPayPriceTotal("0");
+//                vo.setPayMoneyTotal("0");
+//                vo.setPayRemainTotal("0");
+//            }
+//            //商品数量合计
+//            String productStatistics= fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
+//            if (StringUtils.isNotBlank(productStatistics)){
+//                vo.setProductInfo(productStatistics);
+//            } else {
+//                vo.setProductInfo("");
+//            }
+//
+//        }
+//        return vo;
+          throw new RuntimeException("未实现");
     }
 
     /**
@@ -274,148 +274,150 @@ public class FsStoreHealthOrderScrmController extends BaseController {
     @Log(title = "商城订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/healthExportItems")
     public AjaxResult exportItems1(FsStoreOrderParam param) {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)){
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getPayTimeRange())){
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        param.setIsHealth("1");
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        //对手机号脱敏
-        if (list != null) {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (vo.getUserPhone() != null) {
-                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
-                    vo.setUserPhone(phone);
-                }
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                //
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)){
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        param.setIsHealth("1");
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        //对手机号脱敏
+//        if (list != null) {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (vo.getUserPhone() != null) {
+//                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
+//                    vo.setUserPhone(phone);
+//                }
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                //
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('store:healthStoreOrder:exportItems:details')")
     @Log(title = "商城订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/healthExportItemsDetails")
     public AjaxResult healthExportItemsDetails(FsStoreOrderParam param) {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)){
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getPayTimeRange())){
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        param.setIsHealth("1");
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        if("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())){
-            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
-                    .map(vo -> {
-                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
-                        try {
-                            BeanUtil.copyProperties( vo,zmvo);
-                        } catch (Exception e) {
-                            // 处理异常
-                            e.printStackTrace();
-                        }
-                        return zmvo;
-                    })
-                    .collect(Collectors.toList());
-            //对手机号脱敏
-            if (zmvoList != null) {
-                    com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-                    for (FsStoreOrderItemExportZMVO vo : zmvoList) {
-                        if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                            try {
-                                StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                                BeanUtil.copyProperties(orderProductDTO, vo);
-                            } catch (Exception e) {
-                            }
-                        }
-                        if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
-                            vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                        } else {
-                            vo.setPayPostage(BigDecimal.ZERO);
-                            vo.setCost(BigDecimal.ZERO);
-                            vo.setFPrice(BigDecimal.ZERO);
-                            vo.setBarCode("");
-                            vo.setCateName("");
-                            vo.setBankTransactionId("");
-                        }
-                    }
-                }
-                ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
-                return util.exportExcel(zmvoList, "订单明细数据");
-        }
-        //对手机号脱敏
-        if (list != null) {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)){
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        param.setIsHealth("1");
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        if("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())){
+//            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
+//                    .map(vo -> {
+//                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
+//                        try {
+//                            BeanUtil.copyProperties( vo,zmvo);
+//                        } catch (Exception e) {
+//                            // 处理异常
+//                            e.printStackTrace();
+//                        }
+//                        return zmvo;
+//                    })
+//                    .collect(Collectors.toList());
+//            //对手机号脱敏
+//            if (zmvoList != null) {
+//                    com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//                    for (FsStoreOrderItemExportZMVO vo : zmvoList) {
+//                        if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                            try {
+//                                StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                                BeanUtil.copyProperties(orderProductDTO, vo);
+//                            } catch (Exception e) {
+//                            }
+//                        }
+//                        if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
+//                            vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                        } else {
+//                            vo.setPayPostage(BigDecimal.ZERO);
+//                            vo.setCost(BigDecimal.ZERO);
+//                            vo.setFPrice(BigDecimal.ZERO);
+//                            vo.setBarCode("");
+//                            vo.setCateName("");
+//                            vo.setBankTransactionId("");
+//                        }
+//                    }
+//                }
+//                ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
+//                return util.exportExcel(zmvoList, "订单明细数据");
+//        }
+//        //对手机号脱敏
+//        if (list != null) {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+        throw new RuntimeException("未实现");
     }
 
     //订单发货批量导入

fs-admin-saas/src/main/java/com/fs/hisStore/controller/FsStoreOrderOfflineScrmController.java

@@ -4,7 +4,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ParseUtils;
@@ -12,7 +11,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.service.ICrmCustomerService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.hisStore.domain.FsStoreOrderOfflineScrm;
 import com.fs.hisStore.domain.FsStoreOrderOfflineItemScrm;
 import com.fs.hisStore.param.FsStoreOrderOfflineParam;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 import java.util.List;
-import com.fs.framework.security.SecurityUtils;
 
 /**
  * 线下订单Controller
@@ -146,15 +144,16 @@ public class FsStoreOrderOfflineScrmController extends BaseController
     @PostMapping("/auditOrder/{orderId}")
     public R auditOrder(@PathVariable Long orderId)
     {
-        com.fs.framework.security.LoginUser loginUser = SecurityUtils.getLoginUser();
-        FsStoreOrderOfflineScrm fsStoreOrderOffline = new FsStoreOrderOfflineScrm();
-        fsStoreOrderOffline.setOrderId(orderId);
-        fsStoreOrderOffline.setStatus(3L);
-        fsStoreOrderOffline.setAuditBy(loginUser.getCompanyUser().getNickName());
-        fsStoreOrderOffline.setAuditTime(new Date());
-        if (fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline)>0){
-            return R.ok();
-        }
-        return R.error("审核失败");
+//        com.fs.framework.security.LoginUser loginUser = SecurityUtils.getLoginUser();
+//        FsStoreOrderOfflineScrm fsStoreOrderOffline = new FsStoreOrderOfflineScrm();
+//        fsStoreOrderOffline.setOrderId(orderId);
+//        fsStoreOrderOffline.setStatus(3L);
+//        fsStoreOrderOffline.setAuditBy(loginUser.getCompanyUser().getNickName());
+//        fsStoreOrderOffline.setAuditTime(new Date());
+//        if (fsStoreOrderOfflineService.updateFsStoreOrderOffline(fsStoreOrderOffline)>0){
+//            return R.ok();
+//        }
+//        return R.error("审核失败");
+        throw new RuntimeException("未实现");
     }
 }

fs-admin-saas/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -11,8 +11,6 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysRole;
 import com.fs.common.core.domain.entity.SysUser;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.CloudHostUtils;
@@ -30,7 +28,7 @@ import com.fs.erp.dto.ErpOrderQueryRequert;
 import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.dto.df.DFConfigVo;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsDfAccount;
 import com.fs.his.domain.FsStoreOrderDf;
 import com.fs.his.domain.FsUser;
@@ -184,79 +182,80 @@ public class FsStoreOrderScrmController extends BaseController {
     @PreAuthorize("@ss.hasPermi('store:storeOrder:list')")
     @PostMapping("/list")
     public TableDataInfo list(@RequestBody FsStoreOrderParam param) {
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getPayTimeRange())){
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-        //金牛需求 区别其他项目 status = 6 (金牛代服管家) ,其他项目请避免使用订单状态status = 6
-        TableDataInfo dataTable = getDataTable(list);
-        if (CloudHostUtils.hasCloudHostName("康年堂")){
-            dataTable.setMsg("knt");
-        }
-        if (list != null) {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderVO vo : list) {
-                if(vo.getPhone()!=null){
-                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if(ObjectUtil.isNotEmpty(vo.getUserPhone())){
-                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-                }
-                if (CloudHostUtils.hasCloudHostName("康年堂")){
-                    //查询顺丰代服账号
-                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
-                    if (df != null){
-                        vo.setErpAccount(df.getLoginAccount());
-                    }
-                }
-                //
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance")) || loginUser.getPermissions().contains("*:*:*") && (vo.getCost() != null && vo.getTotalNum() != null)) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setPayDelivery(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
-        BeanUtils.copyProperties(dataTable, vo);
-        if (dataTable.getTotal()>0){
-            Map<String, BigDecimal> statistics= fsStoreOrderService.selectFsStoreOrderStatistics(param);
-            if (statistics != null && statistics.size() >= 3){
-                vo.setPayPriceTotal(statistics.get("pay_price").toString());
-                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
-                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
-            }else {
-                vo.setPayPriceTotal("0");
-                vo.setPayMoneyTotal("0");
-                vo.setPayRemainTotal("0");
-            }
-            //商品数量合计
-            String productStatistics= fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
-            if (StringUtils.isNotBlank(productStatistics)){
-                vo.setProductInfo(productStatistics);
-            } else {
-                vo.setProductInfo("");
-            }
-
-        }
-        return vo;
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//        //金牛需求 区别其他项目 status = 6 (金牛代服管家) ,其他项目请避免使用订单状态status = 6
+//        TableDataInfo dataTable = getDataTable(list);
+//        if (CloudHostUtils.hasCloudHostName("康年堂")){
+//            dataTable.setMsg("knt");
+//        }
+//        if (list != null) {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderVO vo : list) {
+//                if(vo.getPhone()!=null){
+//                    vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if(ObjectUtil.isNotEmpty(vo.getUserPhone())){
+//                    vo.setUserPhone(vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//                }
+//                if (CloudHostUtils.hasCloudHostName("康年堂")){
+//                    //查询顺丰代服账号
+//                    FsStoreOrderDf df = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(vo.getId());
+//                    if (df != null){
+//                        vo.setErpAccount(df.getLoginAccount());
+//                    }
+//                }
+//                //
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance")) || loginUser.getPermissions().contains("*:*:*") && (vo.getCost() != null && vo.getTotalNum() != null)) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setPayDelivery(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        FsStoreOrderListAndStatisticsVo vo = new FsStoreOrderListAndStatisticsVo();
+//        BeanUtils.copyProperties(dataTable, vo);
+//        if (dataTable.getTotal()>0){
+//            Map<String, BigDecimal> statistics= fsStoreOrderService.selectFsStoreOrderStatistics(param);
+//            if (statistics != null && statistics.size() >= 3){
+//                vo.setPayPriceTotal(statistics.get("pay_price").toString());
+//                vo.setPayMoneyTotal(statistics.get("pay_money").toString());
+//                vo.setPayRemainTotal(statistics.get("pay_remain").toString());
+//            }else {
+//                vo.setPayPriceTotal("0");
+//                vo.setPayMoneyTotal("0");
+//                vo.setPayRemainTotal("0");
+//            }
+//            //商品数量合计
+//            String productStatistics= fsStoreOrderService.selectFsStoreOrderProductStatistics(param);
+//            if (StringUtils.isNotBlank(productStatistics)){
+//                vo.setProductInfo(productStatistics);
+//            } else {
+//                vo.setProductInfo("");
+//            }
+//
+//        }
+//        return vo;
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeOrder:payRemainList')")
@@ -392,20 +391,21 @@ public class FsStoreOrderScrmController extends BaseController {
     @Autowired
     private ISysRoleService sysRoleService;
     private SysRole isCheckPermission() {
-        SysRole sysRole = new SysRole();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        boolean flag = user.isAdmin();
-        if (flag) {
-            sysRole.setIsCheckPhone(1);
-            sysRole.setIsCheckAddress(1);
-        } else {
-            List<SysRole> roles = user.getRoles();
-            if (roles != null && !roles.isEmpty()) {
-                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
-                return sysRoleService.getIsCheckPermission(roleIds);
-            }
-        }
-        return sysRole;
+//        SysRole sysRole = new SysRole();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
+//        boolean flag = user.isAdmin();
+//        if (flag) {
+//            sysRole.setIsCheckPhone(1);
+//            sysRole.setIsCheckAddress(1);
+//        } else {
+//            List<SysRole> roles = user.getRoles();
+//            if (roles != null && !roles.isEmpty()) {
+//                Long[] roleIds = roles.stream().map(SysRole::getRoleId).toArray(Long[]::new);
+//                return sysRoleService.getIsCheckPermission(roleIds);
+//            }
+//        }
+//        return sysRole;
+        throw new RuntimeException("未实现");
     }
 
 
@@ -461,62 +461,63 @@ public class FsStoreOrderScrmController extends BaseController {
     @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/exportItems")
     public AjaxResult exportItems(FsStoreOrderParam param) {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)){
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getPayTimeRange())){
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        //对手机号脱敏
-        if (list != null) {
-            SysRole sysRole = isCheckPermission();
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
-                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
-                    vo.setUserPhone(phone);
-                }
-                if (vo.getUserAddress()!=null && sysRole.getIsCheckAddress() != 1){
-                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
-                }
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                //
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)){
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        //对手机号脱敏
+//        if (list != null) {
+//            SysRole sysRole = isCheckPermission();
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (vo.getUserPhone() != null && sysRole.getIsCheckPhone() != 1) {
+//                    String phone = vo.getUserPhone().replaceAll("(\\d{3})\\d*(\\d{1})", "$1****$2");
+//                    vo.setUserPhone(phone);
+//                }
+//                if (vo.getUserAddress()!=null && sysRole.getIsCheckAddress() != 1){
+//                    vo.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
+//                }
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                //
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -526,94 +527,95 @@ public class FsStoreOrderScrmController extends BaseController {
     @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/exportItemsDetails")
     public AjaxResult exportItemsDetails(FsStoreOrderParam param) {
-        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
-            param.setBeginTime(null);
-            param.setEndTime(null);
-        }
-        if (fsStoreOrderService.isEntityNull(param)){
-            return AjaxResult.error("请筛选数据导出");
-        }
-        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getPayTimeRange())){
-            param.setPayTimeList(param.getPayTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-        }
-        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-        }
-        param.setNotHealth(1);
-        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
-        if("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())){
-            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
-                    .map(vo -> {
-                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
-                        try {
-                            BeanUtil.copyProperties( vo,zmvo);
-                        } catch (Exception e) {
-                            // 处理异常
-                            e.printStackTrace();
-                        }
-                        return zmvo;
-                    })
-                    .collect(Collectors.toList());
-            //对手机号脱敏
-            if (zmvoList != null) {
-                com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-                for (FsStoreOrderItemExportZMVO vo : zmvoList) {
-                    if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                        try {
-                            StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                            BeanUtil.copyProperties(orderProductDTO, vo);
-                        } catch (Exception e) {
-                        }
-                    }
-                    //
-                    if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
-                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                    } else {
-                        vo.setPayPostage(BigDecimal.ZERO);
-                        vo.setCost(BigDecimal.ZERO);
-                        vo.setFPrice(BigDecimal.ZERO);
-                        vo.setBarCode("");
-                        vo.setCateName("");
-                        vo.setBankTransactionId("");
-                    }
-                }
-            }
-            ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
-            return util.exportExcel(zmvoList, "订单明细数据");
-        }
-
-        //对手机号脱敏
-        if (list != null) {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            for (FsStoreOrderItemExportVO vo : list) {
-                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
-                    try {
-                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
-                        BeanUtil.copyProperties(orderProductDTO, vo);
-                    } catch (Exception e) {
-                    }
-                }
-                //
-                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
-                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-                } else {
-                    vo.setPayPostage(BigDecimal.ZERO);
-                    vo.setCost(BigDecimal.ZERO);
-                    vo.setFPrice(BigDecimal.ZERO);
-                    vo.setBarCode("");
-                    vo.setCateName("");
-                    vo.setBankTransactionId("");
-                }
-            }
-        }
-        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
-        return util.exportExcel(list, "订单明细数据");
+//        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
+//            param.setBeginTime(null);
+//            param.setEndTime(null);
+//        }
+//        if (fsStoreOrderService.isEntityNull(param)){
+//            return AjaxResult.error("请筛选数据导出");
+//        }
+//        if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//            param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//            param.setPayTimeList(param.getPayTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//            param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//        }
+//        if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//            param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//        }
+//        param.setNotHealth(1);
+//        List<FsStoreOrderItemExportVO> list = orderItemService.selectFsStoreOrderItemListExportVO(param);
+//        if("北京卓美".equals(com.fs.config.saas.ProjectConfig.getFromDB(sysConfigMapper).getCloudHost().getCompanyName())){
+//            List<FsStoreOrderItemExportZMVO> zmvoList = list.stream()
+//                    .map(vo -> {
+//                        FsStoreOrderItemExportZMVO zmvo = new FsStoreOrderItemExportZMVO();
+//                        try {
+//                            BeanUtil.copyProperties( vo,zmvo);
+//                        } catch (Exception e) {
+//                            // 处理异常
+//                            e.printStackTrace();
+//                        }
+//                        return zmvo;
+//                    })
+//                    .collect(Collectors.toList());
+//            //对手机号脱敏
+//            if (zmvoList != null) {
+//                com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//                for (FsStoreOrderItemExportZMVO vo : zmvoList) {
+//                    if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                        try {
+//                            StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                            BeanUtil.copyProperties(orderProductDTO, vo);
+//                        } catch (Exception e) {
+//                        }
+//                    }
+//                    //
+//                    if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
+//                        vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                    } else {
+//                        vo.setPayPostage(BigDecimal.ZERO);
+//                        vo.setCost(BigDecimal.ZERO);
+//                        vo.setFPrice(BigDecimal.ZERO);
+//                        vo.setBarCode("");
+//                        vo.setCateName("");
+//                        vo.setBankTransactionId("");
+//                    }
+//                }
+//            }
+//            ExcelUtil<FsStoreOrderItemExportZMVO> util = new ExcelUtil<FsStoreOrderItemExportZMVO>(FsStoreOrderItemExportZMVO.class);
+//            return util.exportExcel(zmvoList, "订单明细数据");
+//        }
+//
+//        //对手机号脱敏
+//        if (list != null) {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            for (FsStoreOrderItemExportVO vo : list) {
+//                if (!StringUtils.isEmpty(vo.getJsonInfo())) {
+//                    try {
+//                        StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getJsonInfo(), StoreOrderProductDTO.class);
+//                        BeanUtil.copyProperties(orderProductDTO, vo);
+//                    } catch (Exception e) {
+//                    }
+//                }
+//                //
+//                if ((loginUser.getPermissions().contains("his:storeAfterSales:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
+//                    vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
+//                } else {
+//                    vo.setPayPostage(BigDecimal.ZERO);
+//                    vo.setCost(BigDecimal.ZERO);
+//                    vo.setFPrice(BigDecimal.ZERO);
+//                    vo.setBarCode("");
+//                    vo.setCateName("");
+//                    vo.setBankTransactionId("");
+//                }
+//            }
+//        }
+//        ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
+//        return util.exportExcel(list, "订单明细数据");
+        throw new RuntimeException("未实现");
     }
 
     @GetMapping("/orderItemsNum")
@@ -1004,12 +1006,13 @@ public class FsStoreOrderScrmController extends BaseController {
     @PostMapping("/editErpPhone")
     public AjaxResult editErpPhone(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
     {
-        param.setOpeName(SecurityUtils.getLoginUser().getUser().getNickName());
-        List<String> erpPhone = param.getErpPhone();
-        if (erpPhone == null || erpPhone.isEmpty()) {
-            return AjaxResult.error("请选择手机号");
-        }
-        return toAjax(fsStoreOrderService.batchUpdateErpByOrderIds(param));
+//        param.setOpeName(SecurityUtils.getLoginUser().getUser().getNickName());
+//        List<String> erpPhone = param.getErpPhone();
+//        if (erpPhone == null || erpPhone.isEmpty()) {
+//            return AjaxResult.error("请选择手机号");
+//        }
+//        return toAjax(fsStoreOrderService.batchUpdateErpByOrderIds(param));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -1032,55 +1035,56 @@ public class FsStoreOrderScrmController extends BaseController {
     @PostMapping(value = "/batchCreateErpOrder")
     public R batchCreateErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
     {
-        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
-        String loginAccount = param.getLoginAccount();
-        if (StringUtils.isBlank(loginAccount)){
-            return R.error("未选择推送erp账户");
-        }
-        FsStoreOrderDf df = getDFInfo(loginAccount);
-        if (df.getLoginAccount() == null){
-            return R.error("未查询到所选erp账户");
-        }
-        List<Long> orderIds = param.getOrderIds();
-        if (orderIds  == null || orderIds.isEmpty()) {
-            if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-            }
-            if(!StringUtils.isEmpty(param.getPayTimeRange())){
-                param.setPayTimeList(param.getPayTimeRange().split("--"));
-            }
-            if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-            }
-            if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-            }
-            param.setNotHealth(1);
-            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
-        }
-        if (orderIds.isEmpty()){
-            return R.ok();
-        }
-        orderIds.forEach(orderId->{
-            try {
-                df.setOrderId(orderId);
-                FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
-                if (temp == null){
-                    df.setParcelQuantity(param.getParcelQuantity()); //设置包裹数量
-                    fsStoreOrderDfService.insertFsStoreOrderDf(df);
-                    fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
-                            nickName + " " +FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
-                }
-                fsStoreOrderService.createOmsOrder(orderId);
-                fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.PUSH_ORDER_ERP.getValue(),
-                        nickName + " " +FsStoreOrderLogEnum.PUSH_ORDER_ERP.getDesc() + ":" + df.getLoginAccount());
-            } catch (ParseException e) {
-                throw new RuntimeException(e);
-            }
-
-        });
-        return R.ok();
+//        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+//        String loginAccount = param.getLoginAccount();
+//        if (StringUtils.isBlank(loginAccount)){
+//            return R.error("未选择推送erp账户");
+//        }
+//        FsStoreOrderDf df = getDFInfo(loginAccount);
+//        if (df.getLoginAccount() == null){
+//            return R.error("未查询到所选erp账户");
+//        }
+//        List<Long> orderIds = param.getOrderIds();
+//        if (orderIds  == null || orderIds.isEmpty()) {
+//            if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//            }
+//            if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//                param.setPayTimeList(param.getPayTimeRange().split("--"));
+//            }
+//            if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//            }
+//            if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//            }
+//            param.setNotHealth(1);
+//            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
+//        }
+//        if (orderIds.isEmpty()){
+//            return R.ok();
+//        }
+//        orderIds.forEach(orderId->{
+//            try {
+//                df.setOrderId(orderId);
+//                FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
+//                if (temp == null){
+//                    df.setParcelQuantity(param.getParcelQuantity()); //设置包裹数量
+//                    fsStoreOrderDfService.insertFsStoreOrderDf(df);
+//                    fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
+//                            nickName + " " +FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
+//                }
+//                fsStoreOrderService.createOmsOrder(orderId);
+//                fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.PUSH_ORDER_ERP.getValue(),
+//                        nickName + " " +FsStoreOrderLogEnum.PUSH_ORDER_ERP.getDesc() + ":" + df.getLoginAccount());
+//            } catch (ParseException e) {
+//                throw new RuntimeException(e);
+//            }
+//
+//        });
+//        return R.ok();
+        throw new RuntimeException("未实现");
     }
 
 
@@ -1089,50 +1093,51 @@ public class FsStoreOrderScrmController extends BaseController {
     @PostMapping(value = "/batchSetErpOrder")
     public R batchSetErpOrder(@RequestBody FsStoreOrderScrmSetErpPhoneParam param)
     {
-        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
-        String loginAccount = param.getLoginAccount();
-        if (StringUtils.isBlank(loginAccount)){
-            return R.error("未选择erp账户");
-        }
-        FsStoreOrderDf df = getDFInfo(loginAccount);
-        if (df.getLoginAccount() == null){
-            return R.error("未查询到所选erp账户");
-        }
-        List<Long> orderIds = param.getOrderIds();
-        if (orderIds  == null || orderIds.isEmpty()) {
-            if(!StringUtils.isEmpty(param.getCreateTimeRange())){
-                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
-            }
-            if(!StringUtils.isEmpty(param.getPayTimeRange())){
-                param.setPayTimeList(param.getPayTimeRange().split("--"));
-            }
-            if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
-                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
-            }
-            if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
-                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
-            }
-            param.setNotHealth(1);
-            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
-            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
-        }
-        if (orderIds.isEmpty()){
-            return R.ok();
-        }
-        orderIds.forEach(orderId->{
-            df.setOrderId(orderId);
-            FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
-            df.setParcelQuantity(param.getParcelQuantity());
-            if (temp != null){
-                df.setUpdateTime(new Date());
-                fsStoreOrderDfService.updateFsStoreOrderDf(df);
-            } else {
-                fsStoreOrderDfService.insertFsStoreOrderDf(df);
-            }
-            fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
-                    nickName + " " +FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
-        });
-        return R.ok();
+//        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
+//        String loginAccount = param.getLoginAccount();
+//        if (StringUtils.isBlank(loginAccount)){
+//            return R.error("未选择erp账户");
+//        }
+//        FsStoreOrderDf df = getDFInfo(loginAccount);
+//        if (df.getLoginAccount() == null){
+//            return R.error("未查询到所选erp账户");
+//        }
+//        List<Long> orderIds = param.getOrderIds();
+//        if (orderIds  == null || orderIds.isEmpty()) {
+//            if(!StringUtils.isEmpty(param.getCreateTimeRange())){
+//                param.setCreateTimeList(param.getCreateTimeRange().split("--"));
+//            }
+//            if(!StringUtils.isEmpty(param.getPayTimeRange())){
+//                param.setPayTimeList(param.getPayTimeRange().split("--"));
+//            }
+//            if(!StringUtils.isEmpty(param.getDeliveryImportTimeRange())){
+//                param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
+//            }
+//            if(!StringUtils.isEmpty(param.getDeliverySendTimeRange())){
+//                param.setDeliverySendTimeList(param.getDeliverySendTimeRange().split("--"));
+//            }
+//            param.setNotHealth(1);
+//            List<FsStoreOrderVO> list = fsStoreOrderService.selectFsStoreOrderListVO(param);
+//            orderIds = list.stream().map(FsStoreOrderVO::getId).collect(Collectors.toList());
+//        }
+//        if (orderIds.isEmpty()){
+//            return R.ok();
+//        }
+//        orderIds.forEach(orderId->{
+//            df.setOrderId(orderId);
+//            FsStoreOrderDf temp = fsStoreOrderDfService.selectFsStoreOrderDfByOrderId(df.getOrderId());
+//            df.setParcelQuantity(param.getParcelQuantity());
+//            if (temp != null){
+//                df.setUpdateTime(new Date());
+//                fsStoreOrderDfService.updateFsStoreOrderDf(df);
+//            } else {
+//                fsStoreOrderDfService.insertFsStoreOrderDf(df);
+//            }
+//            fsStoreOrderLogsService.create(orderId, FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getValue(),
+//                    nickName + " " +FsStoreOrderLogEnum.SET_PUSH_ACCOUNT.getDesc() + ":" + df.getLoginAccount());
+//        });
+//        return R.ok();
+        throw new RuntimeException("未实现");
     }
 
     @ApiOperation("批量审核订单")

fs-admin-saas/src/main/java/com/fs/hisStore/controller/FsStoreStatisticsScrmController.java

@@ -7,7 +7,7 @@ import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.TimeUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyUserService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.hisStore.param.FsStoreStatisticsParam;
 import com.fs.hisStore.service.IFsStoreOrderScrmService;
 import com.fs.hisStore.service.IFsStorePaymentScrmService;

fs-admin-saas/src/main/java/com/fs/live/controller/LiveAfterSalesController.java

@@ -5,13 +5,12 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysConfigService;
 import com.fs.his.domain.FsStoreAfterSalesLogs;
 import com.fs.his.domain.FsUser;
@@ -193,17 +192,18 @@ public class LiveAfterSalesController extends BaseController
     public AjaxResult edit(@RequestBody LiveAfterSales liveAfterSales)
     {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        //操作记录
-        LiveAfterSalesLogs logs = new LiveAfterSalesLogs();
-        logs.setChangeTime(new DateTime());
-        logs.setChangeType(2);
-        logs.setOperator(loginUser.getCompanyUser().getNickName());
-        logs.setStoreAfterSalesId(liveAfterSales.getId());
-        logs.setChangeMessage(FsStoreAfterSalesStatusEnum.STATUS_2.getDesc());
-        liveAfterSales.setStatus(FsStoreAfterSalesStatusEnum.STATUS_2.getValue());
-        liveAfterSalesLogsService.insertLiveAfterSalesLogs(logs);
-        return toAjax(liveAfterSalesService.updateLiveAfterSales(liveAfterSales));
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        //操作记录
+//        LiveAfterSalesLogs logs = new LiveAfterSalesLogs();
+//        logs.setChangeTime(new DateTime());
+//        logs.setChangeType(2);
+//        logs.setOperator(loginUser.getCompanyUser().getNickName());
+//        logs.setStoreAfterSalesId(liveAfterSales.getId());
+//        logs.setChangeMessage(FsStoreAfterSalesStatusEnum.STATUS_2.getDesc());
+//        liveAfterSales.setStatus(FsStoreAfterSalesStatusEnum.STATUS_2.getValue());
+//        liveAfterSalesLogsService.insertLiveAfterSalesLogs(logs);
+//        return toAjax(liveAfterSalesService.updateLiveAfterSales(liveAfterSales));
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -222,9 +222,10 @@ public class LiveAfterSalesController extends BaseController
     //平台审核
     public R audit1(@RequestBody LiveAfterSalesAudit1Param param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return liveAfterSalesService.audit1(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return liveAfterSalesService.audit1(param);
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:audit2')")
@@ -232,35 +233,39 @@ public class LiveAfterSalesController extends BaseController
     //仓库审核
     public R audit2(@RequestBody LiveAfterSalesAudit2Param param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return liveAfterSalesService.audit2(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return liveAfterSalesService.audit2(param);
+        throw new RuntimeException("未实现");
     }
     //财务审核
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:refund')")
     @PostMapping("/refund")
     public R refund(@RequestBody LiveAfterSalesRefundParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return liveAfterSalesService.refundMoney(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return liveAfterSalesService.refundMoney(param);
+        throw new RuntimeException("未实现");
     }
     //平台撤销
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:cancel')")
     @PostMapping("/cancel")
     public R cancel(@RequestBody LiveAfterSalesCancelParam param) throws ParseException {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return liveAfterSalesService.cancel(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return liveAfterSalesService.cancel(param);
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeAfterSales:refund')")
     @PostMapping("/handleImmediatelyRefund")
     public R handleImmediatelyRefund(@RequestBody LiveAfterSalesRefundParam param)
     {
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setOperator(loginUser.getCompanyUser().getNickName());
-        return liveAfterSalesService.handleImmediatelyRefund(param.getOrderId());
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setOperator(loginUser.getCompanyUser().getNickName());
+//        return liveAfterSalesService.handleImmediatelyRefund(param.getOrderId());
+        throw new RuntimeException("未实现");
     }
 
 }

fs-admin-saas/src/main/java/com/fs/live/controller/LiveController.java

@@ -10,7 +10,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.vo.CompanyVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.hisStore.task.LiveTask;
 import com.fs.hisStore.task.MallStoreTask;
 import com.fs.live.domain.Live;

fs-admin-saas/src/main/java/com/fs/live/controller/LiveDataController.java

@@ -9,7 +9,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.SecurityUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.CompanyUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.live.domain.LiveData;
 import com.fs.live.param.LiveDataParam;
 import com.fs.live.service.ILiveDataService;

fs-admin-saas/src/main/java/com/fs/live/controller/LiveGoodsController.java

@@ -5,8 +5,6 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysUser;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.security.SecurityUtils;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
@@ -91,10 +89,11 @@ public class LiveGoodsController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody Map<String, Object> payload)
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        //CompanyUser companyUser = companyUserService.selectCompanyUserById(loginUser.getCompanyUser().getUserId());
-        SysUser user = loginUser.getUser();
-        return toAjax(liveGoodsService.insertLiveGoodsAdmin(payload, user));
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        //CompanyUser companyUser = companyUserService.selectCompanyUserById(loginUser.getCompanyUser().getUserId());
+//        SysUser user = loginUser.getUser();
+//        return toAjax(liveGoodsService.insertLiveGoodsAdmin(payload, user));
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/live/controller/LiveMsgController.java

@@ -4,12 +4,11 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.live.domain.LiveMsg;
 import com.fs.live.service.ILiveMsgService;
 import com.fs.live.vo.LiveMsgExportVO;
@@ -119,15 +118,16 @@ public class LiveMsgController extends BaseController
     @GetMapping("/exportComments/{liveId}")
     public AjaxResult exportComments(@PathVariable("liveId") Long liveId)
     {
-        try {
-            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-            Long userId = loginUser.getCompanyUser().getUserId();
-            
-            List<LiveMsgExportVO> list = liveMsgService.exportLiveMsgComments(liveId, userId);
-            ExcelUtil<LiveMsgExportVO> util = new ExcelUtil<LiveMsgExportVO>(LiveMsgExportVO.class);
-            return util.exportExcel(list, "直播评论数据");
-        } catch (Exception e) {
-            return AjaxResult.error("导出失败：" + e.getMessage());
-        }
+//        try {
+//            com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//            Long userId = loginUser.getCompanyUser().getUserId();
+//
+//            List<LiveMsgExportVO> list = liveMsgService.exportLiveMsgComments(liveId, userId);
+//            ExcelUtil<LiveMsgExportVO> util = new ExcelUtil<LiveMsgExportVO>(LiveMsgExportVO.class);
+//            return util.exportExcel(list, "直播评论数据");
+//        } catch (Exception e) {
+//            return AjaxResult.error("导出失败：" + e.getMessage());
+//        }
+        throw new RuntimeException("未实现");
     }
 }

fs-admin-saas/src/main/java/com/fs/live/controller/LiveOrderController.java

@@ -23,7 +23,7 @@ import com.fs.erp.domain.ErpOrderQuery;
 import com.fs.erp.dto.ErpOrderQueryRequert;
 import com.fs.erp.dto.ErpOrderQueryResponse;
 import com.fs.erp.service.IErpOrderService;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsDfAccount;
 import com.fs.his.domain.FsStoreOrderDf;
 import com.fs.his.domain.FsUser;

fs-admin-saas/src/main/java/com/fs/live/controller/OrderController.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.core.page.PageDomain;
 import com.fs.common.core.page.TableSupport;
@@ -14,7 +13,7 @@ import com.fs.common.utils.ParseUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.constant.HttpStatus;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.hisStore.dto.StoreOrderProductDTO;
 import com.fs.hisStore.service.IMergedOrderService;
@@ -120,36 +119,37 @@ public class OrderController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(MergedOrderQueryParam param)
     {
-        // 先查询数据，限制查询20001条，用于判断是否超过限制
-        param.setExportFlag(1);
-        param.setPageNum(1);
-        param.setPageSize(maxExportCount + 1);
-        List<MergedOrderVO> list = mergedOrderService.selectMergedOrderList(param);
-        // 如果查询结果超过20000条，返回错误提示
-        if (list != null && list.size() > maxExportCount) {
-            return AjaxResult.error("导出数据量超过限制，最多只能导出" + maxExportCount + "条数据，请缩小查询范围后重试");
-        }
-        list = list.stream().filter(item -> StringUtils.isNotEmpty(item.getBankTransactionId())).collect(Collectors.toList());
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        for (MergedOrderVO vo : list) {
-            if (!StringUtils.isEmpty(vo.getItemJson())) {
-                try {
-                    StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getItemJson(), StoreOrderProductDTO.class);
-                    BeanUtil.copyProperties(orderProductDTO, vo);
-                } catch (Exception e) {
-                    System.out.println(e.getMessage());
-                }
-            }
-        }
-
-        // 转换为导出VO
-        List<MergedOrderExportVO> exportList = convertToExportVO(list, false,loginUser);
-
-        // 如果数据量在限制范围内，正常导出
-        ExcelUtil<MergedOrderExportVO> util = new ExcelUtil<>(MergedOrderExportVO.class);
-        return util.exportExcel(exportList, "合并订单数据");
+//        // 先查询数据，限制查询20001条，用于判断是否超过限制
+//        param.setExportFlag(1);
+//        param.setPageNum(1);
+//        param.setPageSize(maxExportCount + 1);
+//        List<MergedOrderVO> list = mergedOrderService.selectMergedOrderList(param);
+//        // 如果查询结果超过20000条，返回错误提示
+//        if (list != null && list.size() > maxExportCount) {
+//            return AjaxResult.error("导出数据量超过限制，最多只能导出" + maxExportCount + "条数据，请缩小查询范围后重试");
+//        }
+//        list = list.stream().filter(item -> StringUtils.isNotEmpty(item.getBankTransactionId())).collect(Collectors.toList());
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        for (MergedOrderVO vo : list) {
+//            if (!StringUtils.isEmpty(vo.getItemJson())) {
+//                try {
+//                    StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getItemJson(), StoreOrderProductDTO.class);
+//                    BeanUtil.copyProperties(orderProductDTO, vo);
+//                } catch (Exception e) {
+//                    System.out.println(e.getMessage());
+//                }
+//            }
+//        }
+//
+//        // 转换为导出VO
+//        List<MergedOrderExportVO> exportList = convertToExportVO(list, false,loginUser);
+//
+//        // 如果数据量在限制范围内，正常导出
+//        ExcelUtil<MergedOrderExportVO> util = new ExcelUtil<>(MergedOrderExportVO.class);
+//        return util.exportExcel(exportList, "合并订单数据");
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -161,36 +161,37 @@ public class OrderController extends BaseController
     @GetMapping("/exportDetails")
     public AjaxResult exportDetails(MergedOrderQueryParam param)
     {
-        // 先查询数据，限制查询20001条，用于判断是否超过限制
-        param.setExportFlag(1);
-        param.setPageNum(1);
-        param.setPageSize(maxExportCount + 1);
-        List<MergedOrderVO> list = mergedOrderService.selectMergedOrderList(param);
-        // 如果查询结果超过20000条，返回错误提示
-        if (list != null && list.size() > maxExportCount) {
-            return AjaxResult.error("导出数据量超过限制，最多只能导出" + maxExportCount + "条数据，请缩小查询范围后重试");
-        }
-        list = list.stream().filter(item -> StringUtils.isNotEmpty(item.getBankTransactionId())).collect(Collectors.toList());
-
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-
-        for (MergedOrderVO vo : list) {
-            if (!StringUtils.isEmpty(vo.getItemJson())) {
-                try {
-                    StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getItemJson(), StoreOrderProductDTO.class);
-                    BeanUtil.copyProperties(orderProductDTO, vo);
-                } catch (Exception e) {
-                }
-            }
-            //
-
-        }
-
-        // 转换为导出VO（明文模式，不脱敏）
-        List<MergedOrderExportVO> exportList = convertToExportVO(list, true,loginUser);
-
-        ExcelUtil<MergedOrderExportVO> util = new ExcelUtil<>(MergedOrderExportVO.class);
-        return util.exportExcel(exportList, "合并订单(明文)");
+//        // 先查询数据，限制查询20001条，用于判断是否超过限制
+//        param.setExportFlag(1);
+//        param.setPageNum(1);
+//        param.setPageSize(maxExportCount + 1);
+//        List<MergedOrderVO> list = mergedOrderService.selectMergedOrderList(param);
+//        // 如果查询结果超过20000条，返回错误提示
+//        if (list != null && list.size() > maxExportCount) {
+//            return AjaxResult.error("导出数据量超过限制，最多只能导出" + maxExportCount + "条数据，请缩小查询范围后重试");
+//        }
+//        list = list.stream().filter(item -> StringUtils.isNotEmpty(item.getBankTransactionId())).collect(Collectors.toList());
+//
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//
+//        for (MergedOrderVO vo : list) {
+//            if (!StringUtils.isEmpty(vo.getItemJson())) {
+//                try {
+//                    StoreOrderProductDTO orderProductDTO = JSONObject.parseObject(vo.getItemJson(), StoreOrderProductDTO.class);
+//                    BeanUtil.copyProperties(orderProductDTO, vo);
+//                } catch (Exception e) {
+//                }
+//            }
+//            //
+//
+//        }
+//
+//        // 转换为导出VO（明文模式，不脱敏）
+//        List<MergedOrderExportVO> exportList = convertToExportVO(list, true,loginUser);
+//
+//        ExcelUtil<MergedOrderExportVO> util = new ExcelUtil<>(MergedOrderExportVO.class);
+//        return util.exportExcel(exportList, "合并订单(明文)");
+        throw new RuntimeException("未实现");
     }
 
     /**
@@ -265,92 +266,4 @@ public class OrderController extends BaseController
         ExcelUtil<MergedOrderVO> util = new ExcelUtil<>(MergedOrderVO.class);
         return util.exportExcel(list, "合并订单发货单");
     }
-
-    /**
-     * 将 MergedOrderVO 转换为 MergedOrderExportVO
-     * @param list 原始数据列表
-     * @param isPlainText 是否为明文模式（true：不脱敏，false：脱敏）
-     * @return 导出VO列表
-     */
-    private List<MergedOrderExportVO> convertToExportVO(List<MergedOrderVO> list, boolean isPlainText,LoginUser loginUser)
-    {
-        if (list == null || list.isEmpty()) {
-            return new ArrayList<>();
-        }
-
-        return list.stream().map(vo -> {
-            MergedOrderExportVO exportVO = new MergedOrderExportVO();
-
-            // 订单基本信息（参考 FsStoreOrderItemExportVO 的顺序）
-            exportVO.setOrderTypeName(vo.getOrderTypeName());
-            exportVO.setOrderCode(vo.getOrderCode());
-            exportVO.setStatus(vo.getStatus() != null ? String.valueOf(vo.getStatus()) : null);
-            exportVO.setUserId(vo.getUserId());
-
-            // 产品信息
-            exportVO.setProductName(StringUtils.isEmpty(vo.getProductName()) ? "产品被删除" : vo.getProductName());
-            exportVO.setBarCode(vo.getBarCode());
-            exportVO.setProductSpec(StringUtils.isEmpty(vo.getProductSpec()) ? "默认" : vo.getProductSpec());
-            exportVO.setTotalNum(vo.getTotalNum());
-            exportVO.setPrice(vo.getTotalPrice()); // 产品价格使用订单总价
-            exportVO.setCost(vo.getCost() != null ? vo.getCost() : BigDecimal.ZERO);
-            exportVO.setFPrice(vo.getCost() != null ? vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())) : BigDecimal.ZERO); // 结算价，合并订单暂无此字段
-            exportVO.setPayPostage(vo.getPayDelivery());
-            exportVO.setCateName(StringUtils.isEmpty(vo.getCateName()) ? "产品被删除" : vo.getCateName());
-            // 收货信息
-            exportVO.setRealName(vo.getRealName());
-            if (isPlainText) {
-                exportVO.setUserPhone(vo.getUserPhone());
-                exportVO.setUserAddress(vo.getUserAddress());
-            } else {
-                exportVO.setUserPhone(ParseUtils.parsePhone(vo.getUserPhone()));
-                exportVO.setUserAddress(ParseUtils.parseAddress(vo.getUserAddress()));
-            }
-
-            // 时间信息
-            exportVO.setCreateTime(vo.getCreateTime());
-            exportVO.setPayTime(vo.getPayTime());
-            exportVO.setHfshh(vo.getHfshh());
-
-            // 物流信息
-            exportVO.setDeliverySn(vo.getDeliveryCode()); // 快递公司编号，合并订单暂无此字段
-            exportVO.setDeliveryName(vo.getDeliveryName()); // 快递公司，合并订单暂无此字段
-            exportVO.setDeliveryId(vo.getDeliveryId());
-
-            // 公司和销售信息
-            exportVO.setCompanyName(vo.getCompanyName());
-            exportVO.setCompanyUserNickName(vo.getCompanyUserNickName());
-
-            // 套餐信息
-            exportVO.setPackageName(null); // 套餐名称，合并订单暂无此字段
-            exportVO.setGroupBarCode(null); // 组合码，合并订单暂无此字段
-
-            // 凭证信息
-            exportVO.setIsUpload(null); // 是否上传凭证，合并订单暂无此字段
-            exportVO.setUploadTime(null); // 上传时间，合并订单暂无此字段
-
-            // 档期信息
-            exportVO.setScheduleName(null); // 归属档期，合并订单暂无此字段
-
-            // 银行交易流水号
-            exportVO.setBankTransactionId(vo.getBankTransactionId());
-
-            // 金额信息
-            exportVO.setTotalPrice(vo.getTotalPrice());
-            exportVO.setPayPrice(vo.getPayPrice());
-            exportVO.setPayMoney(vo.getPayMoney());
-            exportVO.setPayPostage(vo.getPayDelivery()); // 额外运费，合并订单暂无此字段
-            exportVO.setPayDelivery(vo.getPayDelivery());
-            if ((loginUser.getPermissions().contains("order:finance") || loginUser.getPermissions().contains("*:*:*") ) && !Objects.isNull(vo.getCost())) {
-                vo.setFPrice(vo.getCost().multiply(BigDecimal.valueOf(vo.getTotalNum())));
-            } else {
-                vo.setPayPostage(BigDecimal.ZERO);
-                vo.setCost(BigDecimal.ZERO);
-                vo.setFPrice(BigDecimal.ZERO);
-                vo.setBankTransactionId("");
-            }
-
-            return exportVO;
-        }).collect(Collectors.toList());
-    }
 }

fs-admin-saas/src/main/java/com/fs/third/controller/FeiyuCustomerController.java

@@ -8,7 +8,7 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.entity.SysDictData;
-import com.fs.framework.security.LoginUser;
+import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.exception.CustomException;
@@ -22,7 +22,7 @@ import com.fs.crm.param.CrmThirdFeiyuCluesSearchParam;
 import com.fs.crm.service.ICrmCustomerService;
 import com.fs.crm.service.ICrmCustomerThirdService;
 import com.fs.crm.vo.CrmCustomerListVO;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.system.service.ISysDictTypeService;
 import com.fs.third.http.HttpUtils;
 import com.fs.third.param.FeiyuCluesParam;
@@ -376,7 +376,7 @@ public class FeiyuCustomerController extends BaseController {
             crmImportParam.setClueId(jsObj.getString("clue_id"));
             list.add(crmImportParam);
         }
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         String operName = loginUser.getUsername();
         String message = crmCustomerService.importLineCustomer(list, operName);
         return AjaxResult.success(message);
@@ -388,7 +388,7 @@ public class FeiyuCustomerController extends BaseController {
         List<CrmLineCustomerImportParam> list=new ArrayList<CrmLineCustomerImportParam>();
         CrmLineCustomerImportParam crmImportParam = new CrmLineCustomerImportParam();
         String create_time=jsObj.getString("create_time");
-        Long timestamp =  new Long(create_time);
+        Long timestamp =  Long.valueOf(create_time);
         Date createTime = new Date(timestamp*1000);
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
         String createStrings = formatter.format(createTime);

fs-admin-saas/src/main/java/com/fs/user/FsUserAdminController.java

@@ -15,8 +15,7 @@ import com.fs.course.dto.BatchSendCourseDTO;
 import com.fs.course.param.FsCourseLinkCreateParam;
 import com.fs.course.service.IFsUserCompanyUserService;
 import com.fs.course.service.IFsUserCourseService;
-import com.fs.framework.security.LoginUser;
-import com.fs.framework.service.TokenService;
+import com.fs.framework.web.service.TokenService;
 import com.fs.his.domain.FsUser;
 import com.fs.his.service.IFsUserService;
 import com.fs.his.utils.PhoneUtil;
@@ -70,21 +69,22 @@ public class FsUserAdminController extends BaseController {
     public TableDataInfo pageList(@RequestBody FsUserPageListParam param) {
         //startPage();
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-       /* if (param.getIsMyFsUser()){
-            if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
-            param.setCompanyUserId(String.valueOf(loginUser.getCompanyUser().getUserId()));
-        }else {
-            if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        }*/
-        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        if(param.getPhone()!=null && !"".equals(param.getPhone())){
-            param.setPhone(PhoneUtil.encryptPhone(param.getPhone()));
-        }
-//        if(param.getCompanyUserId() == null) {
-//            throw new IllegalArgumentException("当前销售不存在！");
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//       /* if (param.getIsMyFsUser()){
+//            if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); };
+//            param.setCompanyUserId(String.valueOf(loginUser.getCompanyUser().getUserId()));
+//        }else {
+//            if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        }*/
+//        if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        if(param.getPhone()!=null && !"".equals(param.getPhone())){
+//            param.setPhone(PhoneUtil.encryptPhone(param.getPhone()));
 //        }
-        return fsUserService.selectFsUserPageListNew(param);
+////        if(param.getCompanyUserId() == null) {
+////            throw new IllegalArgumentException("当前销售不存在！");
+////        }
+//        return fsUserService.selectFsUserPageListNew(param);
+        throw new RuntimeException("未实现");
     }
 
     @PreAuthorize("@ss.hasPermi('user:fsUser:myList')")
@@ -92,14 +92,15 @@ public class FsUserAdminController extends BaseController {
     @ApiOperation("我的会员列表(与移动端使用的相同查询)")
     public TableDataInfo pageMyList(@RequestBody FsUserPageListParam param) {
 
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-                if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
-        param.setIsAdmin(loginUser.getCompanyUser().isAdmin());
-
-        if(param.getCompanyUserId() == null) {
-            throw new IllegalArgumentException("当前销售不存在！");
-        }
-        return fsUserService.selectFsUserPageListNew(param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//                if (param.getCompanyId() == null && loginUser.getCompany() != null) { param.setCompanyId(loginUser.getCompany().getCompanyId()); }
+//        param.setIsAdmin(loginUser.getCompanyUser().isAdmin());
+//
+//        if(param.getCompanyUserId() == null) {
+//            throw new IllegalArgumentException("当前销售不存在！");
+//        }
+//        return fsUserService.selectFsUserPageListNew(param);
+        throw new RuntimeException("未实现");
     }
 
     @PostMapping("/auditUser")
@@ -118,23 +119,24 @@ public class FsUserAdminController extends BaseController {
      */
     @PostMapping("/transfer")
     public R transfer(@RequestBody FsUserTransferParamDTO param){
-        log.info("客户转移: {}",param);
-        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setSourceCompanyUserId(loginUser.getCompanyUser().getUserId());
-        CustomerTransferApproval customerTransferApproval = new CustomerTransferApproval();
-        Long _transferCid = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
-        customerTransferApproval.setCorpId(String.valueOf(_transferCid));
-        customerTransferApproval.setCustomerIds(JSON.toJSONString(param.getUserIds()));
-        customerTransferApproval.setOriginalUserId(param.getSourceCompanyUserId());
-        customerTransferApproval.setTargetUserId(param.getTargetCompanyUserId());
-        customerTransferApproval.setInitiatorUserId(param.getSourceCompanyUserId());
-        customerTransferApproval.setContent(param.getContent());
-        customerTransferApproval.setCreatedAt(new Date());
-        customerTransferApproval.setUpdatedAt(new Date());
-        customerTransferApproval.setApprovalStatus(0);
-        customerTransferApproval.setTransferType(2);
-        transferApprovalService.insertCustomerTransferApproval(customerTransferApproval);
-        return R.ok("转移申请已经提交，等待转移成功!");
+//        log.info("客户转移: {}",param);
+//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
+//        param.setSourceCompanyUserId(loginUser.getCompanyUser().getUserId());
+//        CustomerTransferApproval customerTransferApproval = new CustomerTransferApproval();
+//        Long _transferCid = loginUser.getCompany() != null ? loginUser.getCompany().getCompanyId() : null;
+//        customerTransferApproval.setCorpId(String.valueOf(_transferCid));
+//        customerTransferApproval.setCustomerIds(JSON.toJSONString(param.getUserIds()));
+//        customerTransferApproval.setOriginalUserId(param.getSourceCompanyUserId());
+//        customerTransferApproval.setTargetUserId(param.getTargetCompanyUserId());
+//        customerTransferApproval.setInitiatorUserId(param.getSourceCompanyUserId());
+//        customerTransferApproval.setContent(param.getContent());
+//        customerTransferApproval.setCreatedAt(new Date());
+//        customerTransferApproval.setUpdatedAt(new Date());
+//        customerTransferApproval.setApprovalStatus(0);
+//        customerTransferApproval.setTransferType(2);
+//        transferApprovalService.insertCustomerTransferApproval(customerTransferApproval);
+//        return R.ok("转移申请已经提交，等待转移成功!");
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin-saas/src/main/java/com/fs/web/controller/monitor/SysUserOnlineController.java

@@ -15,7 +15,6 @@ import com.fs.common.annotation.Log;
 import com.fs.common.constant.Constants;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
-import com.fs.framework.security.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.enums.BusinessType;
@@ -42,40 +41,41 @@ public class SysUserOnlineController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(String ipaddr, String userName)
     {
-        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
-        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        for (String key : keys)
-        {
-            LoginUser user = (LoginUser) redisCache.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-                }
-            }
-            else if (StringUtils.isNotEmpty(ipaddr))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                }
-            }
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
-            {
-                if (StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-                }
-            }
-            else
-            {
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
-            }
-        }
-        Collections.reverse(userOnlineList);
-        userOnlineList.removeAll(Collections.singleton(null));
-        return getDataTable(userOnlineList);
+//        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
+//        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+//        for (String key : keys)
+//        {
+//            LoginUser user = (LoginUser) redisCache.getCacheObject(key);
+//            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+//            {
+//                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+//                {
+//                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+//                }
+//            }
+//            else if (StringUtils.isNotEmpty(ipaddr))
+//            {
+//                if (StringUtils.equals(ipaddr, user.getIpaddr()))
+//                {
+//                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+//                }
+//            }
+//            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+//            {
+//                if (StringUtils.equals(userName, user.getUsername()))
+//                {
+//                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+//                }
+//            }
+//            else
+//            {
+//                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+//            }
+//        }
+//        Collections.reverse(userOnlineList);
+//        userOnlineList.removeAll(Collections.singleton(null));
+//        return getDataTable(userOnlineList);
+        throw new RuntimeException("未实现");
     }
 
     /**

fs-admin/src/main/java/com/fs/admin/controller/AdminAdController.java

@@ -1,95 +1,95 @@
-package com.fs.admin.controller;
-
-import java.util.*;
-
-import com.fs.admin.helper.AdminCrossTenantHelper;
-import com.fs.common.annotation.Excel;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 总后台视频资源(广告账户)管理控制器
- * 遍历所有租户库查询 ad_account 数据
- */
-@RestController
-@RequestMapping("/admin/ad")
-public class AdminAdController extends BaseController {
-
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
-    @Log(title = "导出广告账户", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('admin:ad:list')")
-    @GetMapping("/export")
-    public AjaxResult export(@RequestParam(required = false) String accountName,
-                             @RequestParam(required = false) Long companyId,
-                             @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (accountName != null && !accountName.isEmpty()) {
-                        sql.append(" AND account_name LIKE ?");
-                        params.add("%" + accountName + "%");
-                    }
-                    sql.append(" ORDER BY create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<AdExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            AdExportVO vo = new AdExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setAccountName(str(m.get("account_name")));
-            vo.setPlatform(str(m.get("platform")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCostAmount(str(m.get("cost_amount")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<AdExportVO> util = new ExcelUtil<>(AdExportVO.class);
-        return util.exportExcel(voList, "广告账户数据");
-    }
-
-    private String str(Object o) { return o == null ? "" : o.toString(); }
-
-    @Data
-    public static class AdExportVO {
-        @Excel(name = "租户名称") private String companyName;
-        @Excel(name = "账户名称") private String accountName;
-        @Excel(name = "平台") private String platform;
-        @Excel(name = "状态") private String status;
-        @Excel(name = "消耗金额") private String costAmount;
-        @Excel(name = "创建时间") private String createTime;
-    }
-
-    @PreAuthorize("@ss.hasPermi('admin:ad:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(@RequestParam(required = false) String accountName,
-                              @RequestParam(required = false) Long companyId,
-                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (accountName != null && !accountName.isEmpty()) {
-                        sql.append(" AND account_name LIKE ?");
-                        params.add("%" + accountName + "%");
-                    }
-                    sql.append(" ORDER BY create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
-    }
-}
+//package com.fs.admin.controller;
+//
+//import java.util.*;
+//
+//import com.fs.admin.helper.AdminCrossTenantHelper;
+//import com.fs.common.annotation.Excel;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import lombok.Data;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+///**
+// * 总后台视频资源(广告账户)管理控制器
+// * 遍历所有租户库查询 ad_account 数据
+// */
+//@RestController
+//@RequestMapping("/admin/ad")
+//public class AdminAdController extends BaseController {
+//
+//    @Autowired
+//    private AdminCrossTenantHelper crossTenantHelper;
+//
+//    @Log(title = "导出广告账户", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('admin:ad:list')")
+//    @GetMapping("/export")
+//    public AjaxResult export(@RequestParam(required = false) String accountName,
+//                             @RequestParam(required = false) Long companyId,
+//                             @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (accountName != null && !accountName.isEmpty()) {
+//                        sql.append(" AND account_name LIKE ?");
+//                        params.add("%" + accountName + "%");
+//                    }
+//                    sql.append(" ORDER BY create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<AdExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            AdExportVO vo = new AdExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setAccountName(str(m.get("account_name")));
+//            vo.setPlatform(str(m.get("platform")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCostAmount(str(m.get("cost_amount")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<AdExportVO> util = new ExcelUtil<>(AdExportVO.class);
+//        return util.exportExcel(voList, "广告账户数据");
+//    }
+//
+//    private String str(Object o) { return o == null ? "" : o.toString(); }
+//
+//    @Data
+//    public static class AdExportVO {
+//        @Excel(name = "租户名称") private String companyName;
+//        @Excel(name = "账户名称") private String accountName;
+//        @Excel(name = "平台") private String platform;
+//        @Excel(name = "状态") private String status;
+//        @Excel(name = "消耗金额") private String costAmount;
+//        @Excel(name = "创建时间") private String createTime;
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('admin:ad:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(@RequestParam(required = false) String accountName,
+//                              @RequestParam(required = false) Long companyId,
+//                              @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT * FROM ad_account WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (accountName != null && !accountName.isEmpty()) {
+//                        sql.append(" AND account_name LIKE ?");
+//                        params.add("%" + accountName + "%");
+//                    }
+//                    sql.append(" ORDER BY create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+//    }
+//}

fs-admin/src/main/java/com/fs/admin/controller/AdminCrmController.java

@@ -1,92 +1,92 @@
-package com.fs.admin.controller;
-
-import java.util.*;
-
-import com.fs.admin.helper.AdminCrossTenantHelper;
-import com.fs.common.annotation.Excel;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 总后台CRM销冠语料管理控制器
- * 遍历所有租户库查询 crm_customer 数据
- */
-@RestController
-@RequestMapping("/admin/crm")
-public class AdminCrmController extends BaseController {
-
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
-    private String str(Object o) { return o == null ? "" : o.toString(); }
-
-    @Data
-    public static class CrmExportVO {
-        @Excel(name = "租户名称") private String companyName;
-        @Excel(name = "客户名称") private String customerName;
-        @Excel(name = "手机号") private String customerPhone;
-        @Excel(name = "客户阶段") private String stage;
-        @Excel(name = "创建时间") private String createTime;
-    }
-
-    @Log(title = "导出CRM客户", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('admin:crm:list')")
-    @GetMapping("/export")
-    public AjaxResult export(@RequestParam(required = false) String customerName,
-                             @RequestParam(required = false) Long companyId,
-                             @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (customerName != null && !customerName.isEmpty()) {
-                        sql.append(" AND c.customer_name LIKE ?");
-                        params.add("%" + customerName + "%");
-                    }
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<CrmExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            CrmExportVO vo = new CrmExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setCustomerName(str(m.get("customer_name")));
-            vo.setCustomerPhone(str(m.get("customer_phone")));
-            vo.setStage(str(m.get("stage")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<CrmExportVO> util = new ExcelUtil<>(CrmExportVO.class);
-        return util.exportExcel(voList, "CRM客户数据");
-    }
-
-    @PreAuthorize("@ss.hasPermi('admin:crm:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(@RequestParam(required = false) String customerName,
-                              @RequestParam(required = false) Long companyId,
-                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (customerName != null && !customerName.isEmpty()) {
-                        sql.append(" AND c.customer_name LIKE ?");
-                        params.add("%" + customerName + "%");
-                    }
-                    sql.append(" LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
-    }
-}
+//package com.fs.admin.controller;
+//
+//import java.util.*;
+//
+//import com.fs.admin.helper.AdminCrossTenantHelper;
+//import com.fs.common.annotation.Excel;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import lombok.Data;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+///**
+// * 总后台CRM销冠语料管理控制器
+// * 遍历所有租户库查询 crm_customer 数据
+// */
+//@RestController
+//@RequestMapping("/admin/crm")
+//public class AdminCrmController extends BaseController {
+//
+//    @Autowired
+//    private AdminCrossTenantHelper crossTenantHelper;
+//
+//    private String str(Object o) { return o == null ? "" : o.toString(); }
+//
+//    @Data
+//    public static class CrmExportVO {
+//        @Excel(name = "租户名称") private String companyName;
+//        @Excel(name = "客户名称") private String customerName;
+//        @Excel(name = "手机号") private String customerPhone;
+//        @Excel(name = "客户阶段") private String stage;
+//        @Excel(name = "创建时间") private String createTime;
+//    }
+//
+//    @Log(title = "导出CRM客户", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('admin:crm:list')")
+//    @GetMapping("/export")
+//    public AjaxResult export(@RequestParam(required = false) String customerName,
+//                             @RequestParam(required = false) Long companyId,
+//                             @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (customerName != null && !customerName.isEmpty()) {
+//                        sql.append(" AND c.customer_name LIKE ?");
+//                        params.add("%" + customerName + "%");
+//                    }
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<CrmExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            CrmExportVO vo = new CrmExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setCustomerName(str(m.get("customer_name")));
+//            vo.setCustomerPhone(str(m.get("customer_phone")));
+//            vo.setStage(str(m.get("stage")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<CrmExportVO> util = new ExcelUtil<>(CrmExportVO.class);
+//        return util.exportExcel(voList, "CRM客户数据");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('admin:crm:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(@RequestParam(required = false) String customerName,
+//                              @RequestParam(required = false) Long companyId,
+//                              @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT c.* FROM crm_customer c WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (customerName != null && !customerName.isEmpty()) {
+//                        sql.append(" AND c.customer_name LIKE ?");
+//                        params.add("%" + customerName + "%");
+//                    }
+//                    sql.append(" LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+//    }
+//}

fs-admin/src/main/java/com/fs/admin/controller/AdminSopController.java

@@ -1,114 +1,114 @@
-package com.fs.admin.controller;
-
-import java.util.*;
-
-import com.fs.admin.helper.AdminCrossTenantHelper;
-import com.fs.common.annotation.Excel;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 总后台SOP工作流管理控制器
- * 遍历所有租户库查询 qw_sop / qw_sop_temp 数据
- */
-@RestController
-@RequestMapping("/admin/sop")
-public class AdminSopController extends BaseController {
-
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
-    private String str(Object o) { return o == null ? "" : o.toString(); }
-
-    @Data
-    public static class SopExportVO {
-        @Excel(name = "租户名称") private String companyName;
-        @Excel(name = "SOP名称") private String name;
-        @Excel(name = "类型") private String type;
-        @Excel(name = "状态") private String status;
-        @Excel(name = "创建时间") private String createTime;
-    }
-
-    @Log(title = "导出SOP", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('admin:sop:list')")
-    @GetMapping("/export")
-    public AjaxResult export(@RequestParam(required = false) String sopName,
-                             @RequestParam(required = false) Long companyId,
-                             @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (sopName != null && !sopName.isEmpty()) {
-                        sql.append(" AND qs.name LIKE ?");
-                        params.add("%" + sopName + "%");
-                    }
-                    sql.append(" ORDER BY qs.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<SopExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            SopExportVO vo = new SopExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setName(str(m.get("name")));
-            vo.setType(str(m.get("type")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<SopExportVO> util = new ExcelUtil<>(SopExportVO.class);
-        return util.exportExcel(voList, "SOP数据");
-    }
-
-    @PreAuthorize("@ss.hasPermi('admin:sop:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(@RequestParam(required = false) String sopName,
-                              @RequestParam(required = false) Long companyId,
-                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (sopName != null && !sopName.isEmpty()) {
-                        sql.append(" AND qs.name LIKE ?");
-                        params.add("%" + sopName + "%");
-                    }
-                    sql.append(" ORDER BY qs.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
-    }
-
-    @PreAuthorize("@ss.hasPermi('admin:sop:list')")
-    @GetMapping("/temp/list")
-    public TableDataInfo tempList(@RequestParam(required = false) String tempName,
-                                  @RequestParam(required = false) Long companyId,
-                                  @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder("SELECT * FROM qw_sop_temp WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (tempName != null && !tempName.isEmpty()) {
-                        sql.append(" AND name LIKE ?");
-                        params.add("%" + tempName + "%");
-                    }
-                    sql.append(" ORDER BY create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
-    }
-}
+//package com.fs.admin.controller;
+//
+//import java.util.*;
+//
+//import com.fs.admin.helper.AdminCrossTenantHelper;
+//import com.fs.common.annotation.Excel;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import lombok.Data;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+///**
+// * 总后台SOP工作流管理控制器
+// * 遍历所有租户库查询 qw_sop / qw_sop_temp 数据
+// */
+//@RestController
+//@RequestMapping("/admin/sop")
+//public class AdminSopController extends BaseController {
+//
+//    @Autowired
+//    private AdminCrossTenantHelper crossTenantHelper;
+//
+//    private String str(Object o) { return o == null ? "" : o.toString(); }
+//
+//    @Data
+//    public static class SopExportVO {
+//        @Excel(name = "租户名称") private String companyName;
+//        @Excel(name = "SOP名称") private String name;
+//        @Excel(name = "类型") private String type;
+//        @Excel(name = "状态") private String status;
+//        @Excel(name = "创建时间") private String createTime;
+//    }
+//
+//    @Log(title = "导出SOP", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('admin:sop:list')")
+//    @GetMapping("/export")
+//    public AjaxResult export(@RequestParam(required = false) String sopName,
+//                             @RequestParam(required = false) Long companyId,
+//                             @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (sopName != null && !sopName.isEmpty()) {
+//                        sql.append(" AND qs.name LIKE ?");
+//                        params.add("%" + sopName + "%");
+//                    }
+//                    sql.append(" ORDER BY qs.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<SopExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            SopExportVO vo = new SopExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setName(str(m.get("name")));
+//            vo.setType(str(m.get("type")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<SopExportVO> util = new ExcelUtil<>(SopExportVO.class);
+//        return util.exportExcel(voList, "SOP数据");
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('admin:sop:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(@RequestParam(required = false) String sopName,
+//                              @RequestParam(required = false) Long companyId,
+//                              @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT qs.* FROM qw_sop qs WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (sopName != null && !sopName.isEmpty()) {
+//                        sql.append(" AND qs.name LIKE ?");
+//                        params.add("%" + sopName + "%");
+//                    }
+//                    sql.append(" ORDER BY qs.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+//    }
+//
+//    @PreAuthorize("@ss.hasPermi('admin:sop:list')")
+//    @GetMapping("/temp/list")
+//    public TableDataInfo tempList(@RequestParam(required = false) String tempName,
+//                                  @RequestParam(required = false) Long companyId,
+//                                  @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder("SELECT * FROM qw_sop_temp WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (tempName != null && !tempName.isEmpty()) {
+//                        sql.append(" AND name LIKE ?");
+//                        params.add("%" + tempName + "%");
+//                    }
+//                    sql.append(" ORDER BY create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+//    }
+//}

fs-admin/src/main/java/com/fs/admin/controller/CourseAdminController.java

@@ -1,122 +1,122 @@
-package com.fs.admin.controller;
-
-import java.util.*;
-
-import com.fs.admin.helper.AdminCrossTenantHelper;
-import com.fs.common.annotation.Excel;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.poi.ExcelUtil;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 总后台课程内容管理控制器
- * 遍历所有租户库查询课程数据
- */
-@RestController
-@RequestMapping("/admin/course")
-public class CourseAdminController extends BaseController {
-
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
-    private String str(Object o) { return o == null ? "" : o.toString(); }
-
-    @Data
-    public static class CourseExportVO {
-        @Excel(name = "租户名称") private String companyName;
-        @Excel(name = "课程名称") private String courseName;
-        @Excel(name = "播放次数") private String playCount;
-        @Excel(name = "状态") private String status;
-        @Excel(name = "创建时间") private String createTime;
-    }
-
-    @Log(title = "导出课程", businessType = BusinessType.EXPORT)
-    @PreAuthorize("@ss.hasPermi('admin:course:list')")
-    @GetMapping("/export")
-    public AjaxResult export(@RequestParam(required = false) String courseName,
-                             @RequestParam(required = false) Long companyId,
-                             @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
-                            "v.duration, v.play_count, v.create_time, v.status " +
-                            "FROM fs_user_course_video v WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (courseName != null && !courseName.isEmpty()) {
-                        sql.append(" AND v.course_name LIKE ?");
-                        params.add("%" + courseName + "%");
-                    }
-                    sql.append(" ORDER BY v.create_time DESC");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        List<CourseExportVO> voList = new ArrayList<>();
-        for (Map<String, Object> m : allList) {
-            CourseExportVO vo = new CourseExportVO();
-            vo.setCompanyName(str(m.get("company_name")));
-            vo.setCourseName(str(m.get("course_name")));
-            vo.setPlayCount(str(m.get("play_count")));
-            vo.setStatus(str(m.get("status")));
-            vo.setCreateTime(str(m.get("create_time")));
-            voList.add(vo);
-        }
-        ExcelUtil<CourseExportVO> util = new ExcelUtil<>(CourseExportVO.class);
-        return util.exportExcel(voList, "课程数据");
-    }
-
-    /**
-     * 查询所有租户的课程列表
-     */
-    @PreAuthorize("@ss.hasPermi('admin:course:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(@RequestParam(required = false) String courseName,
-                              @RequestParam(required = false) Long companyId,
-                              @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) -> {
-                    StringBuilder sql = new StringBuilder(
-                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
-                            "v.duration, v.play_count, v.create_time, v.status " +
-                            "FROM fs_user_course_video v WHERE 1=1");
-                    List<Object> params = new ArrayList<>();
-                    if (courseName != null && !courseName.isEmpty()) {
-                        sql.append(" AND v.course_name LIKE ?");
-                        params.add("%" + courseName + "%");
-                    }
-                    sql.append(" ORDER BY v.create_time DESC LIMIT 200");
-                    return params.isEmpty()
-                            ? jdbc.queryForList(sql.toString())
-                            : jdbc.queryForList(sql.toString(), params.toArray());
-                });
-        return getDataTable(allList);
-    }
-
-    /**
-     * 课程统计信息
-     */
-    @PreAuthorize("@ss.hasPermi('admin:course:query')")
-    @GetMapping("/statistics")
-    public AjaxResult statistics(@RequestParam(required = false) Long companyId,
-                                 @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList("SELECT video_id, status FROM fs_user_course_video"));
-        Map<String, Object> result = new HashMap<>();
-        result.put("totalCount", allList.size());
-        result.put("onlineCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
-        result.put("offlineCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
-        result.put("totalPlayCount", allList.stream()
-                .mapToLong(r -> r.get("play_count") != null ? ((Number) r.get("play_count")).longValue() : 0L)
-                .sum());
-        return AjaxResult.success(result);
-    }
-}
+//package com.fs.admin.controller;
+//
+//import java.util.*;
+//
+//import com.fs.admin.helper.AdminCrossTenantHelper;
+//import com.fs.common.annotation.Excel;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.poi.ExcelUtil;
+//import lombok.Data;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+///**
+// * 总后台课程内容管理控制器
+// * 遍历所有租户库查询课程数据
+// */
+//@RestController
+//@RequestMapping("/admin/course")
+//public class CourseAdminController extends BaseController {
+//
+//    @Autowired
+//    private AdminCrossTenantHelper crossTenantHelper;
+//
+//    private String str(Object o) { return o == null ? "" : o.toString(); }
+//
+//    @Data
+//    public static class CourseExportVO {
+//        @Excel(name = "租户名称") private String companyName;
+//        @Excel(name = "课程名称") private String courseName;
+//        @Excel(name = "播放次数") private String playCount;
+//        @Excel(name = "状态") private String status;
+//        @Excel(name = "创建时间") private String createTime;
+//    }
+//
+//    @Log(title = "导出课程", businessType = BusinessType.EXPORT)
+//    @PreAuthorize("@ss.hasPermi('admin:course:list')")
+//    @GetMapping("/export")
+//    public AjaxResult export(@RequestParam(required = false) String courseName,
+//                             @RequestParam(required = false) Long companyId,
+//                             @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
+//                            "v.duration, v.play_count, v.create_time, v.status " +
+//                            "FROM fs_user_course_video v WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (courseName != null && !courseName.isEmpty()) {
+//                        sql.append(" AND v.course_name LIKE ?");
+//                        params.add("%" + courseName + "%");
+//                    }
+//                    sql.append(" ORDER BY v.create_time DESC");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        List<CourseExportVO> voList = new ArrayList<>();
+//        for (Map<String, Object> m : allList) {
+//            CourseExportVO vo = new CourseExportVO();
+//            vo.setCompanyName(str(m.get("company_name")));
+//            vo.setCourseName(str(m.get("course_name")));
+//            vo.setPlayCount(str(m.get("play_count")));
+//            vo.setStatus(str(m.get("status")));
+//            vo.setCreateTime(str(m.get("create_time")));
+//            voList.add(vo);
+//        }
+//        ExcelUtil<CourseExportVO> util = new ExcelUtil<>(CourseExportVO.class);
+//        return util.exportExcel(voList, "课程数据");
+//    }
+//
+//    /**
+//     * 查询所有租户的课程列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('admin:course:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(@RequestParam(required = false) String courseName,
+//                              @RequestParam(required = false) Long companyId,
+//                              @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) -> {
+//                    StringBuilder sql = new StringBuilder(
+//                            "SELECT v.video_id, v.course_id, v.course_name, v.cover_url, " +
+//                            "v.duration, v.play_count, v.create_time, v.status " +
+//                            "FROM fs_user_course_video v WHERE 1=1");
+//                    List<Object> params = new ArrayList<>();
+//                    if (courseName != null && !courseName.isEmpty()) {
+//                        sql.append(" AND v.course_name LIKE ?");
+//                        params.add("%" + courseName + "%");
+//                    }
+//                    sql.append(" ORDER BY v.create_time DESC LIMIT 200");
+//                    return params.isEmpty()
+//                            ? jdbc.queryForList(sql.toString())
+//                            : jdbc.queryForList(sql.toString(), params.toArray());
+//                });
+//        return getDataTable(allList);
+//    }
+//
+//    /**
+//     * 课程统计信息
+//     */
+//    @PreAuthorize("@ss.hasPermi('admin:course:query')")
+//    @GetMapping("/statistics")
+//    public AjaxResult statistics(@RequestParam(required = false) Long companyId,
+//                                 @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList("SELECT video_id, status FROM fs_user_course_video"));
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("totalCount", allList.size());
+//        result.put("onlineCount", allList.stream().filter(r -> "0".equals(String.valueOf(r.get("status")))).count());
+//        result.put("offlineCount", allList.stream().filter(r -> "1".equals(String.valueOf(r.get("status")))).count());
+//        result.put("totalPlayCount", allList.stream()
+//                .mapToLong(r -> r.get("play_count") != null ? ((Number) r.get("play_count")).longValue() : 0L)
+//                .sum());
+//        return AjaxResult.success(result);
+//    }
+//}

fs-admin/src/main/java/com/fs/admin/controller/LobsterAdminController.java

@@ -1,57 +1,57 @@
-package com.fs.admin.controller;
-
-import java.util.*;
-
-import com.fs.admin.helper.AdminCrossTenantHelper;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 总后台龙虾引擎管理控制器
- * 遍历所有租户库查询工作流实例数据
- */
-@RestController
-@RequestMapping("/admin/lobster")
-public class LobsterAdminController extends BaseController {
-
-    @Autowired
-    private AdminCrossTenantHelper crossTenantHelper;
-
-    /**
-     * 查询所有租户的工作流实例列表
-     */
-    @PreAuthorize("@ss.hasPermi('admin:lobster:list')")
-    @GetMapping("/instance/list")
-    public TableDataInfo instanceList(@RequestParam(required = false) Long companyId,
-                                      @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList(
-                                "SELECT i.id, i.instance_name, i.workflow_id, i.status, " +
-                                "i.company_id, i.create_time, i.update_time " +
-                                "FROM lobster_workflow_instance i ORDER BY i.create_time DESC LIMIT 200"));
-        return getDataTable(allList);
-    }
-
-    /**
-     * 全局工作流运行统计
-     */
-    @PreAuthorize("@ss.hasPermi('admin:lobster:list')")
-    @GetMapping("/instance/stats")
-    public AjaxResult instanceStats(@RequestParam(required = false) Long companyId,
-                                    @RequestParam(required = false) String companyName) {
-        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
-                companyId, companyName, (tenant, jdbc) ->
-                        jdbc.queryForList("SELECT id, status FROM lobster_workflow_instance"));
-        Map<String, Object> stats = new HashMap<>();
-        stats.put("totalInstances", allList.size());
-        stats.put("runningInstances", allList.stream().filter(i -> "RUNNING".equals(String.valueOf(i.get("status")))).count());
-        stats.put("completedInstances", allList.stream().filter(i -> "COMPLETED".equals(String.valueOf(i.get("status")))).count());
-        stats.put("failedInstances", allList.stream().filter(i -> "FAILED".equals(String.valueOf(i.get("status")))).count());
-        return AjaxResult.success(stats);
-    }
-}
+//package com.fs.admin.controller;
+//
+//import java.util.*;
+//
+//import com.fs.admin.helper.AdminCrossTenantHelper;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+///**
+// * 总后台龙虾引擎管理控制器
+// * 遍历所有租户库查询工作流实例数据
+// */
+//@RestController
+//@RequestMapping("/admin/lobster")
+//public class LobsterAdminController extends BaseController {
+//
+//    @Autowired
+//    private AdminCrossTenantHelper crossTenantHelper;
+//
+//    /**
+//     * 查询所有租户的工作流实例列表
+//     */
+//    @PreAuthorize("@ss.hasPermi('admin:lobster:list')")
+//    @GetMapping("/instance/list")
+//    public TableDataInfo instanceList(@RequestParam(required = false) Long companyId,
+//                                      @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList(
+//                                "SELECT i.id, i.instance_name, i.workflow_id, i.status, " +
+//                                "i.company_id, i.create_time, i.update_time " +
+//                                "FROM lobster_workflow_instance i ORDER BY i.create_time DESC LIMIT 200"));
+//        return getDataTable(allList);
+//    }
+//
+//    /**
+//     * 全局工作流运行统计
+//     */
+//    @PreAuthorize("@ss.hasPermi('admin:lobster:list')")
+//    @GetMapping("/instance/stats")
+//    public AjaxResult instanceStats(@RequestParam(required = false) Long companyId,
+//                                    @RequestParam(required = false) String companyName) {
+//        List<Map<String, Object>> allList = crossTenantHelper.queryAcrossTenants(
+//                companyId, companyName, (tenant, jdbc) ->
+//                        jdbc.queryForList("SELECT id, status FROM lobster_workflow_instance"));
+//        Map<String, Object> stats = new HashMap<>();
+//        stats.put("totalInstances", allList.size());
+//        stats.put("runningInstances", allList.stream().filter(i -> "RUNNING".equals(String.valueOf(i.get("status")))).count());
+//        stats.put("completedInstances", allList.stream().filter(i -> "COMPLETED".equals(String.valueOf(i.get("status")))).count());
+//        stats.put("failedInstances", allList.stream().filter(i -> "FAILED".equals(String.valueOf(i.get("status")))).count());
+//        return AjaxResult.success(stats);
+//    }
+//}

fs-admin/src/main/java/com/fs/web/controller/monitor/SysUserOnlineController.java

@@ -1,89 +1,89 @@
-package com.fs.web.controller.monitor;
-
-import com.fs.common.annotation.Log;
-import com.fs.common.constant.Constants;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.page.TableDataInfo;
-import com.fs.common.core.redis.RedisCache;
-import com.fs.common.enums.BusinessType;
-import com.fs.common.utils.StringUtils;
-import com.fs.framework.security.LoginUser;
-import com.fs.system.domain.SysUserOnline;
-import com.fs.system.service.ISysUserOnlineService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * 在线用户监控
- *
-
- */
-@RestController
-@RequestMapping("/monitor/online")
-public class SysUserOnlineController extends BaseController
-{
-    @Autowired
-    private ISysUserOnlineService userOnlineService;
-
-    @Autowired
-    private RedisCache redisCache;
-
-    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(String ipaddr, String userName)
-    {
-        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
-        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
-        for (String key : keys)
-        {
-            LoginUser user = (LoginUser) redisCache.getCacheObject(key);
-            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
-                }
-            }
-            else if (StringUtils.isNotEmpty(ipaddr))
-            {
-                if (StringUtils.equals(ipaddr, user.getIpaddr()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
-                }
-            }
-            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
-            {
-                if (StringUtils.equals(userName, user.getUsername()))
-                {
-                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
-                }
-            }
-            else
-            {
-                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
-            }
-        }
-        Collections.reverse(userOnlineList);
-        userOnlineList.removeAll(Collections.singleton(null));
-        return getDataTable(userOnlineList);
-    }
-
-    /**
-     * 强退用户
-     */
-    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
-    @Log(title = "在线用户", businessType = BusinessType.FORCE)
-    @DeleteMapping("/{tokenId}")
-    public AjaxResult forceLogout(@PathVariable String tokenId)
-    {
-        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
-        return AjaxResult.success();
-    }
-}
+//package com.fs.web.controller.monitor;
+//
+//import com.fs.common.annotation.Log;
+//import com.fs.common.constant.Constants;
+//import com.fs.common.core.controller.BaseController;
+//import com.fs.common.core.domain.AjaxResult;
+//import com.fs.common.core.page.TableDataInfo;
+//import com.fs.common.core.redis.RedisCache;
+//import com.fs.common.enums.BusinessType;
+//import com.fs.common.utils.StringUtils;
+//import com.fs.framework.security.LoginUser;
+//import com.fs.system.domain.SysUserOnline;
+//import com.fs.system.service.ISysUserOnlineService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.security.access.prepost.PreAuthorize;
+//import org.springframework.web.bind.annotation.*;
+//
+//import java.util.ArrayList;
+//import java.util.Collection;
+//import java.util.Collections;
+//import java.util.List;
+//
+///**
+// * 在线用户监控
+// *
+//
+// */
+//@RestController
+//@RequestMapping("/monitor/online")
+//public class SysUserOnlineController extends BaseController
+//{
+//    @Autowired
+//    private ISysUserOnlineService userOnlineService;
+//
+//    @Autowired
+//    private RedisCache redisCache;
+//
+//    @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(String ipaddr, String userName)
+//    {
+//        Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
+//        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+//        for (String key : keys)
+//        {
+//            LoginUser user = (LoginUser) redisCache.getCacheObject(key);
+//            if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+//            {
+//                if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
+//                {
+//                    userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+//                }
+//            }
+//            else if (StringUtils.isNotEmpty(ipaddr))
+//            {
+//                if (StringUtils.equals(ipaddr, user.getIpaddr()))
+//                {
+//                    userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+//                }
+//            }
+//            else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+//            {
+//                if (StringUtils.equals(userName, user.getUsername()))
+//                {
+//                    userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+//                }
+//            }
+//            else
+//            {
+//                userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+//            }
+//        }
+//        Collections.reverse(userOnlineList);
+//        userOnlineList.removeAll(Collections.singleton(null));
+//        return getDataTable(userOnlineList);
+//    }
+//
+//    /**
+//     * 强退用户
+//     */
+//    @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+//    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+//    @DeleteMapping("/{tokenId}")
+//    public AjaxResult forceLogout(@PathVariable String tokenId)
+//    {
+//        redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+//        return AjaxResult.success();
+//    }
+//}

fs-framework/src/main/java/com/fs/framework/web/service/PermissionService.java

@@ -13,7 +13,7 @@ import com.fs.common.utils.StringUtils;
  * 
 
  */
-@Service("frameworkWebPermissionService")
+@Service("ss")
 public class PermissionService
 {
     /** 所有权限标识 */

fs-service/src/main/java/com/fs/admin/helper/AdminCrossTenantHelper.java

@@ -1,130 +1,130 @@
-package com.fs.admin.helper;
-
-import com.fs.common.enums.DataSourceType;
-import com.fs.framework.datasource.DynamicDataSourceContextHolder;
-import com.fs.framework.datasource.TenantDataSourceManager;
-import com.fs.tenant.domain.TenantInfo;
-import com.fs.tenant.service.TenantInfoService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.BiFunction;
-
-/**
- * 总后台跨租户查询聚合工具
- * <p>
- * 封装"遍历所有租户库 → 执行SQL → 聚合结果 → 附加租户标识"的通用流程，
- * 各 AdminController 只需提供SQL构建逻辑即可。
- * <p>
- * 每行结果自动注入: companyId / companyName / tenantCode
- */
-@Component
-public class AdminCrossTenantHelper {
-
-    private static final Logger log = LoggerFactory.getLogger(AdminCrossTenantHelper.class);
-
-    @Autowired
-    private TenantInfoService tenantInfoService;
-
-    @Autowired
-    private TenantDataSourceManager tenantDataSourceManager;
-
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
-    /**
-     * 获取过滤后的启用租户列表
-     *
-     * @param tenantId   指定租户ID（来自InlineTenantSelector），为null则不过滤
-     * @param tenantName 租户名称模糊搜索，为null/空则不过滤
-     * @return 过滤后的租户列表
-     */
-    public List<TenantInfo> getFilteredTenants(Long tenantId, String tenantName) {
-        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-        try {
-            List<TenantInfo> tenants = tenantInfoService.selectTenantInfoList(new TenantInfo());
-            tenants.removeIf(t -> t.getStatus() == null || t.getStatus() != 1);
-            if (tenantId != null) {
-                tenants.removeIf(t -> !t.getId().equals(tenantId));
-            }
-            if (tenantName != null && !tenantName.isEmpty()) {
-                String search = tenantName.toLowerCase();
-                tenants.removeIf(t -> t.getTenantName() == null ||
-                        !t.getTenantName().toLowerCase().contains(search));
-            }
-            return tenants;
-        } finally {
-            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-        }
-    }
-
-    /**
-     * 跨租户查询并聚合结果（使用回调函数构建每租户SQL）
-     *
-     * @param tenantId   指定租户ID（可选）
-     * @param tenantName 租户名称模糊搜索（可选）
-     * @param queryFunc   查询回调：(TenantInfo, JdbcTemplate) → 该租户的数据行
-     * @return 聚合结果，每行自动附加 companyId / companyName / tenantCode
-     */
-    public List<Map<String, Object>> queryAcrossTenants(Long tenantId, String tenantName,
-                                                        BiFunction<TenantInfo, JdbcTemplate, List<Map<String, Object>>> queryFunc) {
-        List<Map<String, Object>> allList = new ArrayList<>();
-        List<TenantInfo> tenants = getFilteredTenants(tenantId, tenantName);
-
-        for (TenantInfo tenant : tenants) {
-            try {
-                tenantDataSourceManager.switchTenant(tenant);
-                List<Map<String, Object>> rows = queryFunc.apply(tenant, jdbcTemplate);
-                if (rows != null) {
-                    for (Map<String, Object> row : rows) {
-                        row.put("companyId", tenant.getId());
-                        row.put("companyName", tenant.getTenantName());
-                        row.put("tenantCode", tenant.getTenantCode());
-                    }
-                    allList.addAll(rows);
-                }
-            } catch (Exception e) {
-                log.warn("跨租户查询跳过租户[{}]: {}", tenant.getTenantCode(), e.getMessage());
-            } finally {
-                tenantDataSourceManager.clear();
-                DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
-            }
-        }
-
-        return allList;
-    }
-
-    /**
-     * 跨租户查询并聚合结果（使用预构建SQL）
-     * <p>
-     * 便捷方法：直接传入SQL和参数，自动遍历每个租户执行。
-     *
-     * @param tenantId   指定租户ID（可选）
-     * @param tenantName 租户名称模糊搜索（可选）
-     * @param sql         查询SQL（SELECT ... FROM ... WHERE ...）
-     * @param args        SQL参数
-     * @return 聚合结果，每行自动附加 companyId / companyName / tenantCode
-     */
-    public List<Map<String, Object>> queryAcrossTenants(Long tenantId, String tenantName,
-                                                        String sql, Object... args) {
-        return queryAcrossTenants(tenantId, tenantName, (tenant, jdbc) -> {
-            if (args == null || args.length == 0) {
-                return jdbc.queryForList(sql);
-            }
-            return jdbc.queryForList(sql, args);
-        });
-    }
-
-    /**
-     * 获取 JdbcTemplate 实例（供Controller直接使用）
-     */
-    public JdbcTemplate getJdbcTemplate() {
-        return jdbcTemplate;
-    }
-}
+//package com.fs.admin.helper;
+//
+//import com.fs.common.enums.DataSourceType;
+//import com.fs.framework.datasource.DynamicDataSourceContextHolder;
+//import com.fs.framework.datasource.TenantDataSourceManager;
+//import com.fs.tenant.domain.TenantInfo;
+//import com.fs.tenant.service.TenantInfoService;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.jdbc.core.JdbcTemplate;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.function.BiFunction;
+//
+///**
+// * 总后台跨租户查询聚合工具
+// * <p>
+// * 封装"遍历所有租户库 → 执行SQL → 聚合结果 → 附加租户标识"的通用流程，
+// * 各 AdminController 只需提供SQL构建逻辑即可。
+// * <p>
+// * 每行结果自动注入: companyId / companyName / tenantCode
+// */
+//@Component
+//public class AdminCrossTenantHelper {
+//
+//    private static final Logger log = LoggerFactory.getLogger(AdminCrossTenantHelper.class);
+//
+//    @Autowired
+//    private TenantInfoService tenantInfoService;
+//
+//    @Autowired
+//    private TenantDataSourceManager tenantDataSourceManager;
+//
+//    @Autowired
+//    private JdbcTemplate jdbcTemplate;
+//
+//    /**
+//     * 获取过滤后的启用租户列表
+//     *
+//     * @param tenantId   指定租户ID（来自InlineTenantSelector），为null则不过滤
+//     * @param tenantName 租户名称模糊搜索，为null/空则不过滤
+//     * @return 过滤后的租户列表
+//     */
+//    public List<TenantInfo> getFilteredTenants(Long tenantId, String tenantName) {
+//        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+//        try {
+//            List<TenantInfo> tenants = tenantInfoService.selectTenantInfoList(new TenantInfo());
+//            tenants.removeIf(t -> t.getStatus() == null || t.getStatus() != 1);
+//            if (tenantId != null) {
+//                tenants.removeIf(t -> !t.getId().equals(tenantId));
+//            }
+//            if (tenantName != null && !tenantName.isEmpty()) {
+//                String search = tenantName.toLowerCase();
+//                tenants.removeIf(t -> t.getTenantName() == null ||
+//                        !t.getTenantName().toLowerCase().contains(search));
+//            }
+//            return tenants;
+//        } finally {
+//            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+//        }
+//    }
+//
+//    /**
+//     * 跨租户查询并聚合结果（使用回调函数构建每租户SQL）
+//     *
+//     * @param tenantId   指定租户ID（可选）
+//     * @param tenantName 租户名称模糊搜索（可选）
+//     * @param queryFunc   查询回调：(TenantInfo, JdbcTemplate) → 该租户的数据行
+//     * @return 聚合结果，每行自动附加 companyId / companyName / tenantCode
+//     */
+//    public List<Map<String, Object>> queryAcrossTenants(Long tenantId, String tenantName,
+//                                                        BiFunction<TenantInfo, JdbcTemplate, List<Map<String, Object>>> queryFunc) {
+//        List<Map<String, Object>> allList = new ArrayList<>();
+//        List<TenantInfo> tenants = getFilteredTenants(tenantId, tenantName);
+//
+//        for (TenantInfo tenant : tenants) {
+//            try {
+//                tenantDataSourceManager.switchTenant(tenant);
+//                List<Map<String, Object>> rows = queryFunc.apply(tenant, jdbcTemplate);
+//                if (rows != null) {
+//                    for (Map<String, Object> row : rows) {
+//                        row.put("companyId", tenant.getId());
+//                        row.put("companyName", tenant.getTenantName());
+//                        row.put("tenantCode", tenant.getTenantCode());
+//                    }
+//                    allList.addAll(rows);
+//                }
+//            } catch (Exception e) {
+//                log.warn("跨租户查询跳过租户[{}]: {}", tenant.getTenantCode(), e.getMessage());
+//            } finally {
+//                tenantDataSourceManager.clear();
+//                DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+//            }
+//        }
+//
+//        return allList;
+//    }
+//
+//    /**
+//     * 跨租户查询并聚合结果（使用预构建SQL）
+//     * <p>
+//     * 便捷方法：直接传入SQL和参数，自动遍历每个租户执行。
+//     *
+//     * @param tenantId   指定租户ID（可选）
+//     * @param tenantName 租户名称模糊搜索（可选）
+//     * @param sql         查询SQL（SELECT ... FROM ... WHERE ...）
+//     * @param args        SQL参数
+//     * @return 聚合结果，每行自动附加 companyId / companyName / tenantCode
+//     */
+//    public List<Map<String, Object>> queryAcrossTenants(Long tenantId, String tenantName,
+//                                                        String sql, Object... args) {
+//        return queryAcrossTenants(tenantId, tenantName, (tenant, jdbc) -> {
+//            if (args == null || args.length == 0) {
+//                return jdbc.queryForList(sql);
+//            }
+//            return jdbc.queryForList(sql, args);
+//        });
+//    }
+//
+//    /**
+//     * 获取 JdbcTemplate 实例（供Controller直接使用）
+//     */
+//    public JdbcTemplate getJdbcTemplate() {
+//        return jdbcTemplate;
+//    }
+//}

fs-service/src/main/java/com/fs/company/domain/LobsterSystemPrompt.java

@@ -0,0 +1,32 @@
+package com.fs.company.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 龙虾系统提示词实体 — 表: lobster_system_prompt
+ */
+@Data
+@TableName("lobster_system_prompt")
+public class LobsterSystemPrompt {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private String promptKey;
+    private String promptName;
+    private String promptCategory;
+    private String promptContent;
+    private String modelName;
+    private String systemRole;
+    private Long companyId;
+    private String industryType;
+    private Integer enabled;
+    private Integer sortOrder;
+    private String createBy;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+}

fs-service/src/main/java/com/fs/company/mapper/LobsterSystemPromptMapper.java

@@ -0,0 +1,29 @@
+package com.fs.company.mapper;
+
+import com.fs.company.domain.LobsterSystemPrompt;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 龙虾系统提示词 Mapper — 表: lobster_system_prompt
+ */
+public interface LobsterSystemPromptMapper {
+
+    List<LobsterSystemPrompt> selectList(@Param("category") String category,
+                                          @Param("search") String search,
+                                          @Param("offset") int offset,
+                                          @Param("limit") int limit);
+
+    long countList(@Param("category") String category, @Param("search") String search);
+
+    LobsterSystemPrompt selectById(@Param("id") Long id);
+
+    int insert(LobsterSystemPrompt record);
+
+    int updateById(LobsterSystemPrompt record);
+
+    int softDeleteById(@Param("id") Long id);
+
+    List<String> selectCategories();
+}

fs-service/src/main/java/com/fs/company/param/LobsterPromptParam.java

@@ -0,0 +1,19 @@
+package com.fs.company.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LobsterPromptParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String promptKey;
+    private String promptName;
+    private String promptCategory;
+    private String promptContent;
+    private String modelName;
+    private String systemRole;
+    private String industryType;
+}

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -68,10 +68,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import com.fs.framework.security.SecurityUtils;
-import com.fs.framework.datasource.DynamicDataSourceContextHolder;
 import com.fs.common.enums.DataSourceType;
-import com.fs.framework.datasource.TenantDataSourceManager;
 import com.fs.tenant.domain.TenantInfo;
 import com.fs.tenant.service.TenantInfoService;
 
@@ -145,9 +142,6 @@ public class CompanyUserServiceImpl implements ICompanyUserService
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
-    @Autowired(required = false)
-    private TenantDataSourceManager tenantDataSourceManager;
-
     @Autowired
     private TenantInfoService tenantInfoService;
 
@@ -169,35 +163,35 @@ public class CompanyUserServiceImpl implements ICompanyUserService
 
     private void ensureAnalyseDataColumnForAllTenants() {
         try {
-            // 1. 先补主库（如果 company_user 在主库也存在）
-            ensureAnalyseDataColumn(jdbcTemplate, "MASTER");
-
-            // 2. 遍历所有租户库补列
-            if (tenantDataSourceManager == null) {
-                logger.info("[CompanyUser] TenantDataSourceManager 不可用，跳过租户库补列");
-                return;
-            }
-            List<TenantInfo> tenants = tenantInfoService.list();
-            if (tenants == null || tenants.isEmpty()) {
-                logger.info("[CompanyUser] 无租户需要补列");
-                return;
-            }
-            for (TenantInfo tenant : tenants) {
-                if (tenant.getStatus() == null || !tenant.getStatus().equals(1)) {
-                    continue;
-                }
-                try {
-                    tenantDataSourceManager.switchTenant(tenant);
-                    // 切换数据源后，jdbcTemplate会使用租户数据源
-                    ensureAnalyseDataColumn(jdbcTemplate, "tenant:" + tenant.getId());
-                } catch (Exception e) {
-                    logger.warn("[CompanyUser] 租户 {} 补列失败: {}", tenant.getId(), e.getMessage());
-                } finally {
-                    try {
-                        tenantDataSourceManager.clear();
-                    } catch (Exception ignore) {}
-                }
-            }
+//            // 1. 先补主库（如果 company_user 在主库也存在）
+//            ensureAnalyseDataColumn(jdbcTemplate, "MASTER");
+//
+//            // 2. 遍历所有租户库补列
+//            if (tenantDataSourceManager == null) {
+//                logger.info("[CompanyUser] TenantDataSourceManager 不可用，跳过租户库补列");
+//                return;
+//            }
+//            List<TenantInfo> tenants = tenantInfoService.list();
+//            if (tenants == null || tenants.isEmpty()) {
+//                logger.info("[CompanyUser] 无租户需要补列");
+//                return;
+//            }
+//            for (TenantInfo tenant : tenants) {
+//                if (tenant.getStatus() == null || !tenant.getStatus().equals(1)) {
+//                    continue;
+//                }
+//                try {
+//                    tenantDataSourceManager.switchTenant(tenant);
+//                    // 切换数据源后，jdbcTemplate会使用租户数据源
+//                    ensureAnalyseDataColumn(jdbcTemplate, "tenant:" + tenant.getId());
+//                } catch (Exception e) {
+//                    logger.warn("[CompanyUser] 租户 {} 补列失败: {}", tenant.getId(), e.getMessage());
+//                } finally {
+//                    try {
+//                        tenantDataSourceManager.clear();
+//                    } catch (Exception ignore) {}
+//                }
+//            }
         } catch (Exception e) {
             logger.warn("[CompanyUser] 补列流程异常", e);
         }
@@ -214,7 +208,7 @@ public class CompanyUserServiceImpl implements ICompanyUserService
                 return;
             }
             logger.info("[CompanyUser] {} company_user 缺少 analyse_data 列，自动添加...", dsLabel);
-            jdbc.execute("ALTER TABLE company_user ADD COLUMN `analyse_data` text COMMENT '分析数据' AFTER `cid_server_id`");
+//            jdbc.execute("ALTER TABLE company_user ADD COLUMN `analyse_data` text COMMENT '分析数据' AFTER `cid_server_id`");
             logger.info("[CompanyUser] {} company_user.analyse_data 列添加成功", dsLabel);
         } catch (Exception e) {
             logger.warn("[CompanyUser] {} 补列检测失败: {}", dsLabel, e.getMessage());

fs-service/src/main/java/com/fs/company/service/workflow/ILobsterPromptService.java

@@ -0,0 +1,47 @@
+package com.fs.company.service.workflow;
+
+import com.fs.company.domain.LobsterSystemPrompt;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 龙虾提示词管理 Service
+ */
+public interface ILobsterPromptService {
+
+    /**
+     * 分页查询提示词列表
+     */
+    Map<String, Object> listPrompts(int page, int size, String category, String search);
+
+    /**
+     * 根据ID查询
+     */
+    LobsterSystemPrompt getById(Long id);
+
+    /**
+     * 新增提示词
+     */
+    void create(LobsterSystemPrompt prompt, String username, Long companyId);
+
+    /**
+     * 更新提示词
+     */
+    void update(Long id, LobsterSystemPrompt prompt, Long companyId);
+
+    /**
+     * 软删除提示词(设置enabled=0)
+     */
+    int softDelete(Long id);
+
+    /**
+     * 查询所有分类
+     */
+    List<String> getCategories();
+
+    /**
+     * 刷新缓存
+     */
+    void refreshCache();
+}

fs-service/src/main/java/com/fs/company/service/workflow/impl/LobsterPromptServiceImpl.java

@@ -0,0 +1,75 @@
+package com.fs.company.service.workflow.impl;
+
+import com.fs.company.domain.LobsterSystemPrompt;
+import com.fs.company.mapper.LobsterSystemPromptMapper;
+import com.fs.company.service.workflow.ILobsterPromptService;
+import com.fs.company.service.workflow.prompt.SystemPromptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class LobsterPromptServiceImpl implements ILobsterPromptService {
+
+    @Autowired
+    private LobsterSystemPromptMapper promptMapper;
+
+    @Autowired(required = false)
+    private SystemPromptService systemPromptService;
+
+    @Override
+    public Map<String, Object> listPrompts(int page, int size, String category, String search) {
+        int offset = (page - 1) * size;
+        List<LobsterSystemPrompt> list = promptMapper.selectList(category, search, offset, size);
+        long total = promptMapper.countList(category, search);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("list", list);
+        result.put("total", total);
+        result.put("page", page);
+        result.put("size", size);
+        return result;
+    }
+
+    @Override
+    public LobsterSystemPrompt getById(Long id) {
+        return promptMapper.selectById(id);
+    }
+
+    @Override
+    public void create(LobsterSystemPrompt prompt, String username, Long companyId) {
+        prompt.setCompanyId(companyId);
+        prompt.setCreateBy(username);
+        prompt.setEnabled(1);
+        prompt.setSortOrder(0);
+        promptMapper.insert(prompt);
+        if (systemPromptService != null) systemPromptService.refreshCache();
+    }
+
+    @Override
+    public void update(Long id, LobsterSystemPrompt prompt, Long companyId) {
+        prompt.setId(id);
+        promptMapper.updateById(prompt);
+        if (systemPromptService != null) systemPromptService.refreshCache();
+    }
+
+    @Override
+    public int softDelete(Long id) {
+        int rows = promptMapper.softDeleteById(id);
+        if (systemPromptService != null) systemPromptService.refreshCache();
+        return rows;
+    }
+
+    @Override
+    public List<String> getCategories() {
+        return promptMapper.selectCategories();
+    }
+
+    @Override
+    public void refreshCache() {
+        if (systemPromptService != null) systemPromptService.refreshCache();
+    }
+}

fs-service/src/main/java/com/fs/company/utils/UserUtil.java

@@ -5,7 +5,6 @@ import com.fs.common.exception.ServiceException;
 import com.fs.his.domain.StoreLoginUser;
 
 import static com.fs.common.utils.SecurityUtils.getAuthentication;
-import com.fs.framework.security.SecurityUtils;
 
 public class UserUtil {
 

fs-service/src/main/java/com/fs/course/service/IFsVideoBarrageService.java

@@ -2,7 +2,7 @@ package com.fs.course.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
+import com.fs.common.core.domain.model.LoginUser;
 import com.fs.course.domain.FsVideoBarrage;
 import com.fs.course.param.FsVideoBarrageQueryParam;
 import com.fs.course.vo.FsVideoBarrageExcelVo;

fs-service/src/main/java/com/fs/course/service/impl/FsVideoBarrageServiceImpl.java

@@ -3,7 +3,7 @@ package com.fs.course.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.common.BeanCopyUtils;
 import com.fs.common.core.domain.R;
-import com.fs.framework.security.LoginUser;
+import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.fs.course.domain.FsUserCourseVideo;

fs-service/src/main/java/com/fs/framework/aspectj/DataScopeAspect.java

@@ -1,171 +1,171 @@
-package com.fs.framework.aspectj;
-
-import com.fs.common.annotation.DataScope;
-import com.fs.common.core.domain.BaseEntity;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.spring.SpringUtils;
-import com.fs.company.domain.CompanyRole;
-import com.fs.company.domain.CompanyUser;
-import com.fs.common.core.domain.model.LoginUser;
-import com.fs.framework.service.TokenService;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-
-/**
- * 数据过滤处理
- *
-
- */
-@Aspect
-@Component
-public class DataScopeAspect
-{
-    /**
-     * 全部数据权限
-     */
-    public static final String DATA_SCOPE_ALL = "1";
-
-    /**
-     * 自定数据权限
-     */
-    public static final String DATA_SCOPE_CUSTOM = "2";
-
-    /**
-     * 部门数据权限
-     */
-    public static final String DATA_SCOPE_DEPT = "3";
-
-    /**
-     * 部门及以下数据权限
-     */
-    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
-    /**
-     * 仅本人数据权限
-     */
-    public static final String DATA_SCOPE_SELF = "5";
-
-    /**
-     * 数据权限过滤关键字
-     */
-    public static final String DATA_SCOPE = "dataScope";
-
-    // 配置织入点
-    @Pointcut("@annotation(com.fs.common.annotation.DataScope)")
-    public void dataScopePointCut()
-    {
-    }
-
-    @Before("dataScopePointCut()")
-    public void doBefore(JoinPoint point) throws Throwable
-    {
-        handleDataScope(point);
-    }
-
-    protected void handleDataScope(final JoinPoint joinPoint)
-    {
-        // 获得注解
-        DataScope controllerDataScope = getAnnotationLog(joinPoint);
-        if (controllerDataScope == null)
-        {
-            return;
-        }
-        // 获取当前的用户
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        if (StringUtils.isNotNull(loginUser))
-        {
-            CompanyUser currentUser = loginUser instanceof com.fs.framework.security.LoginUser ? ((com.fs.framework.security.LoginUser) loginUser).getCompanyUser() : null;
-            // 如果是超级管理员，则不过滤数据
-            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
-            {
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
-                        controllerDataScope.userAlias());
-            }
-        }
-    }
-
-    /**
-     * 数据范围过滤
-     *
-     * @param joinPoint 切点
-     * @param user 用户
-     * @param userAlias 别名
-     */
-    public static void dataScopeFilter(JoinPoint joinPoint, CompanyUser user, String deptAlias, String userAlias)
-    {
-        StringBuilder sqlString = new StringBuilder();
-
-        for (CompanyRole role : user.getRoles())
-        {
-            String dataScope = role.getDataScope();
-            if (DATA_SCOPE_ALL.equals(dataScope))
-            {
-                sqlString = new StringBuilder();
-                break;
-            }
-            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
-            {
-                sqlString.append(StringUtils.format(
-                        " OR {}.dept_id IN ( SELECT dept_id FROM company_role_dept WHERE role_id = {} ) ", deptAlias,
-                        role.getRoleId()));
-            }
-            else if (DATA_SCOPE_DEPT.equals(dataScope))
-            {
-                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
-            }
-            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
-            {
-                sqlString.append(StringUtils.format(
-                        " OR {}.dept_id IN ( SELECT dept_id FROM company_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
-                        deptAlias, user.getDeptId(), user.getDeptId()));
-            }
-            else if (DATA_SCOPE_SELF.equals(dataScope))
-            {
-                if (StringUtils.isNotBlank(userAlias))
-                {
-                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
-                }
-                else
-                {
-                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    //sqlString.append(" OR 1=0 ");
-                        sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
-                }
-            }
-        }
-
-        if (StringUtils.isNotBlank(sqlString.toString()))
-        {
-            Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
-            {
-                BaseEntity baseEntity = (BaseEntity) params;
-                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
-            }
-        }
-    }
-
-    /**
-     * 是否存在注解，如果存在就获取
-     */
-    private DataScope getAnnotationLog(JoinPoint joinPoint)
-    {
-        Signature signature = joinPoint.getSignature();
-        MethodSignature methodSignature = (MethodSignature) signature;
-        Method method = methodSignature.getMethod();
-
-        if (method != null)
-        {
-            return method.getAnnotation(DataScope.class);
-        }
-        return null;
-    }
-}
+//package com.fs.framework.aspectj;
+//
+//import com.fs.common.annotation.DataScope;
+//import com.fs.common.core.domain.BaseEntity;
+//import com.fs.common.utils.ServletUtils;
+//import com.fs.common.utils.StringUtils;
+//import com.fs.common.utils.spring.SpringUtils;
+//import com.fs.company.domain.CompanyRole;
+//import com.fs.company.domain.CompanyUser;
+//import com.fs.common.core.domain.model.LoginUser;
+//import com.fs.framework.service.TokenService;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.Signature;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.springframework.stereotype.Component;
+//
+//import java.lang.reflect.Method;
+//
+///**
+// * 数据过滤处理
+// *
+//
+// */
+//@Aspect
+//@Component
+//public class DataScopeAspect
+//{
+//    /**
+//     * 全部数据权限
+//     */
+//    public static final String DATA_SCOPE_ALL = "1";
+//
+//    /**
+//     * 自定数据权限
+//     */
+//    public static final String DATA_SCOPE_CUSTOM = "2";
+//
+//    /**
+//     * 部门数据权限
+//     */
+//    public static final String DATA_SCOPE_DEPT = "3";
+//
+//    /**
+//     * 部门及以下数据权限
+//     */
+//    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+//
+//    /**
+//     * 仅本人数据权限
+//     */
+//    public static final String DATA_SCOPE_SELF = "5";
+//
+//    /**
+//     * 数据权限过滤关键字
+//     */
+//    public static final String DATA_SCOPE = "dataScope";
+//
+//    // 配置织入点
+//    @Pointcut("@annotation(com.fs.common.annotation.DataScope)")
+//    public void dataScopePointCut()
+//    {
+//    }
+//
+//    @Before("dataScopePointCut()")
+//    public void doBefore(JoinPoint point) throws Throwable
+//    {
+//        handleDataScope(point);
+//    }
+//
+//    protected void handleDataScope(final JoinPoint joinPoint)
+//    {
+//        // 获得注解
+//        DataScope controllerDataScope = getAnnotationLog(joinPoint);
+//        if (controllerDataScope == null)
+//        {
+//            return;
+//        }
+//        // 获取当前的用户
+//        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+//        if (StringUtils.isNotNull(loginUser))
+//        {
+//            CompanyUser currentUser = loginUser instanceof com.fs.framework.security.LoginUser ? ((com.fs.framework.security.LoginUser) loginUser).getCompanyUser() : null;
+//            // 如果是超级管理员，则不过滤数据
+//            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
+//            {
+//                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
+//                        controllerDataScope.userAlias());
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 数据范围过滤
+//     *
+//     * @param joinPoint 切点
+//     * @param user 用户
+//     * @param userAlias 别名
+//     */
+//    public static void dataScopeFilter(JoinPoint joinPoint, CompanyUser user, String deptAlias, String userAlias)
+//    {
+//        StringBuilder sqlString = new StringBuilder();
+//
+//        for (CompanyRole role : user.getRoles())
+//        {
+//            String dataScope = role.getDataScope();
+//            if (DATA_SCOPE_ALL.equals(dataScope))
+//            {
+//                sqlString = new StringBuilder();
+//                break;
+//            }
+//            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
+//            {
+//                sqlString.append(StringUtils.format(
+//                        " OR {}.dept_id IN ( SELECT dept_id FROM company_role_dept WHERE role_id = {} ) ", deptAlias,
+//                        role.getRoleId()));
+//            }
+//            else if (DATA_SCOPE_DEPT.equals(dataScope))
+//            {
+//                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+//            }
+//            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
+//            {
+//                sqlString.append(StringUtils.format(
+//                        " OR {}.dept_id IN ( SELECT dept_id FROM company_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )",
+//                        deptAlias, user.getDeptId(), user.getDeptId()));
+//            }
+//            else if (DATA_SCOPE_SELF.equals(dataScope))
+//            {
+//                if (StringUtils.isNotBlank(userAlias))
+//                {
+//                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+//                }
+//                else
+//                {
+//                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
+//                    //sqlString.append(" OR 1=0 ");
+//                        sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
+//                }
+//            }
+//        }
+//
+//        if (StringUtils.isNotBlank(sqlString.toString()))
+//        {
+//            Object params = joinPoint.getArgs()[0];
+//            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+//            {
+//                BaseEntity baseEntity = (BaseEntity) params;
+//                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 是否存在注解，如果存在就获取
+//     */
+//    private DataScope getAnnotationLog(JoinPoint joinPoint)
+//    {
+//        Signature signature = joinPoint.getSignature();
+//        MethodSignature methodSignature = (MethodSignature) signature;
+//        Method method = methodSignature.getMethod();
+//
+//        if (method != null)
+//        {
+//            return method.getAnnotation(DataScope.class);
+//        }
+//        return null;
+//    }
+//}

fs-service/src/main/java/com/fs/framework/aspectj/DataSourceAspect.java

@@ -1,73 +1,73 @@
-package com.fs.framework.aspectj;
-
-import com.fs.common.annotation.DataSource;
-import com.fs.common.utils.StringUtils;
-import com.fs.framework.datasource.DynamicDataSourceContextHolder;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.util.Objects;
-
-/**
- * 多数据源处理
- * 
- 
- */
-@Aspect
-@Order(1)
-@Component
-public class DataSourceAspect
-{
-    protected Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Pointcut("@annotation(com.fs.common.annotation.DataSource)"
-            + "|| @within(com.fs.common.annotation.DataSource)")
-    public void dsPointCut()
-    {
-
-    }
-
-    @Around("dsPointCut()")
-    public Object around(ProceedingJoinPoint point) throws Throwable
-    {
-        DataSource dataSource = getDataSource(point);
-
-        if (StringUtils.isNotNull(dataSource))
-        {
-            DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
-        }
-
-        try
-        {
-            return point.proceed();
-        }
-        finally
-        {
-            // 销毁数据源 在执行方法之后
-            DynamicDataSourceContextHolder.clearDataSourceType();
-        }
-    }
-
-    /**
-     * 获取需要切换的数据源
-     */
-    public DataSource getDataSource(ProceedingJoinPoint point)
-    {
-        MethodSignature signature = (MethodSignature) point.getSignature();
-        DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
-        if (Objects.nonNull(dataSource))
-        {
-            return dataSource;
-        }
-
-        return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
-    }
-}
+//package com.fs.framework.aspectj;
+//
+//import com.fs.common.annotation.DataSource;
+//import com.fs.common.utils.StringUtils;
+//import com.fs.framework.datasource.DynamicDataSourceContextHolder;
+//import org.aspectj.lang.ProceedingJoinPoint;
+//import org.aspectj.lang.annotation.Around;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.core.annotation.AnnotationUtils;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.Objects;
+//
+///**
+// * 多数据源处理
+// *
+//
+// */
+//@Aspect
+//@Order(1)
+//@Component
+//public class DataSourceAspect
+//{
+//    protected Logger logger = LoggerFactory.getLogger(getClass());
+//
+//    @Pointcut("@annotation(com.fs.common.annotation.DataSource)"
+//            + "|| @within(com.fs.common.annotation.DataSource)")
+//    public void dsPointCut()
+//    {
+//
+//    }
+//
+//    @Around("dsPointCut()")
+//    public Object around(ProceedingJoinPoint point) throws Throwable
+//    {
+//        DataSource dataSource = getDataSource(point);
+//
+//        if (StringUtils.isNotNull(dataSource))
+//        {
+//            DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
+//        }
+//
+//        try
+//        {
+//            return point.proceed();
+//        }
+//        finally
+//        {
+//            // 销毁数据源 在执行方法之后
+//            DynamicDataSourceContextHolder.clearDataSourceType();
+//        }
+//    }
+//
+//    /**
+//     * 获取需要切换的数据源
+//     */
+//    public DataSource getDataSource(ProceedingJoinPoint point)
+//    {
+//        MethodSignature signature = (MethodSignature) point.getSignature();
+//        DataSource dataSource = AnnotationUtils.findAnnotation(signature.getMethod(), DataSource.class);
+//        if (Objects.nonNull(dataSource))
+//        {
+//            return dataSource;
+//        }
+//
+//        return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
+//    }
+//}

fs-service/src/main/java/com/fs/framework/aspectj/LogAspect.java

@@ -1,220 +1,220 @@
-package com.fs.framework.aspectj;
-
-import com.alibaba.fastjson.JSON;
-import com.fs.common.annotation.Log;
-import com.fs.common.enums.BusinessStatus;
-import com.fs.common.enums.HttpMethod;
-import com.fs.common.utils.ServletUtils;
-import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.ip.IpUtils;
-import com.fs.common.utils.spring.SpringUtils;
-import com.fs.company.domain.Company;
-import com.fs.company.domain.CompanyOperLog;
-import com.fs.framework.manager.AsyncManager;
-import com.fs.framework.manager.factory.AsyncFactory;
-import com.fs.common.core.domain.model.LoginUser;
-import com.fs.framework.service.TokenService;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.HandlerMapping;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-/**
- * 操作日志记录处理
- * 
-
- */
-@Aspect
-@Component
-public class LogAspect
-{
-    private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
-
-    // 配置织入点
-    @Pointcut("@annotation(com.fs.common.annotation.Log)")
-    public void logPointCut()
-    {
-    }
-
-    /**
-     * 处理完请求后执行
-     *
-     * @param joinPoint 切点
-     */
-    @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")
-    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)
-    {
-        handleLog(joinPoint, null, jsonResult);
-    }
-
-    /**
-     * 拦截异常操作
-     * 
-     * @param joinPoint 切点
-     * @param e 异常
-     */
-    @AfterThrowing(value = "logPointCut()", throwing = "e")
-    public void doAfterThrowing(JoinPoint joinPoint, Exception e)
-    {
-        handleLog(joinPoint, e, null);
-    }
-
-    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)
-    {
-        try
-        {
-            // 获得注解
-            Log controllerLog = getAnnotationLog(joinPoint);
-            if (controllerLog == null)
-            {
-                return;
-            }
-
-            // 获取当前的用户
-            LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-
-            // *========数据库日志=========*//
-            CompanyOperLog operLog = new CompanyOperLog();
-            if (loginUser != null && loginUser instanceof com.fs.framework.security.LoginUser) { Company company = ((com.fs.framework.security.LoginUser)loginUser).getCompany(); if (company != null) { operLog.setCompanyId(company.getCompanyId()); } }
-            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
-            // 请求的地址
-            String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
-            operLog.setOperIp(ip);
-            // 返回参数
-            operLog.setJsonResult(JSON.toJSONString(jsonResult));
-
-            operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
-            if (loginUser != null)
-            {
-                operLog.setOperName(loginUser.getUsername());
-            }
-
-            if (e != null)
-            {
-                operLog.setStatus(BusinessStatus.FAIL.ordinal());
-                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
-            }
-            // 设置方法名称
-            String className = joinPoint.getTarget().getClass().getName();
-            String methodName = joinPoint.getSignature().getName();
-            operLog.setMethod(className + "." + methodName + "()");
-            // 设置请求方式
-            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
-            // 处理设置注解上的参数
-            getControllerMethodDescription(joinPoint, controllerLog, operLog);
-            // 保存数据库
-            AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
-        }
-        catch (Exception exp)
-        {
-            // 记录本地异常日志
-            log.error("==前置通知异常==");
-            log.error("异常信息:{}", exp.getMessage());
-            exp.printStackTrace();
-        }
-    }
-
-    /**
-     * 获取注解中对方法的描述信息 用于Controller层注解
-     * 
-     * @param log 日志
-     * @param operLog 操作日志
-     * @throws Exception
-     */
-    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, CompanyOperLog operLog) throws Exception
-    {
-        // 设置action动作
-        operLog.setBusinessType(log.businessType().ordinal());
-        // 设置标题
-        operLog.setTitle(log.title());
-        // 设置操作人类别
-        operLog.setOperatorType(log.operatorType().ordinal());
-        // 是否需要保存request，参数和值
-        if (log.isSaveRequestData())
-        {
-            // 获取参数的信息，传入到数据库中。
-            setRequestValue(joinPoint, operLog);
-        }
-    }
-
-    /**
-     * 获取请求的参数，放到log中
-     * 
-     * @param operLog 操作日志
-     * @throws Exception 异常
-     */
-    private void setRequestValue(JoinPoint joinPoint, CompanyOperLog operLog) throws Exception
-    {
-        String requestMethod = operLog.getRequestMethod();
-        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
-        {
-            String params = argsArrayToString(joinPoint.getArgs());
-            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
-        }
-        else
-        {
-            Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
-            operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
-        }
-    }
-
-    /**
-     * 是否存在注解，如果存在就获取
-     */
-    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
-    {
-        Signature signature = joinPoint.getSignature();
-        MethodSignature methodSignature = (MethodSignature) signature;
-        Method method = methodSignature.getMethod();
-
-        if (method != null)
-        {
-            return method.getAnnotation(Log.class);
-        }
-        return null;
-    }
-
-    /**
-     * 参数拼装
-     */
-    private String argsArrayToString(Object[] paramsArray)
-    {
-        String params = "";
-        if (paramsArray != null && paramsArray.length > 0)
-        {
-            for (int i = 0; i < paramsArray.length; i++)
-            {
-                if (!isFilterObject(paramsArray[i]))
-                {
-                    Object jsonObj = JSON.toJSON(paramsArray[i]);
-                    params += jsonObj.toString() + " ";
-                }
-            }
-        }
-        return params.trim();
-    }
-
-    /**
-     * 判断是否需要过滤的对象。
-     * 
-     * @param o 对象信息。
-     * @return 如果是需要过滤的对象，则返回true；否则返回false。
-     */
-    public boolean isFilterObject(final Object o)
-    {
-        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;
-    }
-}
+//package com.fs.framework.aspectj;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.fs.common.annotation.Log;
+//import com.fs.common.enums.BusinessStatus;
+//import com.fs.common.enums.HttpMethod;
+//import com.fs.common.utils.ServletUtils;
+//import com.fs.common.utils.StringUtils;
+//import com.fs.common.utils.ip.IpUtils;
+//import com.fs.common.utils.spring.SpringUtils;
+//import com.fs.company.domain.Company;
+//import com.fs.company.domain.CompanyOperLog;
+//import com.fs.framework.manager.AsyncManager;
+//import com.fs.framework.manager.factory.AsyncFactory;
+//import com.fs.common.core.domain.model.LoginUser;
+//import com.fs.framework.service.TokenService;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.Signature;
+//import org.aspectj.lang.annotation.AfterReturning;
+//import org.aspectj.lang.annotation.AfterThrowing;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.aspectj.lang.reflect.MethodSignature;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.stereotype.Component;
+//import org.springframework.web.multipart.MultipartFile;
+//import org.springframework.web.servlet.HandlerMapping;
+//
+//import javax.servlet.http.HttpServletRequest;
+//import javax.servlet.http.HttpServletResponse;
+//import java.lang.reflect.Method;
+//import java.util.Map;
+//
+///**
+// * 操作日志记录处理
+// *
+//
+// */
+//@Aspect
+//@Component
+//public class LogAspect
+//{
+//    private static final Logger log = LoggerFactory.getLogger(LogAspect.class);
+//
+//    // 配置织入点
+//    @Pointcut("@annotation(com.fs.common.annotation.Log)")
+//    public void logPointCut()
+//    {
+//    }
+//
+//    /**
+//     * 处理完请求后执行
+//     *
+//     * @param joinPoint 切点
+//     */
+//    @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")
+//    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)
+//    {
+//        handleLog(joinPoint, null, jsonResult);
+//    }
+//
+//    /**
+//     * 拦截异常操作
+//     *
+//     * @param joinPoint 切点
+//     * @param e 异常
+//     */
+//    @AfterThrowing(value = "logPointCut()", throwing = "e")
+//    public void doAfterThrowing(JoinPoint joinPoint, Exception e)
+//    {
+//        handleLog(joinPoint, e, null);
+//    }
+//
+//    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)
+//    {
+//        try
+//        {
+//            // 获得注解
+//            Log controllerLog = getAnnotationLog(joinPoint);
+//            if (controllerLog == null)
+//            {
+//                return;
+//            }
+//
+//            // 获取当前的用户
+//            LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+//
+//            // *========数据库日志=========*//
+//            CompanyOperLog operLog = new CompanyOperLog();
+//            if (loginUser != null && loginUser instanceof com.fs.framework.security.LoginUser) { Company company = ((com.fs.framework.security.LoginUser)loginUser).getCompany(); if (company != null) { operLog.setCompanyId(company.getCompanyId()); } }
+//            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+//            // 请求的地址
+//            String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+//            operLog.setOperIp(ip);
+//            // 返回参数
+//            operLog.setJsonResult(JSON.toJSONString(jsonResult));
+//
+//            operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());
+//            if (loginUser != null)
+//            {
+//                operLog.setOperName(loginUser.getUsername());
+//            }
+//
+//            if (e != null)
+//            {
+//                operLog.setStatus(BusinessStatus.FAIL.ordinal());
+//                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
+//            }
+//            // 设置方法名称
+//            String className = joinPoint.getTarget().getClass().getName();
+//            String methodName = joinPoint.getSignature().getName();
+//            operLog.setMethod(className + "." + methodName + "()");
+//            // 设置请求方式
+//            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+//            // 处理设置注解上的参数
+//            getControllerMethodDescription(joinPoint, controllerLog, operLog);
+//            // 保存数据库
+//            AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
+//        }
+//        catch (Exception exp)
+//        {
+//            // 记录本地异常日志
+//            log.error("==前置通知异常==");
+//            log.error("异常信息:{}", exp.getMessage());
+//            exp.printStackTrace();
+//        }
+//    }
+//
+//    /**
+//     * 获取注解中对方法的描述信息 用于Controller层注解
+//     *
+//     * @param log 日志
+//     * @param operLog 操作日志
+//     * @throws Exception
+//     */
+//    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, CompanyOperLog operLog) throws Exception
+//    {
+//        // 设置action动作
+//        operLog.setBusinessType(log.businessType().ordinal());
+//        // 设置标题
+//        operLog.setTitle(log.title());
+//        // 设置操作人类别
+//        operLog.setOperatorType(log.operatorType().ordinal());
+//        // 是否需要保存request，参数和值
+//        if (log.isSaveRequestData())
+//        {
+//            // 获取参数的信息，传入到数据库中。
+//            setRequestValue(joinPoint, operLog);
+//        }
+//    }
+//
+//    /**
+//     * 获取请求的参数，放到log中
+//     *
+//     * @param operLog 操作日志
+//     * @throws Exception 异常
+//     */
+//    private void setRequestValue(JoinPoint joinPoint, CompanyOperLog operLog) throws Exception
+//    {
+//        String requestMethod = operLog.getRequestMethod();
+//        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))
+//        {
+//            String params = argsArrayToString(joinPoint.getArgs());
+//            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
+//        }
+//        else
+//        {
+//            Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);
+//            operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));
+//        }
+//    }
+//
+//    /**
+//     * 是否存在注解，如果存在就获取
+//     */
+//    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception
+//    {
+//        Signature signature = joinPoint.getSignature();
+//        MethodSignature methodSignature = (MethodSignature) signature;
+//        Method method = methodSignature.getMethod();
+//
+//        if (method != null)
+//        {
+//            return method.getAnnotation(Log.class);
+//        }
+//        return null;
+//    }
+//
+//    /**
+//     * 参数拼装
+//     */
+//    private String argsArrayToString(Object[] paramsArray)
+//    {
+//        String params = "";
+//        if (paramsArray != null && paramsArray.length > 0)
+//        {
+//            for (int i = 0; i < paramsArray.length; i++)
+//            {
+//                if (!isFilterObject(paramsArray[i]))
+//                {
+//                    Object jsonObj = JSON.toJSON(paramsArray[i]);
+//                    params += jsonObj.toString() + " ";
+//                }
+//            }
+//        }
+//        return params.trim();
+//    }
+//
+//    /**
+//     * 判断是否需要过滤的对象。
+//     *
+//     * @param o 对象信息。
+//     * @return 如果是需要过滤的对象，则返回true；否则返回false。
+//     */
+//    public boolean isFilterObject(final Object o)
+//    {
+//        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;
+//    }
+//}

fs-service/src/main/java/com/fs/framework/config/ArrayStringTypeHandler.java

@@ -1,58 +1,58 @@
-package com.fs.framework.config;
-
-import org.apache.ibatis.type.BaseTypeHandler;
-import org.apache.ibatis.type.JdbcType;
-import org.springframework.context.annotation.Configuration;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.List;
-
-@Configuration
-public class ArrayStringTypeHandler extends BaseTypeHandler<List<String>> {
-
-    @Override
-    public void setNonNullParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
-        // 将 List<String> 转换为字符串，ClickHouse 支持的格式为 "['item1', 'item2']"
-        StringBuilder sb = new StringBuilder();
-        sb.append("[");
-        for (int j = 0; j < parameter.size(); j++) {
-            sb.append("'").append(parameter.get(j)).append("'");
-            if (j < parameter.size() - 1) {
-                sb.append(",");
-            }
-        }
-        sb.append("]");
-        ps.setString(i, sb.toString());
-    }
-
-    @Override
-    public List<String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
-        // 处理查询结果，将其转换为 List<String>
-        String result = rs.getString(columnName);
-        return parseArray(result);
-    }
-
-    @Override
-    public List<String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
-        String result = rs.getString(columnIndex);
-        return parseArray(result);
-    }
-
-    @Override
-    public List<String> getNullableResult(java.sql.CallableStatement cs, int columnIndex) throws SQLException {
-        String result = cs.getString(columnIndex);
-        return parseArray(result);
-    }
-
-    private List<String> parseArray(String arrayStr) {
-        // 将 ClickHouse 的 Array 字符串转换为 List<String>
-        if (arrayStr == null || arrayStr.isEmpty()) {
-            return null;
-        }
-        arrayStr = arrayStr.substring(1, arrayStr.length() - 1);  // 去掉 "[" 和 "]"
-        String[] elements = arrayStr.split(",");
-        return java.util.Arrays.asList(elements);
-    }
-}
+//package com.fs.framework.config;
+//
+//import org.apache.ibatis.type.BaseTypeHandler;
+//import org.apache.ibatis.type.JdbcType;
+//import org.springframework.context.annotation.Configuration;
+//
+//import java.sql.PreparedStatement;
+//import java.sql.ResultSet;
+//import java.sql.SQLException;
+//import java.util.List;
+//
+//@Configuration
+//public class ArrayStringTypeHandler extends BaseTypeHandler<List<String>> {
+//
+//    @Override
+//    public void setNonNullParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
+//        // 将 List<String> 转换为字符串，ClickHouse 支持的格式为 "['item1', 'item2']"
+//        StringBuilder sb = new StringBuilder();
+//        sb.append("[");
+//        for (int j = 0; j < parameter.size(); j++) {
+//            sb.append("'").append(parameter.get(j)).append("'");
+//            if (j < parameter.size() - 1) {
+//                sb.append(",");
+//            }
+//        }
+//        sb.append("]");
+//        ps.setString(i, sb.toString());
+//    }
+//
+//    @Override
+//    public List<String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+//        // 处理查询结果，将其转换为 List<String>
+//        String result = rs.getString(columnName);
+//        return parseArray(result);
+//    }
+//
+//    @Override
+//    public List<String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+//        String result = rs.getString(columnIndex);
+//        return parseArray(result);
+//    }
+//
+//    @Override
+//    public List<String> getNullableResult(java.sql.CallableStatement cs, int columnIndex) throws SQLException {
+//        String result = cs.getString(columnIndex);
+//        return parseArray(result);
+//    }
+//
+//    private List<String> parseArray(String arrayStr) {
+//        // 将 ClickHouse 的 Array 字符串转换为 List<String>
+//        if (arrayStr == null || arrayStr.isEmpty()) {
+//            return null;
+//        }
+//        arrayStr = arrayStr.substring(1, arrayStr.length() - 1);  // 去掉 "[" 和 "]"
+//        String[] elements = arrayStr.split(",");
+//        return java.util.Arrays.asList(elements);
+//    }
+//}

fs-service/src/main/java/com/fs/framework/config/CaptchaConfig.java

@@ -1,85 +1,85 @@
-package com.fs.framework.config;
-
-import com.google.code.kaptcha.impl.DefaultKaptcha;
-import com.google.code.kaptcha.util.Config;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.Properties;
-
-import static com.google.code.kaptcha.Constants.*;
-
-/**
- * 验证码配置
- * 
-
- */
-@Configuration
-public class CaptchaConfig
-{
-    @Bean(name = "captchaProducer")
-    public DefaultKaptcha getKaptchaBean()
-    {
-        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
-        Properties properties = new Properties();
-        // 是否有边框 默认为true 我们可以自己设置yes，no
-        properties.setProperty(KAPTCHA_BORDER, "yes");
-        // 验证码文本字符颜色 默认为Color.BLACK
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black");
-        // 验证码图片宽度 默认为200
-        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
-        // 验证码图片高度 默认为50
-        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
-        // 验证码文本字符大小 默认为40
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38");
-        // KAPTCHA_SESSION_KEY
-        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode");
-        // 验证码文本字符长度 默认为5
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
-        // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
-        // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
-        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
-        Config config = new Config(properties);
-        defaultKaptcha.setConfig(config);
-        return defaultKaptcha;
-    }
-
-    @Bean(name = "captchaProducerMath")
-    public DefaultKaptcha getKaptchaBeanMath()
-    {
-        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
-        Properties properties = new Properties();
-        // 是否有边框 默认为true 我们可以自己设置yes，no
-        properties.setProperty(KAPTCHA_BORDER, "yes");
-        // 边框颜色 默认为Color.BLACK
-        properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90");
-        // 验证码文本字符颜色 默认为Color.BLACK
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue");
-        // 验证码图片宽度 默认为200
-        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
-        // 验证码图片高度 默认为50
-        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
-        // 验证码文本字符大小 默认为40
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35");
-        // KAPTCHA_SESSION_KEY
-        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
-        // 验证码文本生成器
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.fs.framework.config.KaptchaTextCreator");
-        // 验证码文本字符间距 默认为2
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3");
-        // 验证码文本字符长度 默认为5
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6");
-        // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
-        // 验证码噪点颜色 默认为Color.BLACK
-        properties.setProperty(KAPTCHA_NOISE_COLOR, "white");
-        // 干扰实现类
-        properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise");
-        // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
-        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
-        Config config = new Config(properties);
-        defaultKaptcha.setConfig(config);
-        return defaultKaptcha;
-    }
-}
+//package com.fs.framework.config;
+//
+//import com.google.code.kaptcha.impl.DefaultKaptcha;
+//import com.google.code.kaptcha.util.Config;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import java.util.Properties;
+//
+//import static com.google.code.kaptcha.Constants.*;
+//
+///**
+// * 验证码配置
+// *
+//
+// */
+//@Configuration
+//public class CaptchaConfig
+//{
+//    @Bean(name = "captchaProducer")
+//    public DefaultKaptcha getKaptchaBean()
+//    {
+//        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+//        Properties properties = new Properties();
+//        // 是否有边框 默认为true 我们可以自己设置yes，no
+//        properties.setProperty(KAPTCHA_BORDER, "yes");
+//        // 验证码文本字符颜色 默认为Color.BLACK
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "black");
+//        // 验证码图片宽度 默认为200
+//        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
+//        // 验证码图片高度 默认为50
+//        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
+//        // 验证码文本字符大小 默认为40
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "38");
+//        // KAPTCHA_SESSION_KEY
+//        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCode");
+//        // 验证码文本字符长度 默认为5
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "4");
+//        // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
+//        // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
+//        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
+//        Config config = new Config(properties);
+//        defaultKaptcha.setConfig(config);
+//        return defaultKaptcha;
+//    }
+//
+//    @Bean(name = "captchaProducerMath")
+//    public DefaultKaptcha getKaptchaBeanMath()
+//    {
+//        DefaultKaptcha defaultKaptcha = new DefaultKaptcha();
+//        Properties properties = new Properties();
+//        // 是否有边框 默认为true 我们可以自己设置yes，no
+//        properties.setProperty(KAPTCHA_BORDER, "yes");
+//        // 边框颜色 默认为Color.BLACK
+//        properties.setProperty(KAPTCHA_BORDER_COLOR, "105,179,90");
+//        // 验证码文本字符颜色 默认为Color.BLACK
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_COLOR, "blue");
+//        // 验证码图片宽度 默认为200
+//        properties.setProperty(KAPTCHA_IMAGE_WIDTH, "160");
+//        // 验证码图片高度 默认为50
+//        properties.setProperty(KAPTCHA_IMAGE_HEIGHT, "60");
+//        // 验证码文本字符大小 默认为40
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_SIZE, "35");
+//        // KAPTCHA_SESSION_KEY
+//        properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
+//        // 验证码文本生成器
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.fs.framework.config.KaptchaTextCreator");
+//        // 验证码文本字符间距 默认为2
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3");
+//        // 验证码文本字符长度 默认为5
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_LENGTH, "6");
+//        // 验证码文本字体样式 默认为new Font("Arial", 1, fontSize), new Font("Courier", 1, fontSize)
+//        properties.setProperty(KAPTCHA_TEXTPRODUCER_FONT_NAMES, "Arial,Courier");
+//        // 验证码噪点颜色 默认为Color.BLACK
+//        properties.setProperty(KAPTCHA_NOISE_COLOR, "white");
+//        // 干扰实现类
+//        properties.setProperty(KAPTCHA_NOISE_IMPL, "com.google.code.kaptcha.impl.NoNoise");
+//        // 图片样式 水纹com.google.code.kaptcha.impl.WaterRipple 鱼眼com.google.code.kaptcha.impl.FishEyeGimpy 阴影com.google.code.kaptcha.impl.ShadowGimpy
+//        properties.setProperty(KAPTCHA_OBSCURIFICATOR_IMPL, "com.google.code.kaptcha.impl.ShadowGimpy");
+//        Config config = new Config(properties);
+//        defaultKaptcha.setConfig(config);
+//        return defaultKaptcha;
+//    }
+//}

fs-service/src/main/java/com/fs/framework/config/DataSourceTaskDecorator.java

@@ -1,40 +1,40 @@
-package com.fs.framework.config;
-
-import com.fs.framework.datasource.DynamicDataSourceContextHolder;
-import org.slf4j.MDC;
-import org.springframework.core.task.TaskDecorator;
-
-import java.util.Map;
-
-/**
- * 异步线程数据源上下文传递装饰器
- * 解决 @Async 方法中 ThreadLocal 数据源标识丢失的问题
- */
-public class DataSourceTaskDecorator implements TaskDecorator {
-
-    @Override
-    public Runnable decorate(Runnable runnable) {
-        // 捕获提交线程的数据源标识
-        String dataSourceType = DynamicDataSourceContextHolder.getDataSourceType();
-        // 捕获提交线程的 MDC 上下文
-        Map<String, String> contextMap = MDC.getCopyOfContextMap();
-
-        return () -> {
-            try {
-                // 在异步线程中恢复数据源标识
-                if (dataSourceType != null) {
-                    DynamicDataSourceContextHolder.setDataSourceType(dataSourceType);
-                }
-                // 恢复 MDC 上下文
-                if (contextMap != null) {
-                    MDC.setContextMap(contextMap);
-                }
-                runnable.run();
-            } finally {
-                // 清理，避免线程复用污染
-                DynamicDataSourceContextHolder.clearDataSourceType();
-                MDC.clear();
-            }
-        };
-    }
-}
+//package com.fs.framework.config;
+//
+//import com.fs.framework.datasource.DynamicDataSourceContextHolder;
+//import org.slf4j.MDC;
+//import org.springframework.core.task.TaskDecorator;
+//
+//import java.util.Map;
+//
+///**
+// * 异步线程数据源上下文传递装饰器
+// * 解决 @Async 方法中 ThreadLocal 数据源标识丢失的问题
+// */
+//public class DataSourceTaskDecorator implements TaskDecorator {
+//
+//    @Override
+//    public Runnable decorate(Runnable runnable) {
+//        // 捕获提交线程的数据源标识
+//        String dataSourceType = DynamicDataSourceContextHolder.getDataSourceType();
+//        // 捕获提交线程的 MDC 上下文
+//        Map<String, String> contextMap = MDC.getCopyOfContextMap();
+//
+//        return () -> {
+//            try {
+//                // 在异步线程中恢复数据源标识
+//                if (dataSourceType != null) {
+//                    DynamicDataSourceContextHolder.setDataSourceType(dataSourceType);
+//                }
+//                // 恢复 MDC 上下文
+//                if (contextMap != null) {
+//                    MDC.setContextMap(contextMap);
+//                }
+//                runnable.run();
+//            } finally {
+//                // 清理，避免线程复用污染
+//                DynamicDataSourceContextHolder.clearDataSourceType();
+//                MDC.clear();
+//            }
+//        };
+//    }
+//}

fs-service/src/main/java/com/fs/framework/config/FastJson2JsonRedisSerializer.java

@@ -1,72 +1,72 @@
-package com.fs.framework.config;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.parser.ParserConfig;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
-import org.springframework.util.Assert;
-
-import java.nio.charset.Charset;
-
-/**
- * Redis使用FastJson序列化
- * 
-
- */
-public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
-{
-    @SuppressWarnings("unused")
-    private ObjectMapper objectMapper = new ObjectMapper();
-
-    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-
-    private Class<T> clazz;
-
-    static
-    {
-        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
-    }
-
-    public FastJson2JsonRedisSerializer(Class<T> clazz)
-    {
-        super();
-        this.clazz = clazz;
-    }
-
-    @Override
-    public byte[] serialize(T t) throws SerializationException
-    {
-        if (t == null)
-        {
-            return new byte[0];
-        }
-        return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
-    }
-
-    @Override
-    public T deserialize(byte[] bytes) throws SerializationException
-    {
-        if (bytes == null || bytes.length <= 0)
-        {
-            return null;
-        }
-        String str = new String(bytes, DEFAULT_CHARSET);
-
-        return JSON.parseObject(str, clazz);
-    }
-
-    public void setObjectMapper(ObjectMapper objectMapper)
-    {
-        Assert.notNull(objectMapper, "'objectMapper' must not be null");
-        this.objectMapper = objectMapper;
-    }
-
-    protected JavaType getJavaType(Class<?> clazz)
-    {
-        return TypeFactory.defaultInstance().constructType(clazz);
-    }
-}
+//package com.fs.framework.config;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.parser.ParserConfig;
+//import com.alibaba.fastjson.serializer.SerializerFeature;
+//import com.fasterxml.jackson.databind.JavaType;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.fasterxml.jackson.databind.type.TypeFactory;
+//import org.springframework.data.redis.serializer.RedisSerializer;
+//import org.springframework.data.redis.serializer.SerializationException;
+//import org.springframework.util.Assert;
+//
+//import java.nio.charset.Charset;
+//
+///**
+// * Redis使用FastJson序列化
+// *
+//
+// */
+//public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
+//{
+//    @SuppressWarnings("unused")
+//    private ObjectMapper objectMapper = new ObjectMapper();
+//
+//    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+//
+//    private Class<T> clazz;
+//
+//    static
+//    {
+//        ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
+//    }
+//
+//    public FastJson2JsonRedisSerializer(Class<T> clazz)
+//    {
+//        super();
+//        this.clazz = clazz;
+//    }
+//
+//    @Override
+//    public byte[] serialize(T t) throws SerializationException
+//    {
+//        if (t == null)
+//        {
+//            return new byte[0];
+//        }
+//        return JSON.toJSONString(t, SerializerFeature.WriteClassName).getBytes(DEFAULT_CHARSET);
+//    }
+//
+//    @Override
+//    public T deserialize(byte[] bytes) throws SerializationException
+//    {
+//        if (bytes == null || bytes.length <= 0)
+//        {
+//            return null;
+//        }
+//        String str = new String(bytes, DEFAULT_CHARSET);
+//
+//        return JSON.parseObject(str, clazz);
+//    }
+//
+//    public void setObjectMapper(ObjectMapper objectMapper)
+//    {
+//        Assert.notNull(objectMapper, "'objectMapper' must not be null");
+//        this.objectMapper = objectMapper;
+//    }
+//
+//    protected JavaType getJavaType(Class<?> clazz)
+//    {
+//        return TypeFactory.defaultInstance().constructType(clazz);
+//    }
+//}

fs-service/src/main/java/com/fs/framework/config/FilterConfig.java

@@ -1,59 +1,59 @@
-package com.fs.framework.config;
-
-import com.fs.common.filter.RepeatableFilter;
-import com.fs.common.filter.XssFilter;
-import com.fs.common.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.servlet.DispatcherType;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Filter配置
- *
-
- */
-@Configuration
-@ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
-public class FilterConfig
-{
-    @Value("${xss.excludes}")
-    private String excludes;
-
-    @Value("${xss.urlPatterns}")
-    private String urlPatterns;
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    @Bean
-    public FilterRegistrationBean xssFilterRegistration()
-    {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setDispatcherTypes(DispatcherType.REQUEST);
-        registration.setFilter(new XssFilter());
-        registration.addUrlPatterns(StringUtils.split(urlPatterns, ","));
-        registration.setName("xssFilter");
-        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
-        Map<String, String> initParameters = new HashMap<String, String>();
-        initParameters.put("excludes", excludes);
-        registration.setInitParameters(initParameters);
-        return registration;
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    @Bean
-    public FilterRegistrationBean someFilterRegistration()
-    {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setFilter(new RepeatableFilter());
-        registration.addUrlPatterns("/*");
-        registration.setName("repeatableFilter");
-        registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
-        return registration;
-    }
-
-}
+//package com.fs.framework.config;
+//
+//import com.fs.common.filter.RepeatableFilter;
+//import com.fs.common.filter.XssFilter;
+//import com.fs.common.utils.StringUtils;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.boot.web.servlet.FilterRegistrationBean;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import javax.servlet.DispatcherType;
+//import java.util.HashMap;
+//import java.util.Map;
+//
+///**
+// * Filter配置
+// *
+//
+// */
+//@Configuration
+//@ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
+//public class FilterConfig
+//{
+//    @Value("${xss.excludes}")
+//    private String excludes;
+//
+//    @Value("${xss.urlPatterns}")
+//    private String urlPatterns;
+//
+//    @SuppressWarnings({ "rawtypes", "unchecked" })
+//    @Bean
+//    public FilterRegistrationBean xssFilterRegistration()
+//    {
+//        FilterRegistrationBean registration = new FilterRegistrationBean();
+//        registration.setDispatcherTypes(DispatcherType.REQUEST);
+//        registration.setFilter(new XssFilter());
+//        registration.addUrlPatterns(StringUtils.split(urlPatterns, ","));
+//        registration.setName("xssFilter");
+//        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
+//        Map<String, String> initParameters = new HashMap<String, String>();
+//        initParameters.put("excludes", excludes);
+//        registration.setInitParameters(initParameters);
+//        return registration;
+//    }
+//
+//    @SuppressWarnings({ "rawtypes", "unchecked" })
+//    @Bean
+//    public FilterRegistrationBean someFilterRegistration()
+//    {
+//        FilterRegistrationBean registration = new FilterRegistrationBean();
+//        registration.setFilter(new RepeatableFilter());
+//        registration.addUrlPatterns("/*");
+//        registration.setName("repeatableFilter");
+//        registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
+//        return registration;
+//    }
+//
+//}

fs-service/src/main/java/com/fs/framework/config/KaptchaTextCreator.java

@@ -1,76 +1,76 @@
-package com.fs.framework.config;
-
-import com.google.code.kaptcha.text.impl.DefaultTextCreator;
-
-import java.util.Random;
-
-/**
- * 验证码文本生成器
- * 
-
- */
-public class KaptchaTextCreator extends DefaultTextCreator
-{
-    private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(",");
-
-    @Override
-    public String getText()
-    {
-        Integer result = 0;
-        Random random = new Random();
-        int x = random.nextInt(10);
-        int y = random.nextInt(10);
-        StringBuilder suChinese = new StringBuilder();
-        int randomoperands = (int) Math.round(Math.random() * 2);
-        if (randomoperands == 0)
-        {
-            result = x * y;
-            suChinese.append(CNUMBERS[x]);
-            suChinese.append("*");
-            suChinese.append(CNUMBERS[y]);
-        }
-        else if (randomoperands == 1)
-        {
-            if (!(x == 0) && y % x == 0)
-            {
-                result = y / x;
-                suChinese.append(CNUMBERS[y]);
-                suChinese.append("/");
-                suChinese.append(CNUMBERS[x]);
-            }
-            else
-            {
-                result = x + y;
-                suChinese.append(CNUMBERS[x]);
-                suChinese.append("+");
-                suChinese.append(CNUMBERS[y]);
-            }
-        }
-        else if (randomoperands == 2)
-        {
-            if (x >= y)
-            {
-                result = x - y;
-                suChinese.append(CNUMBERS[x]);
-                suChinese.append("-");
-                suChinese.append(CNUMBERS[y]);
-            }
-            else
-            {
-                result = y - x;
-                suChinese.append(CNUMBERS[y]);
-                suChinese.append("-");
-                suChinese.append(CNUMBERS[x]);
-            }
-        }
-        else
-        {
-            result = x + y;
-            suChinese.append(CNUMBERS[x]);
-            suChinese.append("+");
-            suChinese.append(CNUMBERS[y]);
-        }
-        suChinese.append("=?@" + result);
-        return suChinese.toString();
-    }
-}
+//package com.fs.framework.config;
+//
+//import com.google.code.kaptcha.text.impl.DefaultTextCreator;
+//
+//import java.util.Random;
+//
+///**
+// * 验证码文本生成器
+// *
+//
+// */
+//public class KaptchaTextCreator extends DefaultTextCreator
+//{
+//    private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(",");
+//
+//    @Override
+//    public String getText()
+//    {
+//        Integer result = 0;
+//        Random random = new Random();
+//        int x = random.nextInt(10);
+//        int y = random.nextInt(10);
+//        StringBuilder suChinese = new StringBuilder();
+//        int randomoperands = (int) Math.round(Math.random() * 2);
+//        if (randomoperands == 0)
+//        {
+//            result = x * y;
+//            suChinese.append(CNUMBERS[x]);
+//            suChinese.append("*");
+//            suChinese.append(CNUMBERS[y]);
+//        }
+//        else if (randomoperands == 1)
+//        {
+//            if (!(x == 0) && y % x == 0)
+//            {
+//                result = y / x;
+//                suChinese.append(CNUMBERS[y]);
+//                suChinese.append("/");
+//                suChinese.append(CNUMBERS[x]);
+//            }
+//            else
+//            {
+//                result = x + y;
+//                suChinese.append(CNUMBERS[x]);
+//                suChinese.append("+");
+//                suChinese.append(CNUMBERS[y]);
+//            }
+//        }
+//        else if (randomoperands == 2)
+//        {
+//            if (x >= y)
+//            {
+//                result = x - y;
+//                suChinese.append(CNUMBERS[x]);
+//                suChinese.append("-");
+//                suChinese.append(CNUMBERS[y]);
+//            }
+//            else
+//            {
+//                result = y - x;
+//                suChinese.append(CNUMBERS[y]);
+//                suChinese.append("-");
+//                suChinese.append(CNUMBERS[x]);
+//            }
+//        }
+//        else
+//        {
+//            result = x + y;
+//            suChinese.append(CNUMBERS[x]);
+//            suChinese.append("+");
+//            suChinese.append(CNUMBERS[y]);
+//        }
+//        suChinese.append("=?@" + result);
+//        return suChinese.toString();
+//    }
+//}

fs-service/src/main/java/com/fs/framework/config/MyBatisConfig.java

@@ -1,158 +1,158 @@
-package com.fs.framework.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.fs.common.utils.StringUtils;
-import org.apache.ibatis.io.VFS;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
-import org.springframework.core.type.classreading.MetadataReader;
-import org.springframework.core.type.classreading.MetadataReaderFactory;
-import org.springframework.util.ClassUtils;
-
-import javax.sql.DataSource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * Mybatis支持*匹配扫描包
- *
-
- */
-@Configuration
-public class MyBatisConfig
-{
-    private static final Logger log = LoggerFactory.getLogger(MyBatisConfig.class);
-
-    @Autowired
-    private Environment env;
-
-    static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
-
-    public static String setTypeAliasesPackage(String typeAliasesPackage)
-    {
-        ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
-        MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
-        List<String> allResult = new ArrayList<String>();
-        try
-        {
-            for (String aliasesPackage : typeAliasesPackage.split(","))
-            {
-                List<String> result = new ArrayList<String>();
-                aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
-                        + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
-                Resource[] resources = resolver.getResources(aliasesPackage);
-                if (resources != null && resources.length > 0)
-                {
-                    MetadataReader metadataReader = null;
-                    for (Resource resource : resources)
-                    {
-                        if (resource.isReadable())
-                        {
-                            metadataReader = metadataReaderFactory.getMetadataReader(resource);
-                            try
-                            {
-                                result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
-                            }
-                            catch (ClassNotFoundException e)
-                            {
-                                log.error("mybatis typeAliasesPackage 类未找到: {}", metadataReader.getClassMetadata().getClassName(), e);
-                            }
-                        }
-                    }
-                }
-                if (result.size() > 0)
-                {
-                    HashSet<String> hashResult = new HashSet<String>(result);
-                    allResult.addAll(hashResult);
-                }
-            }
-            if (allResult.size() > 0)
-            {
-                typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
-            }
-            else
-            {
-                throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
-            }
-        }
-        catch (IOException e)
-        {
-            log.error("mybatis typeAliasesPackage 路径扫描IO错误,参数typeAliasesPackage:" + typeAliasesPackage, e);
-        }
-        return typeAliasesPackage;
-    }
-
-    public Resource[] resolveMapperLocations(String[] mapperLocations)
-    {
-        ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
-        List<Resource> resources = new ArrayList<Resource>();
-        if (mapperLocations != null)
-        {
-            for (String mapperLocation : mapperLocations)
-            {
-                try
-                {
-                    Resource[] mappers = resourceResolver.getResources(mapperLocation);
-                    resources.addAll(Arrays.asList(mappers));
-                }
-                catch (IOException e)
-                {
-                    // ignore
-                }
-            }
-        }
-        return resources.toArray(new Resource[resources.size()]);
-    }
-
+//package com.fs.framework.config;
+//
+//import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+//import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+//import com.fs.common.utils.StringUtils;
+//import org.apache.ibatis.io.VFS;
+//import org.apache.ibatis.session.SqlSessionFactory;
+//import org.mybatis.spring.SqlSessionFactoryBean;
+//import org.mybatis.spring.boot.autoconfigure.SpringBootVFS;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.core.env.Environment;
+//import org.springframework.core.io.DefaultResourceLoader;
+//import org.springframework.core.io.Resource;
+//import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+//import org.springframework.core.io.support.ResourcePatternResolver;
+//import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+//import org.springframework.core.type.classreading.MetadataReader;
+//import org.springframework.core.type.classreading.MetadataReaderFactory;
+//import org.springframework.util.ClassUtils;
+//
+//import javax.sql.DataSource;
+//import java.io.IOException;
+//import java.util.ArrayList;
+//import java.util.Arrays;
+//import java.util.HashSet;
+//import java.util.List;
+//
+///**
+// * Mybatis支持*匹配扫描包
+// *
+//
+// */
+//@Configuration
+//public class MyBatisConfig
+//{
+//    private static final Logger log = LoggerFactory.getLogger(MyBatisConfig.class);
+//
+//    @Autowired
+//    private Environment env;
+//
+//    static final String DEFAULT_RESOURCE_PATTERN = "**/*.class";
+//
+//    public static String setTypeAliasesPackage(String typeAliasesPackage)
+//    {
+//        ResourcePatternResolver resolver = (ResourcePatternResolver) new PathMatchingResourcePatternResolver();
+//        MetadataReaderFactory metadataReaderFactory = new CachingMetadataReaderFactory(resolver);
+//        List<String> allResult = new ArrayList<String>();
+//        try
+//        {
+//            for (String aliasesPackage : typeAliasesPackage.split(","))
+//            {
+//                List<String> result = new ArrayList<String>();
+//                aliasesPackage = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX
+//                        + ClassUtils.convertClassNameToResourcePath(aliasesPackage.trim()) + "/" + DEFAULT_RESOURCE_PATTERN;
+//                Resource[] resources = resolver.getResources(aliasesPackage);
+//                if (resources != null && resources.length > 0)
+//                {
+//                    MetadataReader metadataReader = null;
+//                    for (Resource resource : resources)
+//                    {
+//                        if (resource.isReadable())
+//                        {
+//                            metadataReader = metadataReaderFactory.getMetadataReader(resource);
+//                            try
+//                            {
+//                                result.add(Class.forName(metadataReader.getClassMetadata().getClassName()).getPackage().getName());
+//                            }
+//                            catch (ClassNotFoundException e)
+//                            {
+//                                log.error("mybatis typeAliasesPackage 类未找到: {}", metadataReader.getClassMetadata().getClassName(), e);
+//                            }
+//                        }
+//                    }
+//                }
+//                if (result.size() > 0)
+//                {
+//                    HashSet<String> hashResult = new HashSet<String>(result);
+//                    allResult.addAll(hashResult);
+//                }
+//            }
+//            if (allResult.size() > 0)
+//            {
+//                typeAliasesPackage = String.join(",", (String[]) allResult.toArray(new String[0]));
+//            }
+//            else
+//            {
+//                throw new RuntimeException("mybatis typeAliasesPackage 路径扫描错误,参数typeAliasesPackage:" + typeAliasesPackage + "未找到任何包");
+//            }
+//        }
+//        catch (IOException e)
+//        {
+//            log.error("mybatis typeAliasesPackage 路径扫描IO错误,参数typeAliasesPackage:" + typeAliasesPackage, e);
+//        }
+//        return typeAliasesPackage;
+//    }
+//
+//    public Resource[] resolveMapperLocations(String[] mapperLocations)
+//    {
+//        ResourcePatternResolver resourceResolver = new PathMatchingResourcePatternResolver();
+//        List<Resource> resources = new ArrayList<Resource>();
+//        if (mapperLocations != null)
+//        {
+//            for (String mapperLocation : mapperLocations)
+//            {
+//                try
+//                {
+//                    Resource[] mappers = resourceResolver.getResources(mapperLocation);
+//                    resources.addAll(Arrays.asList(mappers));
+//                }
+//                catch (IOException e)
+//                {
+//                    // ignore
+//                }
+//            }
+//        }
+//        return resources.toArray(new Resource[resources.size()]);
+//    }
+//
+////    @Bean
+////    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
+////    {
+////        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
+////        String mapperLocations = env.getProperty("mybatis.mapperLocations");
+////        String configLocation = env.getProperty("mybatis.configLocation");
+////        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
+////        VFS.addImplClass(SpringBootVFS.class);
+////
+////        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+////        sessionFactory.setDataSource(dataSource);
+////        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
+////        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
+////        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
+////        return sessionFactory.getObject();
+////    }
 //    @Bean
-//    public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
+//    public SqlSessionFactory sqlSessionFactorys(DataSource dataSource) throws Exception
 //    {
-//        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
-//        String mapperLocations = env.getProperty("mybatis.mapperLocations");
-//        String configLocation = env.getProperty("mybatis.configLocation");
+//        String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
+//        String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
+//        String configLocation = env.getProperty("mybatis-plus.configLocation");
 //        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
 //        VFS.addImplClass(SpringBootVFS.class);
 //
-//        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+//        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
 //        sessionFactory.setDataSource(dataSource);
 //        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
-//        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
+//        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));
 //        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
+//        // 添加MyBatis-Plus分页插件
+//        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+//        sessionFactory.setPlugins(new PaginationInterceptor[]{paginationInterceptor});
 //        return sessionFactory.getObject();
 //    }
-    @Bean
-    public SqlSessionFactory sqlSessionFactorys(DataSource dataSource) throws Exception
-    {
-        String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
-        String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
-        String configLocation = env.getProperty("mybatis-plus.configLocation");
-        typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
-        VFS.addImplClass(SpringBootVFS.class);
-
-        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
-        sessionFactory.setDataSource(dataSource);
-        sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
-        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));
-        sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
-        // 添加MyBatis-Plus分页插件
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        sessionFactory.setPlugins(new PaginationInterceptor[]{paginationInterceptor});
-        return sessionFactory.getObject();
-    }
-}
+//}

fs-service/src/main/java/com/fs/framework/config/ResourcesConfig.java

@@ -1,65 +1,65 @@
-package com.fs.framework.config;
-
-import com.fs.framework.interceptor.RepeatSubmitInterceptor;
-import com.fs.common.config.FSConfig;
-import com.fs.common.constant.Constants;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
-import org.springframework.web.filter.CorsFilter;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * 通用配置
- * 
-
- */
-@Configuration
-public class ResourcesConfig implements WebMvcConfigurer
-{
-    @Autowired
-    private RepeatSubmitInterceptor repeatSubmitInterceptor;
-
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry)
-    {
-        /** 本地文件上传路径 */
-        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + FSConfig.getProfile() + "/");
-
-        /** swagger配置 */
-        registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
-    }
-
-    /**
-     * 自定义拦截规则
-     */
-    @Override
-    public void addInterceptors(InterceptorRegistry registry)
-    {
-        registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
-    }
-
-    /**
-     * 跨域配置
-     */
-    @Bean
-    public CorsFilter corsFilter()
-    {
-        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        CorsConfiguration config = new CorsConfiguration();
-        config.setAllowCredentials(true);
-        // 设置访问源地址
-        config.addAllowedOriginPattern("*");
-        // 设置访问源请求头
-        config.addAllowedHeader("*");
-        // 设置访问源请求方法
-        config.addAllowedMethod("*");
-        // 对接口配置跨域设置
-        source.registerCorsConfiguration("/**", config);
-        return new CorsFilter(source);
-    }
-}
+//package com.fs.framework.config;
+//
+//import com.fs.framework.interceptor.RepeatSubmitInterceptor;
+//import com.fs.common.config.FSConfig;
+//import com.fs.common.constant.Constants;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.web.cors.CorsConfiguration;
+//import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+//import org.springframework.web.filter.CorsFilter;
+//import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+//import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+//import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+//
+///**
+// * 通用配置
+// *
+//
+// */
+//@Configuration
+//public class ResourcesConfig implements WebMvcConfigurer
+//{
+//    @Autowired
+//    private RepeatSubmitInterceptor repeatSubmitInterceptor;
+//
+//    @Override
+//    public void addResourceHandlers(ResourceHandlerRegistry registry)
+//    {
+//        /** 本地文件上传路径 */
+//        registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + FSConfig.getProfile() + "/");
+//
+//        /** swagger配置 */
+//        registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
+//    }
+//
+//    /**
+//     * 自定义拦截规则
+//     */
+//    @Override
+//    public void addInterceptors(InterceptorRegistry registry)
+//    {
+//        registry.addInterceptor(repeatSubmitInterceptor).addPathPatterns("/**");
+//    }
+//
+//    /**
+//     * 跨域配置
+//     */
+//    @Bean
+//    public CorsFilter corsFilter()
+//    {
+//        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+//        CorsConfiguration config = new CorsConfiguration();
+//        config.setAllowCredentials(true);
+//        // 设置访问源地址
+//        config.addAllowedOriginPattern("*");
+//        // 设置访问源请求头
+//        config.addAllowedHeader("*");
+//        // 设置访问源请求方法
+//        config.addAllowedMethod("*");
+//        // 对接口配置跨域设置
+//        source.registerCorsConfiguration("/**", config);
+//        return new CorsFilter(source);
+//    }
+//}