fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -209,6 +209,7 @@ public class CompanyUserController extends AppBaseController {
         companyUser.setCreateTime(new Date());
         companyUser.setIsAudit(0);
         companyUser.setParentId(upCompanyUser.getUserId());
+        companyUser.setCompanyId(upCompanyUser.getCompanyId());
 
         // 部门
         CompanyDept dept = companyDeptService.getDefaultCompanyDeptByCompanyId(upCompanyUser.getCompanyId());

fs-company/src/main/java/com/fs/company/controller/store/FsFollowTempController.java

@@ -0,0 +1,64 @@
+package com.fs.company.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.his.domain.FsFollowTemp;
+import com.fs.his.service.IFsFollowTempService;
+import com.fs.his.vo.OptionsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 随访模板Controller
+ *
+ * @author fs
+ * @date 2023-07-14
+ */
+@RestController
+@RequestMapping("/store/followTemp")
+public class FsFollowTempController extends BaseController
+{
+    @Autowired
+    private IFsFollowTempService fsFollowTempService;
+
+    /**
+     * 查询随访模板列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(FsFollowTemp fsFollowTemp)
+    {
+        startPage();
+        List<FsFollowTemp> list = fsFollowTempService.selectFsFollowTempList(fsFollowTemp);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取随访模板详细信息
+     */
+    @GetMapping(value = "/{tempId}")
+    public AjaxResult getInfo(@PathVariable("tempId") Long tempId)
+    {
+        return AjaxResult.success(fsFollowTempService.selectFsFollowTempByTempId(tempId));
+    }
+
+
+
+    /**
+     * 查询模板名称列表
+     */
+    @GetMapping("/allList")
+    public TableDataInfo getAllList()
+    {
+        List<OptionsVO> list = fsFollowTempService.selectAllFsFollowTempList();
+        return getDataTable(list);
+    }
+}

fs-company/src/main/java/com/fs/company/controller/store/FsIcdController.java

@@ -0,0 +1,60 @@
+package com.fs.company.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.his.domain.FsIcd;
+import com.fs.his.service.IFsIcdService;
+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;
+
+/**
+ * icd编码库Controller
+ *
+ * @author fs
+ * @date 2024-04-22
+ */
+@RestController
+@RequestMapping("/store/icd")
+public class FsIcdController extends BaseController
+{
+    @Autowired
+    private IFsIcdService fsIcdService;
+
+    /**
+     * 查询icd编码库列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(FsIcd fsIcd)
+    {
+        startPage();
+        List<FsIcd> list = fsIcdService.selectFsIcdList(fsIcd);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取icd编码库详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(fsIcdService.selectFsIcdById(id));
+    }
+
+
+    @GetMapping(value = "/allIcd/{name}")
+    public AjaxResult allIcd(@PathVariable("name") String name)
+    {
+        return AjaxResult.success(fsIcdService.selectFsIcdByName(name));
+    }
+
+}

fs-company/src/main/java/com/fs/company/controller/store/FsMaterialController.java

@@ -0,0 +1,93 @@
+package com.fs.company.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.his.domain.FsMaterial;
+import com.fs.his.service.IFsMaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 素材库Controller
+ *
+ * @author fs
+ * @date 2022-03-15
+ */
+@RestController
+@RequestMapping("/store/material")
+public class FsMaterialController extends BaseController
+{
+    @Autowired
+    private IFsMaterialService fsMaterialService;
+
+    /**
+     * 查询素材库列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(FsMaterial fsMaterial)
+    {
+        startPage();
+        fsMaterial.setStoreId(0L);
+        List<FsMaterial> list = fsMaterialService.selectFsMaterialList(fsMaterial);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出素材库列表
+     */
+    @Log(title = "素材库", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(FsMaterial fsMaterial)
+    {
+        fsMaterial.setStoreId(0L);
+        List<FsMaterial> list = fsMaterialService.selectFsMaterialList(fsMaterial);
+        ExcelUtil<FsMaterial> util = new ExcelUtil<FsMaterial>(FsMaterial.class);
+        return util.exportExcel(list, "material");
+    }
+
+    /**
+     * 获取素材库详细信息
+     */
+    @GetMapping(value = "/{materialId}")
+    public AjaxResult getInfo(@PathVariable("materialId") Long materialId)
+    {
+        return AjaxResult.success(fsMaterialService.selectFsMaterialByMaterialId(materialId));
+    }
+
+    /**
+     * 新增素材库
+     */
+    @Log(title = "素材库", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FsMaterial fsMaterial)
+    {
+        fsMaterial.setStoreId(0L);
+        return toAjax(fsMaterialService.insertFsMaterial(fsMaterial));
+    }
+
+    /**
+     * 修改素材库
+     */
+    @Log(title = "素材库", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FsMaterial fsMaterial)
+    {
+        return toAjax(fsMaterialService.updateFsMaterial(fsMaterial));
+    }
+
+    /**
+     * 删除素材库
+     */
+    @Log(title = "素材库", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{materialIds}")
+    public AjaxResult remove(@PathVariable Long[] materialIds)
+    {
+        return toAjax(fsMaterialService.deleteFsMaterialByMaterialIds(materialIds));
+    }
+}

fs-company/src/main/java/com/fs/company/controller/store/FsMaterialGroupController.java

@@ -0,0 +1,91 @@
+package com.fs.company.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.his.domain.FsMaterialGroup;
+import com.fs.his.service.IFsMaterialGroupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 素材分组Controller
+ *
+ * @author fs
+ * @date 2022-03-15
+ */
+@RestController
+@RequestMapping("/store/materialGroup")
+public class FsMaterialGroupController extends BaseController
+{
+    @Autowired
+    private IFsMaterialGroupService fsMaterialGroupService;
+
+    /**
+     * 查询素材分组列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(FsMaterialGroup fsMaterialGroup)
+    {
+        startPage();
+        fsMaterialGroup.setStoreId(0L);
+        List<FsMaterialGroup> list = fsMaterialGroupService.selectFsMaterialGroupList(fsMaterialGroup);
+        return getDataTable(list);
+    }
+
+
+
+    /**
+     * 获取素材分组详细信息
+     */
+    @GetMapping(value = "/{groupId}")
+    public AjaxResult getInfo(@PathVariable("groupId") Long groupId)
+    {
+        return AjaxResult.success(fsMaterialGroupService.selectFsMaterialGroupByGroupId(groupId));
+    }
+
+    /**
+     * 新增素材分组
+     */
+    @Log(title = "素材分组", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FsMaterialGroup fsMaterialGroup)
+    {
+        fsMaterialGroup.setStoreId(0L);
+        return toAjax(fsMaterialGroupService.insertFsMaterialGroup(fsMaterialGroup));
+    }
+
+    /**
+     * 修改素材分组
+     */
+    @Log(title = "素材分组", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FsMaterialGroup fsMaterialGroup)
+    {
+        return toAjax(fsMaterialGroupService.updateFsMaterialGroup(fsMaterialGroup));
+    }
+
+    /**
+     * 删除素材分组
+     */
+    @Log(title = "素材分组", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{groupIds}")
+    public AjaxResult remove(@PathVariable Long[] groupIds)
+    {
+        return toAjax(fsMaterialGroupService.deleteFsMaterialGroupByGroupIds(groupIds));
+    }
+
+    @GetMapping("/getAllList")
+    public R getAllList(FsMaterialGroup fsMaterialGroup)
+    {
+        fsMaterialGroup.setStoreId(0L);
+        List<FsMaterialGroup> list = fsMaterialGroupService.selectFsMaterialGroupList(fsMaterialGroup);
+        return R.ok().put("data",list);
+    }
+}

fs-company/src/main/java/com/fs/company/controller/store/FsPackageCateController.java

@@ -0,0 +1,71 @@
+package com.fs.company.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.core.redis.RedisCache;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.his.domain.FsPackageCate;
+import com.fs.his.param.FsPackageCateUParam;
+import com.fs.his.service.IFsPackageCateService;
+import com.fs.his.vo.OptionsVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 套餐包分类Controller
+ *
+ * @author fs
+ * @date 2024-05-08
+ */
+@RestController
+@RequestMapping("/store/packageCate")
+public class FsPackageCateController extends BaseController
+{
+    @Autowired
+    private IFsPackageCateService fsPackageCateService;
+    @Autowired
+    RedisCache redisCache;
+    /**
+     * 查询套餐包分类列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(FsPackageCateUParam fsPackageCate)
+    {
+        startPage();
+        List<FsPackageCate> list = fsPackageCateService.selectFsPackageCateList(fsPackageCate);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 获取套餐包分类详细信息
+     */
+    @GetMapping(value = "/{cateId}")
+    public AjaxResult getInfo(@PathVariable("cateId") Long cateId)
+    {
+        return AjaxResult.success(fsPackageCateService.selectFsPackageCateByCateId(cateId));
+    }
+
+
+
+    @GetMapping("/allList")
+    public AjaxResult allList()
+    {
+        Map map = fsPackageCateService.selectFsArticleCateAllList();
+        return AjaxResult.success(map);
+    }
+    @GetMapping("/cateList")
+    public TableDataInfo cateList()
+    {
+        List<OptionsVO> list = fsPackageCateService.selectCateList();
+        return getDataTable(list);
+    }
+}

fs-company/src/main/java/com/fs/company/controller/store/FsStoreProductController.java

@@ -10,9 +10,11 @@ import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.his.domain.FsStoreProduct;
 import com.fs.his.domain.FsStoreProductAttr;
 import com.fs.his.domain.FsStoreProductRule;
+import com.fs.his.param.FsProductAttrValueParam;
 import com.fs.his.param.FsStoreProductAddEditParam;
 import com.fs.his.service.IFsStoreProductAttrService;
 import com.fs.his.service.IFsStoreProductService;
+import com.fs.his.vo.FsStoreProductAttrValueVO;
 import com.fs.his.vo.FsStoreProductExcelVO;
 import com.fs.his.vo.FsStoreProductVO;
 import com.fs.his.vo.OptionsVO;
@@ -182,5 +184,13 @@ public class FsStoreProductController extends BaseController
         return fsStoreProductService.addOrEdit(fsStoreProduct);
     }
 
+    @GetMapping("/getStoreProductAttrValueList")
+    public TableDataInfo getStoreProductAttrValueList(FsProductAttrValueParam param)
+    {
+        startPage();
+        List<FsStoreProductAttrValueVO> list=fsStoreProductService.selectFsStoreProductAttrValueListVO(param);
+        return getDataTable(list);
+    }
+
 
 }

fs-service/src/main/java/com/fs/his/vo/FsStoreOrderExportVO.java

@@ -64,6 +64,10 @@ public class FsStoreOrderExportVO implements Serializable
     @Excel(name = "商品金额",cellType= Excel.ColumnType.NUMERIC)
     private BigDecimal totalPrice;
 
+    /** 商品数量 */
+    @Excel(name = "商品数量")
+    private Integer totalNum;
+
 
     /** 实际支付金额 */
     @Excel(name = "应付金额",cellType= Excel.ColumnType.NUMERIC)