add:company添加字段,添加sys_user_set表

fs-admin/src/main/java/com/fs/his/controller/FsPackageCateController.java

@@ -125,4 +125,10 @@ public class FsPackageCateController extends BaseController
         Map map = fsPackageCateService.selectFsArticleCateAllList();
         return AjaxResult.success(map);
     }
+    @GetMapping("/cateList")
+    public TableDataInfo cateList()
+    {
+        List<OptionsVO> list = fsPackageCateService.selectCateList();
+        return getDataTable(list);
+    }
 }

fs-admin/src/main/java/com/fs/web/controller/system/SysUserSetController.java

@@ -0,0 +1,103 @@
+package com.fs.web.controller.system;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.enums.BusinessType;
+import com.fs.system.domain.SysUserSet;
+import com.fs.system.service.ISysUserSetService;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.common.core.page.TableDataInfo;
+
+/**
+ * 用户设置Controller
+ *
+ * @author fs
+ * @date 2025-06-04
+ */
+@RestController
+@RequestMapping("/system/set")
+public class SysUserSetController extends BaseController
+{
+    @Autowired
+    private ISysUserSetService sysUserSetService;
+
+    /**
+     * 查询用户设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:set:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysUserSet sysUserSet)
+    {
+        startPage();
+        List<SysUserSet> list = sysUserSetService.selectSysUserSetList(sysUserSet);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户设置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:set:export')")
+    @Log(title = "用户设置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SysUserSet sysUserSet)
+    {
+        List<SysUserSet> list = sysUserSetService.selectSysUserSetList(sysUserSet);
+        ExcelUtil<SysUserSet> util = new ExcelUtil<SysUserSet>(SysUserSet.class);
+        return util.exportExcel(list, "用户设置数据");
+    }
+
+    /**
+     * 获取用户设置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:set:query')")
+    @GetMapping(value = "/{userId}")
+    public AjaxResult getInfo(@PathVariable("userId") Long userId)
+    {
+        return AjaxResult.success(sysUserSetService.selectSysUserSetByUserId(userId));
+    }
+
+    /**
+     * 新增用户设置
+     */
+    @PreAuthorize("@ss.hasPermi('system:set:add')")
+    @Log(title = "用户设置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysUserSet sysUserSet)
+    {
+        return toAjax(sysUserSetService.insertSysUserSet(sysUserSet));
+    }
+
+    /**
+     * 修改用户设置
+     */
+    @PreAuthorize("@ss.hasPermi('system:set:edit')")
+    @Log(title = "用户设置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysUserSet sysUserSet)
+    {
+        return toAjax(sysUserSetService.updateSysUserSet(sysUserSet));
+    }
+
+    /**
+     * 删除用户设置
+     */
+    @PreAuthorize("@ss.hasPermi('system:set:remove')")
+    @Log(title = "用户设置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{userIds}")
+    public AjaxResult remove(@PathVariable Long[] userIds)
+    {
+        return toAjax(sysUserSetService.deleteSysUserSetByUserIds(userIds));
+    }
+}

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

@@ -94,6 +94,7 @@ public class Company extends BaseEntity
     private String followDoctorIds;
 
     private String doctorIds;
+    private String packageCateIds;
     /**
     * 重启时间
     */

fs-service/src/main/java/com/fs/his/mapper/FsPackageCateMapper.java

@@ -67,4 +67,6 @@ public interface FsPackageCateMapper
     List<OptionsVO> selectFsArticleCateByType(Integer type);
     @Select("select *  FROM fs_package_cate where type=#{type} and cate_code=#{cateCode}")
     FsPackageCate selectFsPackageCateByCateCode(@Param("cateCode") Long cateCode, @Param("type")Integer type);
+
+    List<OptionsVO> selectCateList();
 }

fs-service/src/main/java/com/fs/his/param/FsPackageCateUParam.java

@@ -1,13 +1,9 @@
 package com.fs.his.param;
 
-import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 套餐包分类对象 fs_package_cate
@@ -16,7 +12,7 @@ import java.io.Serializable;
  * @date 2024-05-08
  */
 @Data
-public class FsPackageCateUParam  implements Serializable
+public class FsPackageCateUParam implements Serializable
 {
 
     /** ID */
@@ -43,4 +39,6 @@ public class FsPackageCateUParam  implements Serializable
 
     private String keyword;
 
+    private List<Integer> companyPackageCates;
+
 }

fs-service/src/main/java/com/fs/his/service/IFsPackageCateService.java

@@ -64,5 +64,6 @@ public interface IFsPackageCateService
     public int deleteFsPackageCateByCateId(Long cateId);
 
     Map selectFsArticleCateAllList();
+    List<OptionsVO> selectCateList();
 
 }

fs-service/src/main/java/com/fs/his/service/impl/FsPackageCateServiceImpl.java

@@ -119,4 +119,9 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
         map.put("privateType",t2);
         return map;
     }
+
+    @Override
+    public List<OptionsVO> selectCateList() {
+        return fsPackageCateMapper.selectFsArticleCateByType(2);
+    }
 }

fs-service/src/main/java/com/fs/system/domain/SysUserSet.java

@@ -0,0 +1,27 @@
+package com.fs.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户设置对象 sys_user_set
+ *
+ * @author fs
+ * @date 2025-06-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysUserSet extends BaseEntity{
+
+    /** 系统用户id */
+    private Long userId;
+
+    /** 价格显示比例 */
+    @Excel(name = "价格显示比例")
+    private int rate;
+
+
+}

fs-service/src/main/java/com/fs/system/mapper/SysUserSetMapper.java

@@ -0,0 +1,61 @@
+package com.fs.system.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.system.domain.SysUserSet;
+
+/**
+ * 用户设置Mapper接口
+ * 
+ * @author fs
+ * @date 2025-06-04
+ */
+public interface SysUserSetMapper extends BaseMapper<SysUserSet>{
+    /**
+     * 查询用户设置
+     * 
+     * @param userId 用户设置主键
+     * @return 用户设置
+     */
+    SysUserSet selectSysUserSetByUserId(Long userId);
+
+    /**
+     * 查询用户设置列表
+     * 
+     * @param sysUserSet 用户设置
+     * @return 用户设置集合
+     */
+    List<SysUserSet> selectSysUserSetList(SysUserSet sysUserSet);
+
+    /**
+     * 新增用户设置
+     * 
+     * @param sysUserSet 用户设置
+     * @return 结果
+     */
+    int insertSysUserSet(SysUserSet sysUserSet);
+
+    /**
+     * 修改用户设置
+     * 
+     * @param sysUserSet 用户设置
+     * @return 结果
+     */
+    int updateSysUserSet(SysUserSet sysUserSet);
+
+    /**
+     * 删除用户设置
+     * 
+     * @param userId 用户设置主键
+     * @return 结果
+     */
+    int deleteSysUserSetByUserId(Long userId);
+
+    /**
+     * 批量删除用户设置
+     * 
+     * @param userIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteSysUserSetByUserIds(Long[] userIds);
+}

fs-service/src/main/java/com/fs/system/service/ISysUserSetService.java

@@ -0,0 +1,61 @@
+package com.fs.system.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.system.domain.SysUserSet;
+
+/**
+ * 用户设置Service接口
+ * 
+ * @author fs
+ * @date 2025-06-04
+ */
+public interface ISysUserSetService extends IService<SysUserSet>{
+    /**
+     * 查询用户设置
+     * 
+     * @param userId 用户设置主键
+     * @return 用户设置
+     */
+    SysUserSet selectSysUserSetByUserId(Long userId);
+
+    /**
+     * 查询用户设置列表
+     * 
+     * @param sysUserSet 用户设置
+     * @return 用户设置集合
+     */
+    List<SysUserSet> selectSysUserSetList(SysUserSet sysUserSet);
+
+    /**
+     * 新增用户设置
+     * 
+     * @param sysUserSet 用户设置
+     * @return 结果
+     */
+    int insertSysUserSet(SysUserSet sysUserSet);
+
+    /**
+     * 修改用户设置
+     * 
+     * @param sysUserSet 用户设置
+     * @return 结果
+     */
+    int updateSysUserSet(SysUserSet sysUserSet);
+
+    /**
+     * 批量删除用户设置
+     * 
+     * @param userIds 需要删除的用户设置主键集合
+     * @return 结果
+     */
+    int deleteSysUserSetByUserIds(Long[] userIds);
+
+    /**
+     * 删除用户设置信息
+     * 
+     * @param userId 用户设置主键
+     * @return 结果
+     */
+    int deleteSysUserSetByUserId(Long userId);
+}

fs-service/src/main/java/com/fs/system/service/impl/SysUserSetServiceImpl.java

@@ -0,0 +1,101 @@
+package com.fs.system.service.impl;
+
+import java.util.List;
+import com.fs.common.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.fs.system.mapper.SysUserSetMapper;
+import com.fs.system.domain.SysUserSet;
+import com.fs.system.service.ISysUserSetService;
+
+/**
+ * 用户设置Service业务层处理
+ *
+ * @author fs
+ * @date 2025-06-04
+ */
+@Service
+public class SysUserSetServiceImpl extends ServiceImpl<SysUserSetMapper, SysUserSet> implements ISysUserSetService {
+
+    /**
+     * 查询用户设置
+     *
+     * @param userId 用户设置主键
+     * @return 用户设置
+     */
+    @Override
+    public SysUserSet selectSysUserSetByUserId(Long userId)
+    {
+        return baseMapper.selectSysUserSetByUserId(userId);
+    }
+
+    /**
+     * 查询用户设置列表
+     *
+     * @param sysUserSet 用户设置
+     * @return 用户设置
+     */
+    @Override
+    public List<SysUserSet> selectSysUserSetList(SysUserSet sysUserSet)
+    {
+        return baseMapper.selectSysUserSetList(sysUserSet);
+    }
+
+    /**
+     * 新增用户设置
+     *
+     * @param sysUserSet 用户设置
+     * @return 结果
+     */
+    @Override
+    public int insertSysUserSet(SysUserSet sysUserSet)
+    {
+        //查询是否存在
+        SysUserSet temp = baseMapper.selectSysUserSetByUserId(sysUserSet.getUserId());
+        if(temp!=null){
+            temp.setRate(sysUserSet.getRate());
+            return baseMapper.updateSysUserSet(sysUserSet);
+        } else {
+            sysUserSet.setCreateTime(DateUtils.getNowDate());
+            return baseMapper.insertSysUserSet(sysUserSet);
+        }
+
+    }
+
+    /**
+     * 修改用户设置
+     *
+     * @param sysUserSet 用户设置
+     * @return 结果
+     */
+    @Override
+    public int updateSysUserSet(SysUserSet sysUserSet)
+    {
+        return baseMapper.updateSysUserSet(sysUserSet);
+    }
+
+    /**
+     * 批量删除用户设置
+     *
+     * @param userIds 需要删除的用户设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysUserSetByUserIds(Long[] userIds)
+    {
+        return baseMapper.deleteSysUserSetByUserIds(userIds);
+    }
+
+    /**
+     * 删除用户设置信息
+     *
+     * @param userId 用户设置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteSysUserSetByUserId(Long userId)
+    {
+        return baseMapper.deleteSysUserSetByUserId(userId);
+    }
+}

fs-service/src/main/resources/application-config-dev.yml

@@ -67,3 +67,6 @@ headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
 ipad:
   ipadUrl: http://ipad.cdwjyyh.com
+wx_miniapp_temp:
+  pay_order_temp_id:
+  inquiry_temp_id:

fs-service/src/main/resources/application-config-druid-fcky.yml

@@ -0,0 +1,82 @@
+baidu:
+  token: 12313231232
+#配置
+logging:
+  level:
+    org.springframework.web: INFO
+    com.github.binarywang.demo.wx.cp: DEBUG
+    me.chanjar.weixin: DEBUG
+wx:
+  cp:
+    corpId: wwb2a1055fb6c9a7c2
+    appConfigs:
+      - agentId: 1000005
+        secret: ec7okROXJqkNafq66-L6aKNv0asTzQIG0CYrj3vyBbo
+        token: PPKOdAlCoMO
+        aesKey: PKvaxtpSv8NGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
+  pay:
+    appId:  #微信公众号或者小程序等的appid
+    mchId:  #微信支付商户号
+    mchKey:  #微信支付商户密钥
+    subAppId:  #服务商模式下的子商户公众账号ID
+    subMchId:  #服务商模式下的子商户号
+    keyPath: c:\\cert\\apiclient_cert.p12 # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    notifyUrl: https://userapp.his.runtzh.com/app/wxpay/wxPayNotify
+  mp:
+    useRedis: false
+    redisConfig:
+      host: 127.0.0.1
+      port: 6379
+      timeout: 2000
+    configs:
+      - appId: wx5d3096e20e4bd8ba # 第一个公众号的appid  //公众号名称:成都九州在线互联网医院
+        secret: 1afa05f0c71beff0d52fb849c62e479a # 公众号的appsecret
+        token: PPKOdAlCoMO # 接口配置里的Token值
+        aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
+aifabu:  #爱链接
+  appKey: 7b471be905ab17e00f3b858c6710dd117601d008
+watch:
+  watchUrl: watch.ylrzcloud.com/prod-api
+  #  account: tcloud
+  #  password: mdf-m2h_6yw2$hq
+  account1: ccif #866655060138751
+  password1: cp-t5or_6xw7$mt
+  account2: tcloud #rt500台
+  password2: mdf-m2h_6yw2$hq
+  account3: whr
+  password3: v9xsKuqn_$d2y
+
+fs :
+  commonApi: http://127.0.0.1:7771
+  h5CommonApi: http://127.0.0.1:7771
+nuonuo:
+  key: 10924508
+  secret: A2EB20764D304D16
+
+# 存储捅配置
+tencent_cloud_config:
+  secret_id: AKIDXv75pKcgeR6YnobBYhbIkyykLjuwlNlv
+  secret_key: zmMiqjPr55rPwISUJuITSDmDVZO0PcbN
+  bucket: fc-1361520560
+  app_id: 1361520560
+  region: ap-beijing
+  proxy: fc
+tmp_secret_config:
+  secret_id: AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX
+  secret_key: lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT
+  bucket: fs-1319721001
+  app_id: 1319721001
+  region: ap-chongqing
+  proxy: fs
+cloud_host:
+  company_name: 蜂巢快药
+headerImg:
+  imgUrl: https
+ipad:
+  ipadUrl: http://ipad.cdwjyyh.com
+wx_miniapp_temp:
+  pay_order_temp_id:
+  inquiry_temp_id:
+
+
+

fs-service/src/main/resources/application-config-druid-jnmy.yml

@@ -74,6 +74,9 @@ headerImg:
   imgUrl: https
 ipad:
   ipadUrl: http://ipad.cdwjyyh.com
+wx_miniapp_temp:
+  pay_order_temp_id: -SjnK9K6cNKASa6AD9Q_c0YT7J1lPTEpPIpqbMJF8F0
+  inquiry_temp_id: hwFXVh0AWqeasBsZpa0-urb3CrPeYEwBiy3P6AMMGFQ
 
 
 

fs-service/src/main/resources/application-druid-fcky.yml

@@ -0,0 +1,150 @@
+# 数据源配置
+spring:
+    profiles:
+        include: config-druid-fcky,common
+    # redis 配置
+    redis:
+        # 地址
+        host: 10.206.0.14
+        # 端口，默认为6379
+        port: 6379
+        # 数据库索引
+        database: 0
+        # 密码
+        password: Ylrz_1q2w3e4r5t6y
+        # 连接超时时间
+        timeout: 20s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    datasource:
+        #        clickhouse:
+        #            type: com.alibaba.druid.pool.DruidDataSource
+        #            driverClassName: com.clickhouse.jdbc.ClickHouseDriver
+        #            url: jdbc:clickhouse://cc-2vc8zzo26w0l7m2l6.public.clickhouse.ads.aliyuncs.com/sop?compress=0&use_server_time_zone=true&use_client_time_zone=false&timezone=Asia/Shanghai
+        #            username: rt_2024
+        #            password: Yzx_19860213
+        #            initialSize: 10
+        #            maxActive: 100
+        #            minIdle: 10
+        #            maxWait: 6000
+        mysql:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://10.206.0.3:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Ylrz_1q2w3e4r5t6y
+                # 从库数据源
+                slave:
+                    # 从数据源开关/默认关闭
+                    enabled: false
+                    url:
+                    username:
+                    password:
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+        sop:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://10.206.0.3:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Ylrz_1q2w3e4r5t6y
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+rocketmq:
+    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
+    producer:
+        group: my-producer-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+    consumer:
+        group: test-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey

fs-service/src/main/resources/mapper/company/CompanyMapper.xml

@@ -32,10 +32,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="followDoctorIds"    column="follow_doctor_ids"    />
         <result property="doctorIds"    column="doctor_ids"    />
         <result property="restartTime"    column="restart_time"    />
+        <result property="packageCateIds"    column="package_cate_ids"    />
     </resultMap>
 
     <sql id="selectCompanyVo">
-        select company_id,follow_doctor_ids,doctor_ids, company_name,manager, company_mobile, company_address, create_time, update_time, status, start_time, limit_time, money ,tui_money, voice_api_id,company_type,user_id,app_id,app_key,remark,link_name,limit_user_count,is_del,voice_caller_number,oms_code,restart_time from company
+        select company_id,follow_doctor_ids,doctor_ids, company_name,manager, company_mobile, company_address, create_time, update_time, status, start_time, limit_time, money ,tui_money, voice_api_id,company_type,user_id,app_id,app_key,remark,link_name,limit_user_count,is_del,voice_caller_number,oms_code,restart_time,package_cate_ids from company
     </sql>
 
     <select id="selectCompanyList" parameterType="Company" resultMap="CompanyResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null "> and is_del = #{isDel}</if>
             <if test="voiceApiId != null "> and voice_api_id = #{voiceApiId}</if>
             <if test="restartTime != null "> and restart_time = #{restartTime}</if>
+            <if test="packageCateIds != null "> and package_cate_ids = #{packageCateIds}</if>
         </where>
     </select>
 
@@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="followDoctorIds != null">follow_doctor_ids,</if>
             <if test="doctorIds != null">doctor_ids,</if>
             <if test="restartTime != null">restart_time,</if>
+            <if test="packageCateIds != null">package_cate_ids,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyName != null">#{companyName},</if>
@@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="followDoctorIds != null">#{followDoctorIds},</if>
             <if test="doctorIds != null">#{doctorIds},</if>
             <if test="restartTime != null">#{restartTime},</if>
+            <if test="packageCateIds != null">#{packageCateIds},</if>
          </trim>
     </insert>
 
@@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="followDoctorIds != null">follow_doctor_ids = #{followDoctorIds},</if>
             <if test="doctorIds != null">doctor_ids = #{doctorIds},</if>
             <if test="restartTime != null">restart_time = #{restartTime},</if>
+            <if test="packageCateIds != null">package_cate_ids = #{packageCateIds},</if>
         </trim>
         where company_id = #{companyId}
     </update>

fs-service/src/main/resources/mapper/his/FsPackageCateMapper.xml

@@ -24,6 +24,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cateCode != null "> and cate_code = #{cateCode}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="cateName != null  and cateName != ''"> and cate_name like concat('%', #{cateName}, '%')</if>
+            <if test="companyPackageCates != null  and companyPackageCates != ''">
+                AND cate_code IN
+                <foreach collection="companyPackageCates" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="status != null "> and status = #{status}</if>
             <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
             <if test="sort != null "> and sort = #{sort}</if>

fs-service/src/main/resources/mapper/system/SysUserSetMapper.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.system.mapper.SysUserSetMapper">
+    
+    <resultMap type="SysUserSet" id="SysUserSetResult">
+        <result property="userId"    column="user_id"    />
+        <result property="rate"    column="rate"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectSysUserSetVo">
+        select user_id, rate, create_time from sys_user_set
+    </sql>
+
+    <select id="selectSysUserSetList" parameterType="SysUserSet" resultMap="SysUserSetResult">
+        <include refid="selectSysUserSetVo"/>
+        <where>  
+            <if test="rate != null "> and rate = #{rate}</if>
+        </where>
+    </select>
+    
+    <select id="selectSysUserSetByUserId" parameterType="Long" resultMap="SysUserSetResult">
+        <include refid="selectSysUserSetVo"/>
+        where user_id = #{userId}
+    </select>
+        
+    <insert id="insertSysUserSet" parameterType="SysUserSet">
+        insert into sys_user_set
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="rate != null">rate,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="rate != null">#{rate},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysUserSet" parameterType="SysUserSet">
+        update sys_user_set
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="rate != null">rate = #{rate},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where user_id = #{userId}
+    </update>
+
+    <delete id="deleteSysUserSetByUserId" parameterType="Long">
+        delete from sys_user_set where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteSysUserSetByUserIds" parameterType="String">
+        delete from sys_user_set where user_id in 
+        <foreach item="userId" collection="array" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+</mapper>

fs-user-app/src/main/java/com/fs/app/controller/PackageController.java

@@ -1,11 +1,18 @@
 package com.fs.app.controller;
 
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fs.app.annotation.Login;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.file.ImageUtils;
+import com.fs.company.domain.Company;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyService;
+import com.fs.company.service.ICompanyUserService;
 import com.fs.course.domain.FsUserCourseFavorite;
 import com.fs.course.param.FsUserCourseFollowUParam;
 import com.fs.his.domain.*;
@@ -54,13 +61,32 @@ public class PackageController extends AppBaseController {
     private IFsDoctorService doctorService;
     @Autowired
     private IFsStoreService storeService;
+    @Autowired
+    private ICompanyUserService companyUserService;
+    @Autowired
+    private ICompanyService companyService;
 
     @ApiOperation("获取套餐分类")
     @Cacheable(value = "getPackagCateList", key = "#param")
     @GetMapping("/getPackagCateList")
     public R getPackagCateList(FsPackageCateUParam param) {
-        List<FsPackageCate> cates = packageCateService.selectFsPackageCateList(param);
-        return R.ok().put("data", cates);
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            Long companyUserId = getCompanyUserId();
+            CompanyUser companyUser=companyUserService.selectCompanyUserById(companyUserId);
+            Company company = companyService.selectCompanyById(companyUser.getCompanyId());
+            String packageCateIds = company.getPackageCateIds();
+            List<Integer> cateIdList = objectMapper.readValue(packageCateIds, new TypeReference<List<Integer>>() {});
+            if (param.getType()==2){
+                param.setCompanyPackageCates(cateIdList);
+            }
+        } catch (Exception e) {
+            log.info("获取套餐分类:销售未登录");
+        } finally {
+            List<FsPackageCate> cates = packageCateService.selectFsPackageCateList(param);
+            return R.ok().put("data", cates);
+        }
+
     }
 
     @ApiOperation("获取套餐列表")