商城移植0.9

fs-common/src/main/java/com/fs/common/config/FSConfig.java

@@ -34,6 +34,12 @@ public class FSConfig
 
     private static String h5CommonApi;
 
+    private String url;
+
+    public String getUrl() {
+        return url;
+    }
+
     public static String getH5CommonApi() {
         return h5CommonApi;
     }
@@ -153,4 +159,12 @@ public class FSConfig
     {
         return getProfile() + "/qr";
     }
+
+    /**
+     * 获取用户推广海报地址
+     */
+    public static String getTuiImgPath()
+    {
+        return getProfile() + "/tui";
+    }
 }

fs-service/pom.xml

@@ -15,9 +15,9 @@
         service模块
     </description>
     <properties>
-        <weixin-java-cp.version>4.4.0</weixin-java-cp.version>
+        <weixin-java-cp.version>4.7.0</weixin-java-cp.version>
         <weixin-java-miniapp.version>4.7.0</weixin-java-miniapp.version>
-        <weixin-java-mp.version>4.4.0</weixin-java-mp.version>
+        <weixin-java-mp.version>4.7.0</weixin-java-mp.version>
     </properties>
 
     <dependencies>

fs-service/src/main/java/com/fs/api/param/ExpressParam.java

@@ -0,0 +1,9 @@
+package com.fs.api.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+@Data
+public class ExpressParam implements Serializable {
+    private String packageno;
+}

fs-service/src/main/java/com/fs/api/param/OrderListParam.java

@@ -0,0 +1,13 @@
+package com.fs.api.param;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class OrderListParam implements Serializable
+{
+    private String startTime;
+    private String endTime;
+    private Long companyId;
+}

fs-service/src/main/java/com/fs/api/vo/ExpressVO.java

@@ -0,0 +1,14 @@
+package com.fs.api.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ExpressVO implements Serializable {
+    private String location;
+    private String tracedate;
+    private String remark;
+    private String status;
+
+}

fs-service/src/main/java/com/fs/api/vo/OrderListVO.java

@@ -0,0 +1,23 @@
+package com.fs.api.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class OrderListVO implements Serializable
+{
+    private Long orderid;
+    private String ordercode;
+    private Date orderdate;
+    List<ProductListVO> productList;
+    private BigDecimal amount;
+    private String customername;
+    private String tel;
+    private String address;
+    private String express;
+    private String packageno;
+}

fs-service/src/main/java/com/fs/api/vo/ProductListVO.java

@@ -0,0 +1,16 @@
+package com.fs.api.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class ProductListVO implements Serializable
+{
+    private String productname;
+    private Long productid;
+    private BigDecimal productprice;
+    private Integer productqty;
+
+}

fs-service/src/main/java/com/fs/common/event/TemplateBean.java

@@ -0,0 +1,28 @@
+package com.fs.common.event;
+
+import lombok.*;
+
+import java.util.Date;
+
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class TemplateBean {
+    private String templateType;
+    private String orderId;
+    private String orderCode;
+    private String remark;
+    private Date finishTime;
+    private String deliveryName;
+    private String deliveryId;
+    private Long userId;
+    private String rpId;
+    private Date rpCreateTime;
+    private String rpStatus;
+
+
+
+}

fs-service/src/main/java/com/fs/common/event/TemplateEvent.java

@@ -0,0 +1,22 @@
+package com.fs.common.event;
+
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 微信模板事件
+ */
+@Getter
+public class TemplateEvent extends ApplicationEvent {
+
+	private TemplateBean templateBean;
+	/**
+	 * 重写构造函数
+	 * @param source 发生事件的对象
+	 * @param templateBean 自定义
+	 */
+	public TemplateEvent(Object source, TemplateBean templateBean) {
+		super(source);
+		this.templateBean = templateBean;
+	}
+}

fs-service/src/main/java/com/fs/common/event/TemplateListenEnum.java

@@ -0,0 +1,29 @@
+package com.fs.common.event;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.stream.Stream;
+
+
+/**
+ * 模板监听枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum TemplateListenEnum {
+    TYPE_1("1","订单取消通知"),
+    TYPE_2("2","发货通知"),
+    TYPE_3("3","签收通知"),
+    TYPE_4("4","处方开方通知");
+    private String value;
+    private String desc;
+
+    public static TemplateListenEnum toType(String value) {
+        return Stream.of(TemplateListenEnum.values())
+                .filter(p -> p.value.equals(value))
+                .findAny()
+                .orElse(null);
+    }
+}

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

@@ -113,6 +113,9 @@ public class Company extends BaseEntity
     /** 会员是否默认黑名单，1-是；0-否（用于销售分享成为会员的操作） */
     private Integer fsUserIsDefaultBlack;
 
+    /** 后台制单是否需要付款 默认1 0-否 1-是*/
+    private Integer isPay;
+
 //    public String getDoctorIds() {
 //        return doctorIds;
 //    }

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

@@ -3,13 +3,14 @@ package com.fs.company.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.util.Date;
 import java.util.List;
 
-
+@Data
 public class CompanyUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -154,6 +155,9 @@ public class CompanyUser extends BaseEntity
     /** 是否需要单独注册会员，1-是，0-否（用于个微销售分享看课） */
     private Integer isNeedRegisterMember;
 
+    /** 是否允许所有方式注册会员，1-是，0-否，默认1（用于个微注册会员） */
+    private Integer isAllowedAllRegister;
+
 
     public Long getParentId() {
         return parentId;

fs-service/src/main/java/com/fs/company/service/ICompanyService.java

@@ -14,6 +14,9 @@ import com.fs.his.domain.FsInquiryOrder;
 import com.fs.his.domain.FsStoreOrder;
 import com.fs.his.domain.FsStorePayment;
 import com.fs.his.vo.OptionsVO;
+import com.fs.hisStore.domain.FsStoreOrderScrm;
+import com.fs.hisStore.domain.FsStorePaymentScrm;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -84,19 +87,33 @@ public interface ICompanyService
     void addCompanyTuiMoney(FsStoreOrder order);
 
 
+    @Transactional
+    void addCompanyTuiMoney(FsStoreOrderScrm order);
 
     void addCompanyMoney(FsStoreOrder order);
 
+    @Transactional
+    void addCompanyMoney(FsStoreOrderScrm order);
+
     void subCompanyMoney(FsStoreOrder order);
 
+    @Transactional
+    void subCompanyMoney(FsStoreOrderScrm order);
+
     Company selectCompanyByAppId(String appId);
 
     void resetMoney(Long companyId);
 
     void addCompanyPaymentMoney(FsStorePayment storePayment);
 
+    @Transactional
+    void addCompanyPaymentMoney(FsStorePaymentScrm storePayment);
+
     void subCompanyPaymentMoney(FsStorePayment payment);
 
+    @Transactional
+    void subCompanyPaymentMoney(FsStorePaymentScrm payment);
+
     String selectOmsCodeByCompanyId(Long companyId);
 
     void updateOmsCodeByCompanyIds(List<Long> companyIds,String omsCode);

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

@@ -26,6 +26,9 @@ import com.fs.his.domain.FsStorePayment;
 import com.fs.his.dto.InquiryConfigDTO;
 import com.fs.his.mapper.FsStoreOrderMapper;
 import com.fs.his.vo.OptionsVO;
+import com.fs.hisStore.domain.FsStoreOrderScrm;
+import com.fs.hisStore.domain.FsStorePaymentScrm;
+import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
 import com.fs.store.config.CompanyMenuConfig;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
@@ -73,6 +76,9 @@ public class CompanyServiceImpl implements ICompanyService
     private CompanyMoneyLogsMapper moneyLogsMapper;
     @Autowired
     private FsStoreOrderMapper storeOrderMapper;
+
+    @Autowired
+    private FsStoreOrderScrmMapper storeOrderScrmMapper;
     @Autowired
     private ICompanyProfitService companyProfitService;
     @Autowired
@@ -321,6 +327,28 @@ public class CompanyServiceImpl implements ICompanyService
         }
     }
 
+    @Override
+    @Transactional
+    public void addCompanyTuiMoney(FsStoreOrderScrm order) {
+        if(order.getCompanyId()!=null&&order.getCompanyId()>0){
+            Company company=companyMapper.selectCompanyByIdForUpdate(order.getCompanyId());
+            if(company!=null){
+                String json =configService.selectConfigByKey("his.store");
+                StoreConfig config= JSONUtil.toBean(json,StoreConfig.class);
+                //支付金额-（订单金额*rate%）
+                Double rate=config.getTuiMoneyRate()/100d;
+                BigDecimal tuiMoney=order.getPayPrice().subtract(order.getTotalPrice().multiply(new BigDecimal(rate)));
+                logger.info("写入公司推广佣金:"+tuiMoney);
+                company.setTuiMoney(company.getTuiMoney().add(tuiMoney));
+                companyMapper.updateCompany(company);
+                FsStoreOrderScrm storeOrderMap=new FsStoreOrderScrm();
+                storeOrderMap.setId(order.getId());
+                storeOrderMap.setTuiMoney(tuiMoney);
+                storeOrderScrmMapper.updateFsStoreOrder(storeOrderMap);
+            }
+        }
+    }
+
     @Override
     @Transactional
     public void addCompanyMoney(FsStoreOrder order) {
@@ -351,6 +379,36 @@ public class CompanyServiceImpl implements ICompanyService
         }
     }
 
+    @Override
+    @Transactional
+    public void addCompanyMoney(FsStoreOrderScrm order) {
+        if(order.getCompanyId()!=null&&order.getCompanyId()>0){
+            Company company=companyMapper.selectCompanyByIdForUpdate(order.getCompanyId());
+            if(company!=null){
+                FsStoreOrder orderMap=new FsStoreOrder();
+                orderMap.setOrderId(order.getId());
+                orderMap.setTuiMoneyStatus(1);
+                storeOrderMapper.updateFsStoreOrder(orderMap);
+                BigDecimal money = order.getPayMoney().add(order.getPayRemain());
+                company.setMoney(company.getMoney().add(money));
+                companyMapper.updateCompany(company);
+                CompanyMoneyLogs log=new CompanyMoneyLogs();
+                log.setCompanyId(company.getCompanyId());
+                log.setRemark("佣金入账");
+                log.setMoney(money);
+                log.setLogsType(3);
+                log.setBalance(company.getMoney());
+                log.setCreateTime(new Date());
+                log.setBusinessId(order.getId().toString());
+                moneyLogsMapper.insertCompanyMoneyLogs(log);
+                FsStoreOrderScrm fsStoreOrder = new FsStoreOrderScrm();
+                fsStoreOrder.setId(order.getId());
+                fsStoreOrder.setTuiMoneyStatus(1);
+                storeOrderScrmMapper.updateFsStoreOrder(fsStoreOrder);
+            }
+        }
+    }
+
     @Override
     @Transactional
     public void subCompanyMoney(FsStoreOrder order) {
@@ -373,6 +431,32 @@ public class CompanyServiceImpl implements ICompanyService
 
 
 
+            }
+        }
+    }
+
+    @Override
+    @Transactional
+    public void subCompanyMoney(FsStoreOrderScrm order) {
+        if(order.getCompanyId()>0){
+            Company company=companyMapper.selectCompanyByIdForUpdate(order.getCompanyId());
+            if(company!=null){
+                company.setMoney(company.getMoney().subtract(order.getTuiMoney()));
+                company.setTuiMoney(company.getTuiMoney().subtract(order.getTuiMoney()));
+                companyMapper.updateCompany(company);
+                //写入日志
+                CompanyMoneyLogs log=new CompanyMoneyLogs();
+                log.setCompanyId(order.getCompanyId());
+                log.setRemark("订单佣金退款");
+                log.setMoney(order.getTuiMoney().multiply(new BigDecimal(-1)));
+                log.setLogsType(4);
+                log.setBalance(company.getMoney());
+                log.setCreateTime(new Date());
+                log.setBusinessId(order.getId().toString());
+                moneyLogsMapper.insertCompanyMoneyLogs(log);
+
+
+
             }
         }
     }
@@ -457,6 +541,30 @@ public class CompanyServiceImpl implements ICompanyService
 
     }
 
+    @Override
+    @Transactional
+    public void addCompanyPaymentMoney(FsStorePaymentScrm storePayment) {
+        Company company=companyMapper.selectCompanyByIdForUpdate(storePayment.getCompanyId());
+        if(company!=null){
+            company.setMoney(company.getMoney().add(storePayment.getPayMoney()));
+            company.setTuiMoney(company.getTuiMoney().add(storePayment.getPayMoney()));
+            companyMapper.updateCompany(company);
+            //写入日志
+            CompanyMoneyLogs log=new CompanyMoneyLogs();
+            log.setCompanyId(storePayment.getCompanyId());
+            log.setRemark("收款佣金入帐");
+            log.setMoney(storePayment.getPayMoney());
+            log.setLogsType(8);
+            log.setBalance(company.getMoney());
+            log.setCreateTime(new Date());
+            log.setBusinessId(storePayment.getPaymentId().toString());
+            moneyLogsMapper.insertCompanyMoneyLogs(log);
+
+
+        }
+
+    }
+
     @Override
     @Transactional
     public void subCompanyPaymentMoney(FsStorePayment payment) {
@@ -478,6 +586,27 @@ public class CompanyServiceImpl implements ICompanyService
         }
     }
 
+    @Override
+    @Transactional
+    public void subCompanyPaymentMoney(FsStorePaymentScrm payment) {
+        Company company=companyMapper.selectCompanyByIdForUpdate(payment.getCompanyId());
+        if(company!=null){
+            company.setMoney(company.getMoney().subtract(payment.getRefundMoney()));
+            company.setTuiMoney(company.getTuiMoney().subtract(payment.getRefundMoney()));
+            companyMapper.updateCompany(company);
+            //写入日志
+            CompanyMoneyLogs log=new CompanyMoneyLogs();
+            log.setCompanyId(payment.getCompanyId());
+            log.setRemark("收款佣金退款");
+            log.setMoney(payment.getRefundMoney().multiply(new BigDecimal(-1)));
+            log.setLogsType(9);
+            log.setBalance(company.getMoney());
+            log.setCreateTime(new Date());
+            log.setBusinessId(payment.getPaymentId().toString());
+            moneyLogsMapper.insertCompanyMoneyLogs(log);
+        }
+    }
+
     @Override
     public String selectOmsCodeByCompanyId(Long companyId) {
         return companyMapper.selectOmsCodeByCompanyId(companyId);

fs-service/src/main/java/com/fs/core/config/WxMpConfiguration.java

@@ -1,6 +1,8 @@
 package com.fs.core.config;
 
+import com.fs.wx.mp.handler.*;
 import lombok.AllArgsConstructor;
+import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
@@ -11,21 +13,29 @@ import org.springframework.context.annotation.Configuration;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static me.chanjar.weixin.common.api.WxConsts.EventType;
+import static me.chanjar.weixin.common.api.WxConsts.EventType.SUBSCRIBE;
+import static me.chanjar.weixin.common.api.WxConsts.EventType.UNSUBSCRIBE;
+import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType;
+import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType.EVENT;
+import static me.chanjar.weixin.mp.constant.WxMpEventConstants.CustomerService.*;
+import static me.chanjar.weixin.mp.constant.WxMpEventConstants.POI_CHECK_NOTIFY;
+
 
 @AllArgsConstructor
 @Configuration
 @EnableConfigurationProperties(WxMpProperties.class)
 public class WxMpConfiguration {
-//    private final LogHandler logHandler;
-//    private final NullHandler nullHandler;
-//    private final KfSessionHandler kfSessionHandler;
-//    private final StoreCheckNotifyHandler storeCheckNotifyHandler;
-//    private final LocationHandler locationHandler;
-//    private final MenuHandler menuHandler;
-//    private final MsgHandler msgHandler;
-//    private final UnsubscribeHandler unsubscribeHandler;
-//    private final SubscribeHandler subscribeHandler;
-//    private final ScanHandler scanHandler;
+    private final LogHandler logHandler;
+    private final NullHandler nullHandler;
+    private final KfSessionHandler kfSessionHandler;
+    private final StoreCheckNotifyHandler storeCheckNotifyHandler;
+    private final LocationHandler locationHandler;
+    private final MenuHandler menuHandler;
+    private final MsgHandler msgHandler;
+    private final UnsubscribeHandler unsubscribeHandler;
+    private final SubscribeHandler subscribeHandler;
+    private final ScanHandler scanHandler;
     private final WxMpProperties properties;
 
     @Bean
@@ -59,49 +69,49 @@ public class WxMpConfiguration {
         return service;
     }
 
-//    @Bean
-//    public WxMpMessageRouter messageRouter(WxMpService wxMpService) {
-//        final WxMpMessageRouter newRouter = new WxMpMessageRouter(wxMpService);
-//
-//        // 记录所有事件的日志 （异步执行）
-//        newRouter.rule().handler(this.logHandler).next();
-//
-//        // 接收客服会话管理事件
-//        newRouter.rule().async(false).msgType(EVENT).event(KF_CREATE_SESSION)
-//            .handler(this.kfSessionHandler).end();
-//        newRouter.rule().async(false).msgType(EVENT).event(KF_CLOSE_SESSION)
-//            .handler(this.kfSessionHandler).end();
-//        newRouter.rule().async(false).msgType(EVENT).event(KF_SWITCH_SESSION)
-//            .handler(this.kfSessionHandler).end();
-//
-//        // 门店审核事件
-//        newRouter.rule().async(false).msgType(EVENT).event(POI_CHECK_NOTIFY).handler(this.storeCheckNotifyHandler).end();
-//
-//        // 自定义菜单事件
-//        newRouter.rule().async(false).msgType(EVENT).event(EventType.CLICK).handler(this.menuHandler).end();
-//
-//        // 点击菜单连接事件
-//        newRouter.rule().async(false).msgType(EVENT).event(EventType.VIEW).handler(this.nullHandler).end();
-//
-//        // 关注事件
-//        newRouter.rule().async(false).msgType(EVENT).event(SUBSCRIBE).handler(this.subscribeHandler).end();
-//
-//        // 取消关注事件
-//        newRouter.rule().async(false).msgType(EVENT).event(UNSUBSCRIBE).handler(this.unsubscribeHandler).end();
-//
-//        // 上报地理位置事件
-//        newRouter.rule().async(false).msgType(EVENT).event(EventType.LOCATION).handler(this.locationHandler).end();
-//
-//        // 接收地理位置消息
-//        newRouter.rule().async(false).msgType(XmlMsgType.LOCATION).handler(this.locationHandler).end();
-//
-//        // 扫码事件
-//        newRouter.rule().async(false).msgType(EVENT).event(EventType.SCAN).handler(this.scanHandler).end();
-//
-//        // 默认
-//        newRouter.rule().async(false).handler(this.msgHandler).end();
-//
-//        return newRouter;
-//    }
+    @Bean
+    public WxMpMessageRouter messageRouter(WxMpService wxMpService) {
+        final WxMpMessageRouter newRouter = new WxMpMessageRouter(wxMpService);
+
+        // 记录所有事件的日志 （异步执行）
+        newRouter.rule().handler(this.logHandler).next();
+
+        // 接收客服会话管理事件
+        newRouter.rule().async(false).msgType(EVENT).event(KF_CREATE_SESSION)
+            .handler(this.kfSessionHandler).end();
+        newRouter.rule().async(false).msgType(EVENT).event(KF_CLOSE_SESSION)
+            .handler(this.kfSessionHandler).end();
+        newRouter.rule().async(false).msgType(EVENT).event(KF_SWITCH_SESSION)
+            .handler(this.kfSessionHandler).end();
+
+        // 门店审核事件
+        newRouter.rule().async(false).msgType(EVENT).event(POI_CHECK_NOTIFY).handler(this.storeCheckNotifyHandler).end();
+
+        // 自定义菜单事件
+        newRouter.rule().async(false).msgType(EVENT).event(EventType.CLICK).handler(this.menuHandler).end();
+
+        // 点击菜单连接事件
+        newRouter.rule().async(false).msgType(EVENT).event(EventType.VIEW).handler(this.nullHandler).end();
+
+        // 关注事件
+        newRouter.rule().async(false).msgType(EVENT).event(SUBSCRIBE).handler(this.subscribeHandler).end();
+
+        // 取消关注事件
+        newRouter.rule().async(false).msgType(EVENT).event(UNSUBSCRIBE).handler(this.unsubscribeHandler).end();
+
+        // 上报地理位置事件
+        newRouter.rule().async(false).msgType(EVENT).event(EventType.LOCATION).handler(this.locationHandler).end();
+
+        // 接收地理位置消息
+        newRouter.rule().async(false).msgType(XmlMsgType.LOCATION).handler(this.locationHandler).end();
+
+        // 扫码事件
+        newRouter.rule().async(false).msgType(EVENT).event(EventType.SCAN).handler(this.scanHandler).end();
+
+        // 默认
+        newRouter.rule().async(false).handler(this.msgHandler).end();
+
+        return newRouter;
+    }
 
 }

fs-service/src/main/java/com/fs/course/config/CourseConfig.java

@@ -40,6 +40,16 @@ public class CourseConfig implements Serializable {
     private Integer delayStart;
     private Integer delayEnd;
 
+    /**
+     * 小程序授权头像昵称方式（目前仅会员看课有效）
+     * 1：小程序原生授权 2：跳转H5服务号授权
+     */
+    private Integer miniAppAuthType;
+    /**
+     * 会员看课
+     * 小程序授权头像昵称，跳转H5服务号授权域名
+     */
+    private String userCourseAuthDomain;
 
     @Data
     public static class DisabledTimeVo{

fs-service/src/main/java/com/fs/course/domain/FsCourseRedPacketLog.java

@@ -1,8 +1,12 @@
 package com.fs.course.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
+import com.fs.common.core.domain.R;
 import lombok.Data;
 
 /**
@@ -59,4 +63,6 @@ public class FsCourseRedPacketLog extends BaseEntity
 
     private String result;
 
+    @TableField(exist = false)
+    private String batchId;
 }

fs-service/src/main/java/com/fs/course/mapper/FsCourseRedPacketLogMapper.java

@@ -160,4 +160,12 @@ public interface FsCourseRedPacketLogMapper
     @Select("select * from fs_course_red_packet_log where video_id = #{videoId} and user_id = #{userId} and period_id = #{periodId} limit 1")
     FsCourseRedPacketLog selectUserFsCourseRedPacketLog(@Param("videoId") Long videoId, @Param("userId")Long userId, @Param("periodId")Long periodId);
 
+    @Select("SELECT * FROM fs_course_red_packet_log \n" +
+            "WHERE create_time <= DATE_SUB(NOW(), INTERVAL 10 MINUTE)  -- 10 分钟前或更早\n" +
+            "AND create_time >= DATE(NOW())  -- 但必须是今天\n" +
+            "AND status = 0;")
+    List<FsCourseRedPacketLog> selectFail();
+
+    @Select("SELECT * FROM fs_course_red_packet_log WHERE status = 0 and create_time > DATE_SUB(NOW(), INTERVAL 2 day) and company_user_id =#{userId}")
+    List<FsCourseRedPacketLog> selectFail(@Param("userId") Long userId);
 }

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

@@ -66,6 +66,8 @@ public interface IFsCourseRedPacketLogService
 
     R syncRedPacket(String outBatchNo);
 
+    R syncRedPacket(String outBatchNo, String batchId);
+
     List<FsCourseRedPacketLogListPVO> selectFsCourseRedPacketLogListVO(FsCourseRedPacketLogParam fsCourseRedPacketLog);
     List<FsCourseRedPacketLogListPVO> selectFsCourseRedPacketLogListVONew(FsCourseRedPacketLogParam fsCourseRedPacketLog);
 

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

@@ -180,4 +180,6 @@ public interface IFsUserCourseVideoService
     FsUserCourseVideo selectByFileKey(String fileKey);
 
     String selectFsUserCourseVideoByVideoForTitle(Long videoId);
+
+    R checkUserInfo(long l);
 }

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

@@ -1,7 +1,6 @@
 package com.fs.course.service.impl;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -126,6 +125,19 @@ public class FsCourseRedPacketLogServiceImpl implements IFsCourseRedPacketLogSer
         return R.error("批次不存在");
     }
 
+    @Override
+    public R syncRedPacket(String outBatchNo, String batchId) {
+        FsCourseRedPacketLog log = fsCourseRedPacketLogMapper.selectFsCourseRedPacketLogByBatchNo(outBatchNo);
+        if (log!=null){
+            log.setStatus(1);
+            log.setUpdateTime(new Date());
+            log.setBatchId(batchId);
+            fsCourseRedPacketLogMapper.updateFsCourseRedPacketLog(log);
+            return R.ok();
+        }
+        return R.error("批次不存在");
+    }
+
     @Override
     public List<FsCourseRedPacketLogListPVO> selectFsCourseRedPacketLogListVO(FsCourseRedPacketLogParam fsCourseRedPacketLog) {
         return fsCourseRedPacketLogMapper.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);

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

@@ -2054,6 +2054,27 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         return fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoForTitle(videoId);
     }
 
+    @Override
+    public R checkUserInfo(long userId) {
+        FsUser user=fsUserService.selectFsUserById(userId);
+        if (user==null) {
+            return R.error(404,"用户不存在！");
+        }
+        //读取配置给前端返回
+        String json = sysConfigService.selectConfigByKey("course.config");
+        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+        if (StringUtils.isEmpty(user.getNickName())){
+            Map<String,Object> map = new HashMap<>();
+            map.put("authType",config.getMiniAppAuthType());
+            if (config.getMiniAppAuthType()==2){
+                map.put("domain",config.getUserCourseAuthDomain());
+            }
+            map.put("code",500);
+            return R.ok(map);
+        }
+        return R.ok().put("user",user);
+    }
+
     /**
      * 获取视频时长（优先从Redis获取，不存在则查数据库）
      */

fs-service/src/main/java/com/fs/erp/domain/ErpRefundOrder.java

@@ -14,4 +14,7 @@ public class ErpRefundOrder {
     String orderCode;
     Long afterSalesId;
 
+    //运单号
+    String deliverySn;
+
 }

fs-service/src/main/java/com/fs/erp/domain/KbStockRequest.java

@@ -0,0 +1,29 @@
+package com.fs.erp.domain;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class KbStockRequest {
+
+    /**
+     * 单据ID
+     */
+    @JSONField(name = "key", ordinal = 1)
+    @Builder.Default
+    private String key = "GoodStock";
+
+    /**
+     * 仓库编码
+     */
+    @JSONField(name = "ckid", ordinal = 2)
+    private String stockCode;
+
+    /**
+     * 商品编码 【注：不传值，默认查询对应仓库所有商品库存；传值查询对应商品库存。传值格式为：商品编码+英文逗号。如：123,456,789】
+     */
+    @JSONField(name = "cgoodsid", ordinal = 3)
+    private String goodsCode;
+}

fs-service/src/main/java/com/fs/erp/domain/KbStockResponse.java

@@ -0,0 +1,48 @@
+package com.fs.erp.domain;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+@Data
+public class KbStockResponse {
+
+    /**
+     * true：请求成功；false：请求失败；
+     */
+    @JSONField(name = "IsSuccess")
+    private Boolean success;
+
+    /**
+     * 提示消息
+     */
+    @JSONField(name = "errmsg")
+    private String msg;
+
+    /**
+     * 返回数据
+     */
+    @JSONField(name = "data")
+    private String data;
+
+    /**
+     * 库存
+     */
+    private Integer stock;
+
+    public Integer getStock() {
+        int stocks = 0;
+        JSONArray dataArray = JSON.parseArray(this.data);
+        for (int i = 0; i < dataArray.size(); i++) {
+            JSONObject base = dataArray.getJSONObject(i);
+            for (Object item : base.getJSONArray("base")) {
+                JSONObject json = (JSONObject) item;
+                stocks += json.getIntValue("fqty");
+            }
+        }
+
+        return stocks;
+    }
+}

fs-service/src/main/java/com/fs/erp/domain/KingbosOrderD1Data.java

@@ -0,0 +1,33 @@
+package com.fs.erp.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class KingbosOrderD1Data {
+    // OMS发货单号
+    private String cdo_id;
+    // OMS订单号
+    private String co_id;
+    // 药品编码
+    private String csku_id;
+    // ERP药品编码
+    private String cgoodsid;
+    // 药品名称
+    private String cname;
+    // 规格代码
+    private String cshop_sku_id;
+    // 数量
+    private BigDecimal iqty;
+    // 单价
+    private BigDecimal fprice;
+    // 总金额
+    private BigDecimal famount;
+    // 订单来源平台
+    private String cordersource;
+    // 是否退款
+    private Integer isreturn;
+    // 优惠金额
+    private BigDecimal fpromoamount;
+}

fs-service/src/main/java/com/fs/erp/domain/KingbosOrderData.java

@@ -0,0 +1,70 @@
+package com.fs.erp.domain;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 金博订单实体  data
+ */
+@Data
+public class KingbosOrderData {
+    // 订单来源
+    private String cordersource;
+    // 订单下单时间
+    private String dorder_date;
+    // 店铺买家编号
+    private String cshop_buyer_id;
+    // 平台类型
+    private String cplatformtype;
+    // 平台店铺编号
+    private String cshop_id;
+    // 平台店铺名称
+    private String cshop_name;
+    // 平台订单号
+    private String cso_id;
+    // OMS订单号
+    private String co_id;
+    // OMS发货单号
+    private String cdo_id;
+    // 应付金额
+    private BigDecimal fpay_amount;
+    // 已付金额
+    private BigDecimal fpaid_amount;
+    // 运费
+    private BigDecimal ffreight;
+    // 优惠金额
+    private BigDecimal ffree_amount;
+    // 订单状态
+    private String cstatus;
+    // 物流成本
+    private BigDecimal fpostcost;
+    // 最后更新时间
+    private String dmodified;
+    // 收件人(省)
+    private String creceiver_state;
+    // 收件人(城市)
+    private String creceiver_city;
+    // 收件人(区)
+    private String creceiver_district;
+    // 收件人(详细地址)
+    private String creceiver_address;
+    // 收件人(名称)
+    private String creceiver_name;
+    // 收件人(电话)
+    private String creceiver_mobile;
+    // 快递单号
+    private String cexpress_no;
+    // 快递公司代码
+    private String cexpress_code;
+    // 快递公司名称
+    private String cexpress_name;
+    // 仓库代码
+    private String cwarehouse_code;
+    // 仓库名称
+    private String cwarehouse_name;
+    //货到付款
+    private Integer bis_cod;
+    //代收金额
+    private BigDecimal fshouldpaymoney;
+}

fs-service/src/main/java/com/fs/erp/domain/KingbosOrderRequest.java

@@ -0,0 +1,12 @@
+package com.fs.erp.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class KingbosOrderRequest {
+    private String key;//单据ID
+    private KingbosOrderData data; //主表
+    private List<KingbosOrderD1Data> d1_data; //D1表
+}

fs-service/src/main/java/com/fs/erp/domain/KingbosOrderResponse.java

@@ -0,0 +1,10 @@
+package com.fs.erp.domain;
+
+import lombok.Data;
+
+@Data
+public class KingbosOrderResponse {
+    private Boolean IsSuccess; //true：请求成功；false：请求失败；
+    private String cbilid; //平台单号
+    private String errmsg;  //错误信息
+}

fs-service/src/main/java/com/fs/erp/domain/KingbosRefundOrderD1Data.java

@@ -0,0 +1,20 @@
+package com.fs.erp.domain;
+
+import cn.hutool.core.annotation.Alias;
+import lombok.Data;
+
+@Data
+public class KingbosRefundOrderD1Data {
+
+    /**
+     * 平台订单来源
+     */
+    @Alias("cordersource")
+    private String corderSource;
+
+    /**
+     * OMS售后单号
+     */
+    @Alias("cas_id")
+    private String casId;
+}

fs-service/src/main/java/com/fs/erp/domain/KingbosRefundOrderData.java

@@ -0,0 +1,25 @@
+package com.fs.erp.domain;
+
+import cn.hutool.core.annotation.Alias;
+import lombok.Data;
+
+@Data
+public class KingbosRefundOrderData {
+    /**
+     * 平台订单来源
+     */
+    @Alias("cordersource")
+    private String corderSource;
+
+    /**
+     * OMS售后单号
+     */
+    @Alias("cas_id")
+    private String casId;
+
+    /**
+     * OMS订单号
+     */
+    @Alias("co_id")
+    private String coId;
+}

fs-service/src/main/java/com/fs/erp/domain/KingbosRefundOrderRequest.java

@@ -0,0 +1,12 @@
+package com.fs.erp.domain;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class KingbosRefundOrderRequest {
+    private String key;//单据ID
+    private KingbosRefundOrderData data; //主表
+    private List<KingbosRefundOrderD1Data> d1_data; //D1表
+}

fs-service/src/main/java/com/fs/erp/enums/KbOrderStatusEnum.java

@@ -0,0 +1,47 @@
+package com.fs.erp.enums;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public enum KbOrderStatusEnum {
+
+    /**
+     * 发货失败
+     */
+    FAILURE("Failure", "发货失败"),
+
+    /**
+     * 未发货
+     */
+    NO_DELIVERED("NoDelivered", "未发货"),
+
+    /**
+     * 发货中
+     */
+    DELIVERING("Delivering", "发货中"),
+
+    /**
+     * 已发货
+     */
+    SENT("Sent", "已发货"),
+
+    /**
+     * 已取消
+     */
+    CANCELLED("Cancelled", "已取消"),
+
+    /**
+     * 已退货
+     */
+    RETURN("Return", "已退货");
+
+    private String code;
+    private String desc;
+
+}

fs-service/src/main/java/com/fs/erp/service/impl/K9OrderScrmServiceImpl.java

@@ -0,0 +1,422 @@
+package com.fs.erp.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.fs.common.exception.ServiceException;
+import com.fs.common.utils.StringUtils;
+import com.fs.erp.domain.*;
+import com.fs.erp.dto.*;
+import com.fs.erp.service.IErpOrderService;
+import com.fs.erp.utils.ScrmStoreSignUtils;
+import com.fs.erp.utils.ScrmStoreUrlUtils;
+import com.fs.his.domain.FsStoreOrder;
+import com.fs.his.utils.ConfigUtil;
+import com.fs.hisStore.config.FsErpConfig;
+import com.fs.hisStore.domain.FsStoreOrderItemScrm;
+import com.fs.hisStore.domain.FsStoreOrderScrm;
+import com.fs.hisStore.dto.FsStoreCartDTO;
+import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
+import com.fs.hisStore.mapper.FsStoreProductScrmMapper;
+import com.fs.hisStore.service.IFsStoreOrderItemScrmService;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.fs.erp.enums.KbOrderStatusEnum.CANCELLED;
+import static com.fs.erp.enums.KbOrderStatusEnum.NO_DELIVERED;
+
+
+@Service
+@Slf4j
+public class K9OrderScrmServiceImpl implements IErpOrderService {
+    public final static Logger logger = LoggerFactory.getLogger(K9OrderScrmServiceImpl.class);
+    @Autowired
+    ConfigUtil configUtil;
+    @Autowired
+    private FsStoreOrderScrmMapper fsStoreOrderMapper;
+    @Autowired
+    private IFsStoreOrderItemScrmService storeOrderItemService;
+    @Autowired
+    private FsStoreProductScrmMapper productMapper;
+    @Override
+    /**
+     * 推送erp订单
+     */
+    public ErpOrderResponse addOrder(ErpOrder order) {
+        return addOmsOrder(order.getPlatform_code());
+    }
+
+
+    /**
+     * 退款
+     * @param order
+     * @return
+     */
+    @Override
+    public ErpOrderResponse refundOrder(ErpRefundOrder order){
+        if (order != null){
+            String deliverySn = order.getDeliverySn();
+            String orderCode = order.getTrade_platform_code();
+            if (StringUtils.isNotBlank(orderCode)){
+                if (StringUtils.isBlank(deliverySn)){
+                    //未获取订单号
+                    return refundOmsOrder2(orderCode);
+                } else {
+                    //已获取订单号
+                    return refundOrder1(orderCode);
+                }
+            }
+        }
+        return null;
+    }
+
+    private KingbosRefundOrderRequest getKingbosRefundOrderRequest(String orderCode) {
+        FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
+        if (order != null){
+            logger.debug("【金博网络退货单】开始构建订单数据，订单号: {}", orderCode);
+            KingbosRefundOrderRequest request = new KingbosRefundOrderRequest();
+            KingbosRefundOrderData data = new KingbosRefundOrderData();
+            data.setCorderSource("MALL");
+            String extendOrderId = order.getExtendOrderId();
+            data.setCasId(extendOrderId);
+            data.setCoId(extendOrderId);
+            request.setData(data);
+            // 3. 构建订单明细数据
+            List<KingbosRefundOrderD1Data> d1Datas = new ArrayList<>();
+
+
+            List<KingbosRefundOrderD1Data> d1_data = new ArrayList<>();
+            FsStoreOrderItemScrm query = new FsStoreOrderItemScrm();
+            query.setOrderId(order.getId());
+            List<FsStoreOrderItemScrm> orderItems = storeOrderItemService.selectFsStoreOrderItemList(query);
+
+
+            d1_data = orderItems.stream()
+                    .map(item -> buildRefundOrderDetailItem(extendOrderId))
+                    .collect(Collectors.toList());
+            request.setD1_data(d1_data);
+            logger.info("【金博网络退货单】订单明细数据构建完成，明细数量: {}", d1Datas.size());
+        }
+        return null;
+    }
+
+    @Override
+    public ErpDeliverysResponse getDeliver(ErpDeliverysRequest param) {
+        return null;
+    }
+
+    @Override
+    public ErpOrderQueryResponse getOrder(ErpOrderQueryRequert param) {
+        return null;
+    }
+
+    @Override
+    public BaseResponse refundUpdate(ErpRefundUpdateRequest param) {
+        return null;
+    }
+
+
+    /**
+     * 退款 运单号已获取到
+     * @param orderCode
+     * @return
+     */
+    private ErpOrderResponse refundOrder1(String orderCode) {
+        KingbosRefundOrderRequest request = getKingbosRefundOrderRequest(orderCode);
+        FsErpConfig erpConfig = configUtil.getErpConfig();
+        JSONObject param = JSONUtil.createObj();
+        param.set("key", "WR");
+        param.set("data", request.getData());
+        param.set("d1_data", request.getD1_data());
+        String timeStep = System.currentTimeMillis() + "";
+        String sign = ScrmStoreSignUtils.sign(param.toString(),erpConfig.getKingbosSecret(), erpConfig.getKingbosan(), timeStep);
+        String url = ScrmStoreUrlUtils.getUrl(erpConfig.getKingbosUrl(),sign, timeStep);
+        String result = HttpUtil.post(url, param.toString());
+        logger.info("zyp \n【金博网络退货单】:"+result);
+        KingbosOrderResponse response = JSONUtil.toBean(result, KingbosOrderResponse.class);
+        log.info("订单推送成功: {}", response);
+        ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
+        erpOrderResponse.setCode(response.getCbilid());
+        return erpOrderResponse;
+    }
+
+
+
+
+    /**
+     * 退款 运单号未获取到  改状态
+     * @param orderCode 订单编号
+     * @return
+     */
+    private ErpOrderResponse refundOmsOrder2(String orderCode) {
+        try {
+            KingbosOrderResponse response = createOmsOrder(orderCode, CANCELLED.getCode());
+            if (response.getIsSuccess()){
+                log.info("订单推送成功: {}", response);
+                ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
+                erpOrderResponse.setCode(response.getCbilid());
+                return erpOrderResponse;
+            }else {
+                throw new RuntimeException(String.format("订单推送失败,原因: %s",response.getErrmsg()));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new ErpOrderResponse();
+    }
+
+    /**
+     * 通过订单编号推送订单 解析金博结果
+     * @param orderCode
+     * @return
+     */
+    private ErpOrderResponse addOmsOrder(String orderCode) {
+        try {
+            KingbosOrderResponse response = this.createOmsOrder(orderCode, NO_DELIVERED.getCode());
+            if (response.getIsSuccess()){
+                log.info("订单推送成功: {}", response);
+                ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
+                erpOrderResponse.setCode(response.getCbilid());
+                return erpOrderResponse;
+            }else {
+                throw new RuntimeException(String.format("订单推送失败,原因: %s",response.getErrmsg()));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new ErpOrderResponse();
+    }
+
+
+    /**
+     * 组装参数得到金博结果
+     * @param orderCode
+     * @param orderStatus
+     * @return
+     */
+    private KingbosOrderResponse createOmsOrder(String orderCode,String orderStatus){
+        logger.info("【金博网络订单】开始创建订单，订单Code: {}", orderCode);
+        try {
+            // 1. 获取订单信息并验证
+            FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderByOrderCode(orderCode);
+            logger.info("【金博网络订单】订单信息获取成功，订单id: {}", order.getId());
+            logger.info("【金博网络订单】订单信息获取成功，订单号: {}", order.getOrderCode());
+
+            // 2. 构建金博订单数据
+            KingbosOrderData data = buildKingbosOrderData(order,orderStatus);
+            logger.info("【金博网络订单】订单数据构建完成，金博订单号: {}", data.getCo_id());
+
+            // 3. 构建订单明细数据
+            List<KingbosOrderD1Data> d1Datas = buildOrderDetailData(order, data.getCdo_id());
+            logger.info("【金博网络订单】订单明细数据构建完成，明细数量: {}", d1Datas.size());
+
+            // 4. 发送订单请求
+            KingbosOrderResponse response = sendOrderRequest(data, d1Datas);
+            if (response.getCbilid()==null){
+                response.setCbilid(order.getExtendOrderId());
+            }
+            return response;
+//            if (response.getIsSuccess()){
+//                FsStoreOrder order1 = new FsStoreOrder();
+//                order1.setId(order.getId());
+//                order1.setExtendOrderId(response.getCbilid());
+//                fsStoreOrderMapper.updateFsStoreOrder(order1);
+//                logger.info("【金博网络订单】订单创建完成，订单ID: {}", orderId);
+//            }else {
+//                logger.error("【金博网络订单】创建订单失败，订单ID: {}, 错误信息: {}", orderId, response.getErrmsg());
+//            }
+        } catch (Exception e) {
+            logger.error("【金博网络订单】创建订单失败，订单Code: {}, 错误信息: {}", orderCode, e.getMessage(), e);
+            throw e;
+        }
+    }
+
+
+    /**
+     * 组装订单推送参数
+     * @param order
+     * @param orderStatus
+     * @return
+     */
+    private KingbosOrderData buildKingbosOrderData(FsStoreOrderScrm order,String orderStatus) {
+        FsErpConfig erpConfig = configUtil.getErpConfig();
+        logger.debug("【金博网络订单】开始构建订单数据，订单号: {}", order.getOrderCode());
+        KingbosOrderData data = new KingbosOrderData();
+        // 设置基础信息
+        data.setCordersource("MALL");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        data.setDorder_date(sdf.format(order.getCreateTime()));
+//        data.setCshop_buyer_id("zk2025");
+        data.setCplatformtype("99");
+        data.setCshop_id("zk2025");
+        data.setCshop_name("自建商城");
+        String orderSn = "";
+        // 设置订单编号
+        if (orderStatus.equals(NO_DELIVERED.getCode())){
+            orderSn= IdUtil.getSnowflake(0, 0).nextIdStr();
+        }else if (orderStatus.equals(CANCELLED.getCode())){
+            orderSn = order.getExtendOrderId();
+        }
+
+        data.setCso_id(order.getOrderCode());
+        data.setCo_id(orderSn);
+        data.setCdo_id(orderSn);
+        //同步订单信息
+        order.setExtendOrderId(orderSn);
+
+        // 设置金额信息
+        data.setFpay_amount(order.getPayPrice());
+        data.setFpaid_amount(order.getPayMoney());
+        data.setFfreight(order.getTotalPostage());
+        data.setFfree_amount(order.getCouponPrice());
+        data.setFpostcost(BigDecimal.ZERO);
+
+        // 设置状态和时间
+        data.setCstatus(orderStatus);//未发货
+        data.setDmodified(sdf.format(order.getUpdateTime()));
+
+        // 设置收货信息
+        setReceiverInfo(data, order);
+
+        // 设置仓库信息
+        data.setCwarehouse_code(erpConfig.getCwarehouseCode());
+        data.setCwarehouse_name(erpConfig.getCwarehouseName());
+
+        // 设置货到付款信息
+        if (!order.getPayType().equals("1")) {
+            data.setBis_cod(1);
+            data.setFshouldpaymoney(order.getDeliveryPayMoney());
+        }
+
+        return data;
+    }
+
+    private void setReceiverInfo(KingbosOrderData data, FsStoreOrderScrm order) {
+        logger.debug("【金博网络订单】开始处理收货信息，订单号: {}", order.getOrderCode());
+        String[] address = order.getUserAddress().split(" ");
+        if (address.length < 3) {
+            logger.error("【金博网络订单】收货地址格式不正确，订单号: {}, 地址: {}", order.getOrderCode(), order.getUserAddress());
+            throw new ServiceException("收货地址格式不正确");
+        }
+
+        data.setCreceiver_state(address[0]);
+        data.setCreceiver_city(address[1]);
+        data.setCreceiver_district(address[2]);
+
+        // 处理详细地址
+        String detailAddress = address.length > 3 ?
+            String.join("", Arrays.copyOfRange(address, 3, address.length)) :
+            address[2];
+
+        // 处理特殊字符
+        detailAddress = detailAddress.replace("+", "加")
+                                   .replace("\n", "");
+
+        data.setCreceiver_address(detailAddress);
+        data.setCreceiver_name(order.getRealName());
+        data.setCreceiver_mobile(order.getUserPhone());
+
+    }
+
+    private List<KingbosOrderD1Data> buildOrderDetailData(FsStoreOrderScrm order, String orderId) {
+        logger.debug("【金博网络订单】开始构建订单明细，订单号: {}", order.getOrderCode());
+        FsStoreOrderItemScrm query = new FsStoreOrderItemScrm();
+        query.setOrderId(order.getId());
+        List<FsStoreOrderItemScrm> orderItems = storeOrderItemService.selectFsStoreOrderItemList(query);
+
+        List<KingbosOrderD1Data> d1Datas = orderItems.stream()
+            .map(item -> buildOrderDetailItem(item, orderId))
+            .collect(Collectors.toList());
+
+        logger.debug("【金博网络订单】订单明细构建完成，订单号: {}, 明细数量: {}", order.getOrderCode(), d1Datas.size());
+        return d1Datas;
+    }
+
+    private KingbosRefundOrderD1Data buildRefundOrderDetailItem(String orderId) {
+        KingbosRefundOrderD1Data item = new KingbosRefundOrderD1Data();
+        item.setCasId(orderId);
+        item.setCorderSource("MALL");
+        return item;
+    }
+
+    private KingbosOrderD1Data buildOrderDetailItem(FsStoreOrderItemScrm orderItem, String orderId) {
+        FsStoreCartDTO cartDTO = JSONUtil.toBean(orderItem.getJsonInfo(), FsStoreCartDTO.class);
+        BigDecimal quantity = new BigDecimal(orderItem.getNum());
+
+        KingbosOrderD1Data item = new KingbosOrderD1Data();
+        item.setCdo_id(orderId);
+        item.setCo_id(orderId);
+        item.setCsku_id(cartDTO.getBarCode());
+        item.setCgoodsid(cartDTO.getBarCode());
+        item.setCname(cartDTO.getProductName());
+        item.setCshop_sku_id(cartDTO.getSku());
+        item.setIqty(quantity);
+        item.setFprice(cartDTO.getPrice());
+        item.setFamount(quantity.multiply(cartDTO.getPrice()));
+        item.setCordersource("MALL");
+        item.setFpromoamount(BigDecimal.ZERO);
+
+        return item;
+    }
+
+    /**
+     * 发送请求
+     * @param data
+     * @param d1Datas
+     * @return
+     */
+    private KingbosOrderResponse sendOrderRequest(KingbosOrderData data, List<KingbosOrderD1Data> d1Datas) {
+        logger.info("【金博网络订单】开始发送订单请求，金博订单号: {}", data.getCo_id());
+        KingbosOrderRequest request = new KingbosOrderRequest();
+        request.setData(data);
+        request.setD1_data(d1Datas);
+
+        try {
+            KingbosOrderResponse response = addErpOrder(request);
+            logger.info("【金博网络订单】订单请求发送成功，金博订单号: {}, 响应结果: {}", data.getCo_id(), response);
+            return response;
+        } catch (Exception e) {
+            logger.error("【金博网络订单】订单请求发送失败，金博订单号: {}, 错误信息: {}", data.getCo_id(), e.getMessage(), e);
+            throw e;
+        }
+    }
+
+    private KingbosOrderResponse addErpOrder(KingbosOrderRequest request) {
+        FsErpConfig erpConfig = configUtil.getErpConfig();
+        JSONObject param = JSONUtil.createObj();
+        param.set("key", "OL");
+        param.set("data", request.getData());
+        param.set("d1_data", request.getD1_data());
+        String timeStep = System.currentTimeMillis() + "";
+        logger.info("zyp \n【金博网络订单推送参数】:"+param);
+        String sign = ScrmStoreSignUtils.sign(param.toString(),erpConfig.getKingbosSecret(), erpConfig.getKingbosan(), timeStep);
+        String url = ScrmStoreUrlUtils.getUrl(erpConfig.getKingbosUrl(),sign, timeStep);
+        String json = param.toString();
+        String result = HttpUtil.post(url, json);
+        logger.info("zyp \n【金博网络订单推送返回】:"+result);
+        KingbosOrderResponse response = JSONUtil.toBean(result, KingbosOrderResponse.class);
+        return response;
+    }
+
+
+    @Override
+    public ErpOrderResponse finishOrder(ErpOrder order) {
+        return null;
+    }
+
+    @Override
+    public void getOrderDeliveryStatus(FsStoreOrder order) {
+
+    }
+}

fs-service/src/main/java/com/fs/erp/utils/ScrmStoreSignUtils.java

@@ -0,0 +1,12 @@
+package com.fs.erp.utils;
+
+
+import com.fs.ad.yk.utils.Md5Util;
+
+public class ScrmStoreSignUtils {
+
+    public static String sign(String data, String secret, String name, String timestamp) {
+        String enValue = "kingbos" + secret + timestamp + name + "zy01" + data;
+        return Md5Util.MD5(enValue);
+    }
+}

fs-service/src/main/java/com/fs/erp/utils/ScrmStoreUrlUtils.java

@@ -0,0 +1,26 @@
+package com.fs.erp.utils;
+
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+
+public class ScrmStoreUrlUtils {
+    public static String getUrl(String url, String sign, String timeStep) {
+        String updatedUrl = updateURLParams(url, "timestep", timeStep);
+        updatedUrl = updateURLParams(updatedUrl, "sign", sign);
+        return updatedUrl;
+    }
+
+    public static String updateURLParams(String url, String param, String value) {
+        String encodedValue;
+        try {
+            encodedValue = URLEncoder.encode(value, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            encodedValue = value;
+            e.printStackTrace();
+        }
+
+        return url.replaceAll(param + "=", param + "=" + encodedValue);
+    }
+}

fs-service/src/main/java/com/fs/his/utils/ConfigUtil.java

@@ -2,6 +2,7 @@ package com.fs.his.utils;
 
 import com.alibaba.fastjson.JSON;
 import com.fs.his.config.FsSysConfig;
+import com.fs.hisStore.config.FsErpConfig;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
 import com.qcloud.cos.model.GetBucketLifecycleConfigurationRequest;
@@ -14,6 +15,9 @@ import java.util.Map;
 @Service
 public class ConfigUtil {
     FsSysConfig fsSysConfig;
+
+    FsErpConfig fsErpConfig;
+
     @Autowired
     SysConfigMapper sysConfigMapper;
     public FsSysConfig getSysConfig(){
@@ -27,4 +31,16 @@ public class ConfigUtil {
             return this.fsSysConfig ;
         }
     }
+
+    public FsErpConfig getErpConfig(){
+        if (this.fsErpConfig==null){
+            SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("erp.config");
+            String configValue = sysConfig.getConfigValue();
+            FsErpConfig config = JSON.parseObject(configValue, FsErpConfig.class);
+            this.fsErpConfig=config;
+            return this.fsErpConfig;
+        }else {
+            return this.fsErpConfig ;
+        }
+    }
 }

fs-service/src/main/java/com/fs/hisStore/bean/Drug.java

@@ -0,0 +1,21 @@
+package com.fs.hisStore.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class Drug implements Serializable {
+    String drug_common_name;//药品名称
+    String drug_specification;//药品规格
+    String usage_method;//使⽤⽅法
+    String usage_frequency_unit;//药品频次
+    String usage_per_use_count;//每次⽤药数量
+    String usage_per_use_unit;//每次⽤药单位
+    String usage_days;//天数
+    String sale_amount;//药品数量
+    String sale_unit;//药品数量单位
+    String instructions;//药品说明书
+    String approval_number;//药品产品批准⽂号⽤药单位
+
+}

fs-service/src/main/java/com/fs/hisStore/bean/Prescribe.java

@@ -0,0 +1,44 @@
+package com.fs.hisStore.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class Prescribe implements Serializable {
+    String rp_type;//药品类型：01⻄药 02中药
+    String rp_id;//处⽅单ID（唯⼀ID）
+    String pharmacy_code;//⻔店ID
+    String pharmacy_name;//⻔店名称
+    String chief_complaint;//病情描述(主诉）
+    String now_illness;//现病史
+    String history_illness;//既往史
+    Integer patient_age;//患者年龄
+    String patient_name;//患者姓名
+    Integer weight;//体重
+    String icd_name;//对应icd名称
+    String icd_name2;//对应icd名称2
+    String is_history_allergic;//是否有过敏史（传值：是/否）
+    String history_allergic;
+    String liver_unusual;//肝功能是否异常（传值：是/否）
+    String renal_unusual;//肾功能是否异常（传值：是/否）
+    String lactation_flag;//是否是备孕/怀孕/哺乳期（传值：是/否)
+    String patient_tel;//患者⼿机号(通过订单号去订单中⼼查)
+    String patient_gender;//患者性别(传数字，1男 2⼥)
+    String[] record_pic;//复诊凭证
+    String rp_create_time;//处⽅开具时间（来互联⽹医院开⽅的时间）
+    String rp_url_type;//处⽅⽂件格式(传值：png/jpg)
+    String pharmacist_id;//药师ID
+    String pharmacist_name;//药师名称
+    String pharmacist_autograph;//药师签名地址
+    String dispensing_pharmacist_id;//发药药师ID
+    String dispensing_pharmacist_name;//发药药师名称
+    String dispensing_pharmacist_autograph;//发药药师签名地址
+    String deployment_pharmacist_id;//配药药师ID
+    String deployment_pharmacist_name;//配药药师名称
+    String deployment_pharmacist_autograph;//配药药师签名地址
+    Integer is_pharmacist_audit;//是否提供药师审核，0-不使⽤⼀线平台的药师审核，1-使⽤⼀线平台的药师审核
+    String callback_url;//回调地址，如果填写，审核完处⽅后⾃动回调到第三⽅药房服务接⼝
+    List<Drug> drug_list;
+}

fs-service/src/main/java/com/fs/hisStore/config/AgreementConfig.java

@@ -0,0 +1,11 @@
+package com.fs.hisStore.config;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class AgreementConfig implements Serializable {
+    String userAgreement;
+    String privacyPolicy;
+}

fs-service/src/main/java/com/fs/hisStore/config/CompanyMenuConfig.java

@@ -0,0 +1,13 @@
+package com.fs.hisStore.config;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CompanyMenuConfig implements Serializable {
+
+    private Long [] menuIds;
+
+
+}

fs-service/src/main/java/com/fs/hisStore/config/ConceptConfig.java

@@ -0,0 +1,13 @@
+package com.fs.hisStore.config;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class ConceptConfig implements Serializable {
+
+    private String images;//企业理念图片
+    private String videoUrl;//企业理念视频
+
+}

fs-service/src/main/java/com/fs/hisStore/config/FsErpConfig.java

@@ -0,0 +1,34 @@
+package com.fs.hisStore.config;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FsErpConfig {
+    //不推送erp的公司id
+    List<Long> noErpCompany;
+    //erp接口
+    Integer erpOpen;//是否开启ERP
+    Integer erpType;//1:管易 2:旺店通 3:金博
+    //管易
+    String erpAppKey;
+    String erpSessionKey;
+    String erpSecret;
+    String erpUrl;
+    String erpShopCode;//店铺CODE
+    //erp旺店通
+    String erpWdAppKey;
+    String erpWdAppsecret;
+    String erpWdSid;
+    String erpWdShopCode;
+    String erpWdBaseUrl;
+    String erpWarehouseCode;
+    //金博
+    String kingbosan;//账套名称
+    String kingbosSecret;//金博密钥
+    String kingbosUrl;//金博地址
+    String corgid;//机构编码
+    String cwarehouseCode;
+    String cwarehouseName;
+}

fs-service/src/main/java/com/fs/hisStore/config/StoreConfig.java

@@ -0,0 +1,27 @@
+package com.fs.hisStore.config;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class StoreConfig implements Serializable {
+
+    private String hotSearch;//热门搜索
+    private String certs;//资质证书
+    private BigDecimal serviceFee;//服务费
+    private Integer salesPriceRate;//成本售价比例
+    private Integer payRate;//支付比例
+    private Integer payAmount;//货到付款自定义金额
+    private Integer unPayTime;//未支付订单自动取消时间
+    private Integer tuiMoneyRate;//公司佣金比例 支付金额-（订单金额*rate%）
+    private Integer createMoneyRate;//公司制单金额最低比例
+    private Integer storeAfterSalesDay;//已完成订单售后有效天数
+    private String refundConsignee;
+    private String refundPhoneNumber;
+    private String refundAddress;
+    private Integer auditSwitch; // 订单审核开关
+    private Integer createSalesOrderType; // 订单改价方式 1 商品改价 2总价改价
+
+}

fs-service/src/main/java/com/fs/hisStore/config/StoreIntegralConfig.java

@@ -0,0 +1,16 @@
+package com.fs.hisStore.config;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class StoreIntegralConfig implements Serializable {
+    private Double integralRatio;//积分比例
+    private Double integralMax; //最大使用积分
+    private BigDecimal integralFull;//满多少金额可用
+
+
+
+}

fs-service/src/main/java/com/fs/hisStore/config/StoreSignConfig.java

@@ -0,0 +1,14 @@
+package com.fs.hisStore.config;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StoreSignConfig implements Serializable {
+    private Long signNum;
+    private Integer sort;
+    private String day;
+
+
+}

fs-service/src/main/java/com/fs/hisStore/constants/StoreConstants.java

@@ -0,0 +1,24 @@
+package com.fs.hisStore.constants;
+
+public interface StoreConstants {
+
+    /**
+     * 订单自动取消时间（分钟）
+     */
+    long ORDER_OUTTIME_UNPAY = 30;
+    /**
+     * 订单自动收货时间（天）
+     */
+    long ORDER_OUTTIME_UNCONFIRM = 7;
+    /**
+     * redis订单未付款key
+     */
+    String REDIS_ORDER_OUTTIME_UNPAY = "order:unpay:";
+    /**
+     * redis订单收货key
+     */
+    String REDIS_ORDER_OUTTIME_UNCONFIRM = "order:unconfirm:";
+
+    String WECHAT_PUSH_REMARK = "FS为您服务！";
+    String DELIVERY = "delivery";
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsAdvScrm.java

@@ -0,0 +1,61 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 广告对象 fs_adv
+ *
+ * author fs
+ * @date 2022-05-28
+ */
+@Data
+@TableName("fs_adv")
+public class FsAdvScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long  advId;
+
+    /** 广告标题 */
+    @Excel(name = "广告标题")
+    private String advTitle;
+
+    //广告位类型
+    private Integer urlType;
+
+    /** 广告图片 */
+    @Excel(name = "广告图片")
+    private String imageUrl;
+
+    /** 广告地址 */
+    @Excel(name = "广告地址")
+    private String advUrl;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 状态(1:正常，0:禁用) */
+    @Excel(name = "状态(1:正常，0:禁用)")
+    private Long status;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 广告类型 1首页顶部 2首页底部 */
+    @Excel(name = "广告类型 1首页顶部 2首页底部")
+    private Integer advType;
+
+    /** 显示类型 1公众号链接 2 小程序页面地址 3文章内容 */
+    @Excel(name = "显示类型 1公众号链接 2 小程序页面地址 3文章内容")
+    private Integer showType;
+
+
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsAppVersionScrm.java

@@ -0,0 +1,124 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 安卓版本对象 fs_app_version
+ * 
+ * @author fs
+ * @date 2023-02-03
+ */
+@TableName("fs_app_version")
+public class FsAppVersionScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long versionId;
+
+    /** 版本名称 */
+    @Excel(name = "版本名称")
+    private String versionName;
+
+    /** 版本CODE */
+    @Excel(name = "版本CODE")
+    private Long versionCode;
+
+    /** 更新描述 */
+    @Excel(name = "更新描述")
+    private String note;
+
+    /** 下载地址 */
+    @Excel(name = "下载地址")
+    private String url;
+
+    /** APP类型 1android 2ios */
+    @Excel(name = "APP类型 1android 2ios")
+    private Integer type;
+
+    /** 是否强制更新 */
+    @Excel(name = "是否强制更新")
+    private Integer isForce;
+
+    public void setVersionId(Long versionId) 
+    {
+        this.versionId = versionId;
+    }
+
+    public Long getVersionId() 
+    {
+        return versionId;
+    }
+    public void setVersionName(String versionName) 
+    {
+        this.versionName = versionName;
+    }
+
+    public String getVersionName() 
+    {
+        return versionName;
+    }
+    public void setVersionCode(Long versionCode) 
+    {
+        this.versionCode = versionCode;
+    }
+
+    public Long getVersionCode() 
+    {
+        return versionCode;
+    }
+    public void setNote(String note) 
+    {
+        this.note = note;
+    }
+
+    public String getNote() 
+    {
+        return note;
+    }
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+    public void setIsForce(Integer isForce) 
+    {
+        this.isForce = isForce;
+    }
+
+    public Integer getIsForce() 
+    {
+        return isForce;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("versionId", getVersionId())
+            .append("versionName", getVersionName())
+            .append("versionCode", getVersionCode())
+            .append("note", getNote())
+            .append("url", getUrl())
+            .append("type", getType())
+            .append("isForce", getIsForce())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsArticleCateScrm.java

@@ -0,0 +1,91 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 文章分类对象 fs_article_cate
+ *
+ * @author fs
+ * @date 2022-03-25
+ */
+@TableName("fs_article_cate")
+public class FsArticleCateScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long cateId;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    private String cateName;
+
+    /** 状态 1正常 0禁用 */
+    @Excel(name = "状态 1正常 0禁用")
+    private Integer status;
+
+    private Integer sort;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Integer isDel;
+
+    public Integer getSort() {
+        return sort;
+    }
+
+    public void setSort(Integer sort) {
+        this.sort = sort;
+    }
+
+    public void setCateId(Long cateId)
+    {
+        this.cateId = cateId;
+    }
+
+    public Long getCateId()
+    {
+        return cateId;
+    }
+    public void setCateName(String cateName)
+    {
+        this.cateName = cateName;
+    }
+
+    public String getCateName()
+    {
+        return cateName;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+    public void setIsDel(Integer isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel()
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("cateId", getCateId())
+            .append("cateName", getCateName())
+            .append("status", getStatus())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsArticleScrm.java

@@ -0,0 +1,171 @@
+package com.fs.hisStore.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 文章对象 fs_article
+ * 
+ * @author fs
+ * @date 2022-03-25
+ */
+@TableName("fs_article")
+public class FsArticleScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Integer articleId;
+
+    /** 分类ID */
+    @Excel(name = "分类ID")
+    private Long cateId;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 封面图片 */
+    @Excel(name = "封面图片")
+    private String imageUrl;
+
+    /** 是否推荐 */
+    @Excel(name = "是否推荐")
+    private Integer isTui;
+
+    /** 是否最新 */
+    @Excel(name = "是否最新")
+    private Integer isNews;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String contents;
+
+    /** 浏览数 */
+    @Excel(name = "浏览数")
+    private Long views;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 发布时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date publishTime;
+
+    public void setArticleId(Integer articleId) 
+    {
+        this.articleId = articleId;
+    }
+
+    public Integer getArticleId() 
+    {
+        return articleId;
+    }
+    public void setCateId(Long cateId) 
+    {
+        this.cateId = cateId;
+    }
+
+    public Long getCateId() 
+    {
+        return cateId;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setImageUrl(String imageUrl) 
+    {
+        this.imageUrl = imageUrl;
+    }
+
+    public String getImageUrl() 
+    {
+        return imageUrl;
+    }
+    public void setIsTui(Integer isTui) 
+    {
+        this.isTui = isTui;
+    }
+
+    public Integer getIsTui() 
+    {
+        return isTui;
+    }
+    public void setIsNews(Integer isNews) 
+    {
+        this.isNews = isNews;
+    }
+
+    public Integer getIsNews() 
+    {
+        return isNews;
+    }
+    public void setContents(String contents) 
+    {
+        this.contents = contents;
+    }
+
+    public String getContents() 
+    {
+        return contents;
+    }
+    public void setViews(Long views) 
+    {
+        this.views = views;
+    }
+
+    public Long getViews() 
+    {
+        return views;
+    }
+    public void setSort(Long sort) 
+    {
+        this.sort = sort;
+    }
+
+    public Long getSort() 
+    {
+        return sort;
+    }
+    public void setPublishTime(Date publishTime) 
+    {
+        this.publishTime = publishTime;
+    }
+
+    public Date getPublishTime() 
+    {
+        return publishTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("articleId", getArticleId())
+            .append("cateId", getCateId())
+            .append("title", getTitle())
+            .append("imageUrl", getImageUrl())
+            .append("isTui", getIsTui())
+            .append("isNews", getIsNews())
+            .append("contents", getContents())
+            .append("views", getViews())
+            .append("sort", getSort())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("publishTime", getPublishTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsArticleViewsScrm.java

@@ -0,0 +1,67 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 文章阅读对象 fs_article_views
+ * 
+ * @author fs
+ * @date 2022-03-25
+ */
+@TableName("fs_article_views")
+public class FsArticleViewsScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long viewId;
+
+    /** 文章ID */
+    @Excel(name = "文章ID")
+    private Long articleId;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    public void setViewId(Long viewId) 
+    {
+        this.viewId = viewId;
+    }
+
+    public Long getViewId() 
+    {
+        return viewId;
+    }
+    public void setArticleId(Long articleId) 
+    {
+        this.articleId = articleId;
+    }
+
+    public Long getArticleId() 
+    {
+        return articleId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("viewId", getViewId())
+            .append("articleId", getArticleId())
+            .append("userId", getUserId())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsChineseMedicineScrm.java

@@ -0,0 +1,78 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 中药对象 fs_chinese_medicine
+ *
+ * @author fs
+ * @date 2023-10-26
+ */
+@Data
+@TableName("fs_chinese_medicine")
+public class FsChineseMedicineScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 中药名称 */
+    @Excel(name = "中药名称")
+    private String medicineName;
+
+    @Excel(name = "功效概述")
+    private String actionTitle;
+    /** 图片 */
+    @Excel(name = "图片")
+    private String imgUrl;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 是否生活常见 */
+    @Excel(name = "是否生活常见")
+    private Integer isUsual;
+
+    /** 主治疾病 */
+    @Excel(name = "主治疾病")
+    private String indication;
+
+    /** 药物作用 */
+    @Excel(name = "药物作用")
+    private String action;
+
+    /** 用药方法 */
+    @Excel(name = "用药方法")
+    private String usageMethod;
+
+    /** 基本信息 */
+    @Excel(name = "基本信息")
+    private String descs;
+
+    /** 注意事项 */
+    @Excel(name = "注意事项")
+    private String msg;
+
+    /** 归经 */
+    @Excel(name = "归经")
+    private String vessel;
+
+    /** 五味 */
+    @Excel(name = "五味")
+    private String flavor;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 拼音 */
+    @Excel(name = "拼音")
+    private String pinyin;
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsCityScrm.java

@@ -0,0 +1,179 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 城市对象 fs_city
+ *
+ * @author fs
+ * @date 2023-06-02
+ */
+@TableName("fs_city")
+public class FsCityScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 地址编码 */
+    @Excel(name = "地址编码")
+    private String cityId;
+
+    /** 地区名称 */
+    @Excel(name = "地区名称")
+    private String cityName;
+
+    /** 地区全称 */
+    @Excel(name = "地区全称")
+    private String citySname;
+
+    /** 上级编码 */
+    @Excel(name = "上级编码")
+    private String parentId;
+
+    /** 首字母 */
+    @Excel(name = "首字母")
+    private String spell;
+
+    /** 类型：1是省会，2直辖市,3港澳台,4其它 */
+    @Excel(name = "类型：1是省会，2直辖市,3港澳台,4其它")
+    private Integer cityType;
+
+    /** 同级下排序 */
+    @Excel(name = "同级下排序")
+    private Integer sort;
+
+    /** 0全国、1省、2市区、3郊县、4街道、5居委会 */
+    @Excel(name = "0全国、1省、2市区、3郊县、4街道、5居委会")
+    private Integer level;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String lng;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String lat;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCityId(String cityId)
+    {
+        this.cityId = cityId;
+    }
+
+    public String getCityId()
+    {
+        return cityId;
+    }
+    public void setCityName(String cityName)
+    {
+        this.cityName = cityName;
+    }
+
+    public String getCityName()
+    {
+        return cityName;
+    }
+    public void setCitySname(String citySname)
+    {
+        this.citySname = citySname;
+    }
+
+    public String getCitySname()
+    {
+        return citySname;
+    }
+    public void setParentId(String parentId)
+    {
+        this.parentId = parentId;
+    }
+
+    public String getParentId()
+    {
+        return parentId;
+    }
+    public void setSpell(String spell)
+    {
+        this.spell = spell;
+    }
+
+    public String getSpell()
+    {
+        return spell;
+    }
+    public void setCityType(Integer cityType)
+    {
+        this.cityType = cityType;
+    }
+
+    public Integer getCityType()
+    {
+        return cityType;
+    }
+    public void setSort(Integer sort)
+    {
+        this.sort = sort;
+    }
+
+    public Integer getSort()
+    {
+        return sort;
+    }
+    public void setLevel(Integer level)
+    {
+        this.level = level;
+    }
+
+    public Integer getLevel()
+    {
+        return level;
+    }
+    public void setLng(String lng)
+    {
+        this.lng = lng;
+    }
+
+    public String getLng()
+    {
+        return lng;
+    }
+    public void setLat(String lat)
+    {
+        this.lat = lat;
+    }
+
+    public String getLat()
+    {
+        return lat;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("cityId", getCityId())
+                .append("cityName", getCityName())
+                .append("citySname", getCitySname())
+                .append("parentId", getParentId())
+                .append("spell", getSpell())
+                .append("cityType", getCityType())
+                .append("sort", getSort())
+                .append("level", getLevel())
+                .append("lng", getLng())
+                .append("lat", getLat())
+                .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsDepartmentScrm.java

@@ -0,0 +1,122 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 科室对象 fs_department
+ *
+ * @author fs
+ * @date 2023-06-01
+ */
+@TableName("fs_department")
+public class FsDepartmentScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long deptId;
+
+    /** 科室名称 */
+    @Excel(name = "科室名称")
+    private String deptName;
+
+    /** 科室编码 */
+    @Excel(name = "科室编码")
+    private String deptCode;
+
+    /** 图标 */
+    @Excel(name = "图标")
+    private String iconUrl;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Integer status;
+    private Integer isTui;
+
+    public Integer getIsTui() {
+        return isTui;
+    }
+
+    public void setIsTui(Integer isTui) {
+        this.isTui = isTui;
+    }
+
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setDeptName(String deptName)
+    {
+        this.deptName = deptName;
+    }
+
+    public String getDeptName()
+    {
+        return deptName;
+    }
+    public void setDeptCode(String deptCode)
+    {
+        this.deptCode = deptCode;
+    }
+
+    public String getDeptCode()
+    {
+        return deptCode;
+    }
+    public void setIconUrl(String iconUrl)
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl()
+    {
+        return iconUrl;
+    }
+    public void setSort(Long sort)
+    {
+        this.sort = sort;
+    }
+
+    public Long getSort()
+    {
+        return sort;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("deptId", getDeptId())
+            .append("deptName", getDeptName())
+            .append("deptCode", getDeptCode())
+            .append("iconUrl", getIconUrl())
+            .append("sort", getSort())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .append("status", getStatus())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsDiseaseScrm.java

@@ -0,0 +1,147 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 疾病对象 fs_disease
+ *
+ * @author fs
+ * @date 2023-06-01
+ */
+@TableName("fs_disease")
+public class FsDiseaseScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    private Long diseaseId;
+
+    private String diseaseName;
+
+    private String diseaseCode;
+
+    /** 所属部门 */
+    @Excel(name = "所属部门")
+    private Long deptId;
+
+    /** 简介 */
+    @Excel(name = "简介")
+    private String introduction;
+
+    /** 症状 */
+    @Excel(name = "症状")
+    private String symptom;
+
+    /** 诊断 */
+    @Excel(name = "诊断")
+    private String diagnose;
+
+    /** 检验 */
+    @Excel(name = "检验")
+    private String inspect;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Integer status;
+
+    public void setDiseaseId(Long diseaseId)
+    {
+        this.diseaseId = diseaseId;
+    }
+
+    public Long getDiseaseId()
+    {
+        return diseaseId;
+    }
+    public void setDiseaseName(String diseaseName)
+    {
+        this.diseaseName = diseaseName;
+    }
+
+    public String getDiseaseName()
+    {
+        return diseaseName;
+    }
+    public void setDiseaseCode(String diseaseCode)
+    {
+        this.diseaseCode = diseaseCode;
+    }
+
+    public String getDiseaseCode()
+    {
+        return diseaseCode;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+    public void setIntroduction(String introduction)
+    {
+        this.introduction = introduction;
+    }
+
+    public String getIntroduction()
+    {
+        return introduction;
+    }
+    public void setSymptom(String symptom)
+    {
+        this.symptom = symptom;
+    }
+
+    public String getSymptom()
+    {
+        return symptom;
+    }
+    public void setDiagnose(String diagnose)
+    {
+        this.diagnose = diagnose;
+    }
+
+    public String getDiagnose()
+    {
+        return diagnose;
+    }
+    public void setInspect(String inspect)
+    {
+        this.inspect = inspect;
+    }
+
+    public String getInspect()
+    {
+        return inspect;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("diseaseId", getDiseaseId())
+            .append("diseaseName", getDiseaseName())
+            .append("diseaseCode", getDiseaseCode())
+            .append("deptId", getDeptId())
+            .append("introduction", getIntroduction())
+            .append("symptom", getSymptom())
+            .append("diagnose", getDiagnose())
+            .append("inspect", getInspect())
+            .append("status", getStatus())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsDoctorArticleScrm.java

@@ -0,0 +1,177 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 医生文章对象 fs_doctor_article
+ *
+ * @author fs
+ * @date 2023-06-05
+ */
+@TableName("fs_doctor_article")
+public class FsDoctorArticleScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+
+    private Long articleId;
+
+    private Long doctorId;
+
+    /** 封面图 */
+    @NotNull(message = "封面图不能为空")
+    @Excel(name = "封面图")
+    private String imageUrl;
+
+    @Excel(name = "分类")
+    @NotNull(message = "分类不能为空")
+    private Integer cateId;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    @NotNull(message = "标题不能为空")
+    private String title;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 浏览量 */
+    @Excel(name = "浏览量")
+    private Long views;
+
+    /** 状态 0草稿 1发布 */
+    @Excel(name = "状态 0草稿 1发布")
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    private String videoUrl;
+
+    private String avatar;
+
+    @Excel(name = "视频类型：1-横屏视频；2-竖屏视频")
+    private Integer videoType;
+
+
+    public String getVideoUrl() {
+        return videoUrl;
+    }
+
+    public void setVideoUrl(String videoUrl) {
+        this.videoUrl = videoUrl;
+    }
+
+
+
+    public void setArticleId(Long articleId)
+    {
+        this.articleId = articleId;
+    }
+
+    public Long getArticleId()
+    {
+        return articleId;
+    }
+    public void setDoctorId(Long doctorId)
+    {
+        this.doctorId = doctorId;
+    }
+
+    public Long getDoctorId()
+    {
+        return doctorId;
+    }
+    public void setImageUrl(String imageUrl)
+    {
+        this.imageUrl = imageUrl;
+    }
+
+    public String getImageUrl()
+    {
+        return imageUrl;
+    }
+    public void setCateId(Integer cateId)
+    {
+        this.cateId = cateId;
+    }
+
+    public Integer getCateId()
+    {
+        return cateId;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setViews(Long views)
+    {
+        this.views = views;
+    }
+
+    public Long getViews()
+    {
+        return views;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
+    public Integer getVideoType() {
+        return videoType;
+    }
+
+    public void setVideoType(Integer videoType) {
+        this.videoType = videoType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("articleId", getArticleId())
+            .append("doctorId", getDoctorId())
+            .append("imageUrl", getImageUrl())
+            .append("cateId", getCateId())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("views", getViews())
+            .append("status", getStatus())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/store/domain/FsExpressScrm.java → fs-service/src/main/java/com/fs/hisStore/domain/FsExpressScrm.java

@@ -1,5 +1,6 @@
-package com.fs.store.domain;
+package com.fs.hisStore.domain;
 
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author fs
  * @date 2022-03-15
  */
+@TableName("fs_express")
 public class FsExpressScrm extends BaseEntity
 {
     private static final long serialVersionUID = 1L;

fs-service/src/main/java/com/fs/hisStore/domain/FsFamousPrescribeScrm.java

@@ -0,0 +1,72 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 经典名方对象 fs_famous_prescribe
+ *
+ * @author fs
+ * @date 2023-10-23
+ */
+@Data
+@TableName("fs_famous_prescribe")
+public class FsFamousPrescribeScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 经典名方名称 */
+    @Excel(name = "经典名方名称")
+    private String prescribeName;
+
+    @Excel(name = "功效概述")
+    private String actionTitle;
+
+    /** 图片URL */
+    @Excel(name = "图片")
+    private String imgUrl;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 方剂类型 */
+    @Excel(name = "方剂类型")
+    private Integer prescribeType;
+
+    /** 主治疾病 */
+    @Excel(name = "主治疾病")
+    private String indication;
+
+    /** 归属书籍（库） */
+    @Excel(name = "归属书籍", readConverterExp = "库=")
+    private String belongBook;
+
+    /** 基础信息 */
+    @Excel(name = "基础信息")
+    private String descs;
+
+    /** 主治功效 */
+    @Excel(name = "主治功效")
+    private String action;
+
+    /** 用法用量 */
+    @Excel(name = "用法用量")
+    private String usageMethod;
+
+    /** 注意事项 */
+    @Excel(name = "注意事项")
+    private String msg;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    @Excel(name = "拼音")
+    private String pinyin;
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsFollowScrm.java

@@ -0,0 +1,87 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 随访管理对象 fs_follow
+ *
+ * @author fs
+ * @date 2023-07-14
+ */
+@Data
+@TableName("fs_follow")
+public class FsFollowScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    @Excel(name = "id")
+    private Long followId;
+
+    /** 模板id */
+    @Excel(name = "模板id")
+    private Long tempId;
+
+    /** 病人id */
+    @Excel(name = "病人id")
+    private Long patientId;
+
+    /** 病人名称 */
+    @Excel(name = "病人名称")
+    private String patientName;
+
+    /** 病人电话 */
+    @Excel(name = "病人电话")
+    private String patientPhone;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 医生id */
+    @Excel(name = "医生id")
+    private Long doctorId;
+
+    /** 总次数 */
+    @Excel(name = "总次数")
+    private Integer totalNum;
+
+    /** 期次 */
+    @Excel(name = "期次")
+    private Integer num;
+
+    /** 0待推送 1已推送 2 已取消 */
+    @Excel(name = "0待推送 1已推送 2 已取消")
+    private Integer pushStatus;
+
+    /** 0未填写 1已填写 */
+    @Excel(name = "0未填写 1已填写")
+    private Integer writeStatus;
+
+    /** 推送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "推送时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date planTime;
+
+    /** 随访内容 */
+    @Excel(name = "随访内容")
+    private String formJson;
+
+    private Long inquiryOrderId;
+    private Long packageOrderId;
+
+
+    private Long companyId;
+    private Long companyUserId;
+    private Long deptId;
+    private String writeUserName;
+
+
+    private Long storeOrderId;
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsFollowTempScrm.java

@@ -0,0 +1,114 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 随访模板对象 fs_follow_temp
+ *
+ * @author fs
+ * @date 2023-07-14
+ */
+@TableName("fs_follow_temp")
+public class FsFollowTempScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 模板id */
+    @Excel(name = "模板id")
+    private Long tempId;
+
+    /** 模板名称 */
+    @Excel(name = "模板名称")
+    private String name;
+
+    /** 副标题 */
+    @Excel(name = "副标题")
+    private String secondName;
+
+    /** 模板内容 */
+    @Excel(name = "模板内容")
+    private String formJson;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer sort;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Integer status;
+
+    public void setTempId(Long tempId)
+    {
+        this.tempId = tempId;
+    }
+
+    public Long getTempId()
+    {
+        return tempId;
+    }
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+    public void setSecondName(String secondName)
+    {
+        this.secondName = secondName;
+    }
+
+    public String getSecondName()
+    {
+        return secondName;
+    }
+    public void setFormJson(String formJson)
+    {
+        this.formJson = formJson;
+    }
+
+    public String getFormJson()
+    {
+        return formJson;
+    }
+    public void setSort(Integer sort)
+    {
+        this.sort = sort;
+    }
+
+    public Integer getSort()
+    {
+        return sort;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("tempId", getTempId())
+            .append("name", getName())
+            .append("secondName", getSecondName())
+            .append("formJson", getFormJson())
+            .append("sort", getSort())
+            .append("status", getStatus())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsHomeArticleCategoryScrm.java

@@ -0,0 +1,56 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 期刊分类对象 fs_home_article_category
+ *
+ * @author fs
+ * @date 2025-05-21
+ */
+@Setter
+@Getter
+@TableName("fs_home_article_category")
+public class FsHomeArticleCategoryScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long categoryId;
+
+    /** 分类名称 */
+    @Excel(name = "分类名称")
+    private String categoryName;
+
+    @Excel(name = "封面图片")
+    private String imageUrl;
+
+    /** 状态，1-正常， 0-禁用 */
+    @Excel(name = "状态，1-正常， 0-禁用")
+    private Integer status;
+
+    /** 是否删除，1-是，0-否 */
+    @Excel(name = "是否删除，1-是，0-否")
+    private Integer isDel;
+
+    /** 排序号 */
+    @Excel(name = "排序号")
+    private Integer sort;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("categoryId", getCategoryId())
+            .append("categoryName", getCategoryName())
+            .append("status", getStatus())
+            .append("isDel", getIsDel())
+            .append("sort", getSort())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsHomeArticleScrm.java

@@ -0,0 +1,109 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 期刊对象 fs_home_article
+ *
+ * @author fs
+ * @date 2025-05-22
+ */
+@Setter
+@Getter
+@TableName("fs_home_article")
+public class FsHomeArticleScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "页码,默认为1")
+    private Integer pageNum = 1;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "页大小,默认为10")
+    private Integer pageSize = 10;
+
+    /** ID */
+    private Long articleId;
+
+    /** 分类ID */
+    @Excel(name = "分类ID")
+    private Long categoryId;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 封面图片 */
+    @Excel(name = "封面图片")
+    private String imageUrl;
+
+    /** 是否推荐 */
+    @Excel(name = "是否推荐")
+    private Integer isTui;
+
+    /** 视频地址 */
+    @Excel(name = "视频地址")
+    private String videoUrl;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 浏览数 */
+    @Excel(name = "浏览数")
+    private Integer views;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Integer sort;
+
+    /** 发布时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @TableField(strategy= FieldStrategy.IGNORED)
+    private Date publishTime;
+
+    /** 发布状态：1-已发布；2-草稿 */
+    @Excel(name = "发布状态：1-已发布；2-草稿")
+    private Integer publicStatus;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String description;
+
+    @TableField(exist = false)
+    @Excel(name = "分类名称")
+    private String categoryName;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("articleId", getArticleId())
+            .append("categoryId", getCategoryId())
+            .append("title", getTitle())
+            .append("imageUrl", getImageUrl())
+            .append("isTui", getIsTui())
+            .append("videoUrl", getVideoUrl())
+            .append("content", getContent())
+            .append("views", getViews())
+            .append("sort", getSort())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("publishTime", getPublishTime())
+            .append("publicStatus", getPublicStatus())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsHomeArticleViewScrm.java

@@ -0,0 +1,64 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 期刊阅读对象 fs_home_article_view
+ *
+ * @author fs
+ * @date 2025-05-21
+ */
+@Setter
+@Getter
+@TableName("fs_home_article_view")
+public class FsHomeArticleViewScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "页码,默认为1")
+    private Integer pageNum = 1;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "页大小,默认为10")
+    private Integer pageSize = 10;
+
+    /** ID */
+    private Long viewId;
+
+    /** 文章ID */
+    @Excel(name = "文章ID")
+    private Long articleId;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    @TableField(exist = false)
+    private String title;
+
+    @TableField(exist = false)
+    private String nickname;
+
+    @TableField(exist = false)
+    private String phone;
+
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("viewId", getViewId())
+            .append("articleId", getArticleId())
+            .append("userId", getUserId())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsIllnessLibraryScrm.java

@@ -0,0 +1,123 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 中医疾病对象 fs_illness_library
+ *
+ * @author fs
+ * @date 2023-09-04
+ */
+@TableName("fs_illness_library")
+public class FsIllnessLibraryScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 疾病id */
+    private Long illnessId;
+
+    /** 疾病名称 */
+    @Excel(name = "疾病名称")
+    private String illnessName;
+
+    /** 症状 */
+    @Excel(name = "症状")
+    private String symptom;
+
+    /** 舌脉 */
+    @Excel(name = "舌脉")
+    private String tongueVein;
+
+    /** 治法 */
+    @Excel(name = "治法")
+    private String therapy;
+
+    /** 方剂名称 */
+    @Excel(name = "方剂名称")
+    private String formulaName;
+
+    /** 方剂详情 */
+    @Excel(name = "方剂详情")
+    private String formulaDescs;
+
+    public void setIllnessId(Long illnessId)
+    {
+        this.illnessId = illnessId;
+    }
+
+    public Long getIllnessId()
+    {
+        return illnessId;
+    }
+    public void setIllnessName(String illnessName)
+    {
+        this.illnessName = illnessName;
+    }
+
+    public String getIllnessName()
+    {
+        return illnessName;
+    }
+    public void setSymptom(String symptom)
+    {
+        this.symptom = symptom;
+    }
+
+    public String getSymptom()
+    {
+        return symptom;
+    }
+    public void setTongueVein(String tongueVein)
+    {
+        this.tongueVein = tongueVein;
+    }
+
+    public String getTongueVein()
+    {
+        return tongueVein;
+    }
+    public void setTherapy(String therapy)
+    {
+        this.therapy = therapy;
+    }
+
+    public String getTherapy()
+    {
+        return therapy;
+    }
+    public void setFormulaName(String formulaName)
+    {
+        this.formulaName = formulaName;
+    }
+
+    public String getFormulaName()
+    {
+        return formulaName;
+    }
+    public void setFormulaDescs(String formulaDescs)
+    {
+        this.formulaDescs = formulaDescs;
+    }
+
+    public String getFormulaDescs()
+    {
+        return formulaDescs;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("illnessId", getIllnessId())
+            .append("illnessName", getIllnessName())
+            .append("symptom", getSymptom())
+            .append("tongueVein", getTongueVein())
+            .append("therapy", getTherapy())
+            .append("formulaName", getFormulaName())
+            .append("formulaDescs", getFormulaDescs())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsIntegralGoodsScrm.java

@@ -0,0 +1,67 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 积分商品对象 fs_integral_goods
+ *
+ * @author fs
+ * @date 2023-11-02
+ */
+@Data
+@TableName("fs_integral_goods")
+public class FsIntegralGoodsScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long goodsId;
+
+    /** 封面图 */
+    @Excel(name = "封面图")
+    private String imgUrl;
+
+    /** 组图 */
+    @Excel(name = "组图")
+    private String images;
+
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    private String goodsName;
+
+    /** 原价 */
+    @Excel(name = "原价")
+    private BigDecimal otPrice;
+
+    /** 商品分类 */
+    @Excel(name = "商品分类")
+    private Long goodsType;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 所需积分 */
+    @Excel(name = "所需积分")
+    private Long integral;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 库存 */
+    @Excel(name = "库存")
+    private Long stock;
+
+    /** 详情 */
+    @Excel(name = "详情")
+    private String descs;
+
+    @Excel(name = "产品编码")
+    private String barCode;
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsIntegralOrderScrm.java

@@ -0,0 +1,77 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 积分商品订单对象 fs_integral_order
+ *
+ * @author fs
+ * @date 2023-11-02
+ */
+@Data
+@TableName("fs_integral_order")
+public class FsIntegralOrderScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long orderId;
+
+    /** 订单编号 */
+    @Excel(name = "订单编号")
+    private String orderCode;
+
+    /** 用户id */
+
+    private Long userId;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 用户电话 */
+    @Excel(name = "用户电话")
+    private String userPhone;
+
+    /** 用户地址 */
+    @Excel(name = "用户地址")
+    private String userAddress;
+
+    /** 商品信息 */
+    @Excel(name = "商品信息")
+    private String itemJson;
+
+    /** 支付积分 */
+    @Excel(name = "支付积分")
+    private String integral;
+
+    /** 1：待发货；2：待收货；3：已完成 */
+    @Excel(name = "状态",dictType="sys_integral_order_status")
+    private Integer status;
+    @Excel(name = "商品编号")
+    private String barCode;
+    /** 快递公司编号 */
+    @Excel(name = "快递公司编号")
+    private String deliveryCode;
+
+    /** 快递名称 */
+    @Excel(name = "快递名称")
+    private String deliveryName;
+
+    /** 快递单号 */
+    @Excel(name = "快递单号")
+    private String deliverySn;
+
+    /** 发货时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date deliveryTime;
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsLevelScrm.java

@@ -0,0 +1,211 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 设置用户等级对象 fs_level
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@TableName("fs_level")
+public class FsLevelScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 会员名称 */
+    @Excel(name = "会员名称")
+    private String name;
+
+    /** 购买金额 */
+    @Excel(name = "购买金额")
+    private BigDecimal money;
+
+    /** 有效时间 */
+    @Excel(name = "有效时间")
+    private Long validDate;
+
+    /** 是否为永久会员 */
+    @Excel(name = "是否为永久会员")
+    private Integer isForever;
+
+    /** 是否购买,1=购买,0=不购买 */
+    @Excel(name = "是否购买,1=购买,0=不购买")
+    private Integer isPay;
+
+    /** 是否显示 1=显示,0=隐藏 */
+    @Excel(name = "是否显示 1=显示,0=隐藏")
+    private Integer isShow;
+
+    /** 会员等级 */
+    @Excel(name = "会员等级")
+    private Long grade;
+
+    /** 享受折扣 */
+    @Excel(name = "享受折扣")
+    private BigDecimal discount;
+
+    /** 会员卡背景 */
+    @Excel(name = "会员卡背景")
+    private String image;
+
+    /** 会员图标 */
+    @Excel(name = "会员图标")
+    private String icon;
+
+    /** 说明 */
+    @Excel(name = "说明")
+    private String explain;
+
+    /** 是否删除.1=删除,0=未删除 */
+    @Excel(name = "是否删除.1=删除,0=未删除")
+    private Integer isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setMoney(BigDecimal money) 
+    {
+        this.money = money;
+    }
+
+    public BigDecimal getMoney() 
+    {
+        return money;
+    }
+    public void setValidDate(Long validDate) 
+    {
+        this.validDate = validDate;
+    }
+
+    public Long getValidDate() 
+    {
+        return validDate;
+    }
+    public void setIsForever(Integer isForever) 
+    {
+        this.isForever = isForever;
+    }
+
+    public Integer getIsForever() 
+    {
+        return isForever;
+    }
+    public void setIsPay(Integer isPay) 
+    {
+        this.isPay = isPay;
+    }
+
+    public Integer getIsPay() 
+    {
+        return isPay;
+    }
+    public void setIsShow(Integer isShow) 
+    {
+        this.isShow = isShow;
+    }
+
+    public Integer getIsShow() 
+    {
+        return isShow;
+    }
+    public void setGrade(Long grade) 
+    {
+        this.grade = grade;
+    }
+
+    public Long getGrade() 
+    {
+        return grade;
+    }
+    public void setDiscount(BigDecimal discount) 
+    {
+        this.discount = discount;
+    }
+
+    public BigDecimal getDiscount() 
+    {
+        return discount;
+    }
+    public void setImage(String image) 
+    {
+        this.image = image;
+    }
+
+    public String getImage() 
+    {
+        return image;
+    }
+    public void setIcon(String icon) 
+    {
+        this.icon = icon;
+    }
+
+    public String getIcon() 
+    {
+        return icon;
+    }
+    public void setExplain(String explain) 
+    {
+        this.explain = explain;
+    }
+
+    public String getExplain() 
+    {
+        return explain;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("name", getName())
+            .append("money", getMoney())
+            .append("validDate", getValidDate())
+            .append("isForever", getIsForever())
+            .append("isPay", getIsPay())
+            .append("isShow", getIsShow())
+            .append("grade", getGrade())
+            .append("discount", getDiscount())
+            .append("image", getImage())
+            .append("icon", getIcon())
+            .append("explain", getExplain())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsMaterialGroupScrm.java

@@ -0,0 +1,83 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 素材分组对象 fs_material_group
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@TableName("fs_material_group")
+public class FsMaterialGroupScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** PK */
+    private Long groupId;
+
+    /** 分组名 */
+    @Excel(name = "分组名")
+    private String name;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long createUserId;
+
+    /** $column.columnComment */
+    @Excel(name = "创建者ID")
+    private Integer isDel;
+
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setCreateUserId(Long createUserId) 
+    {
+        this.createUserId = createUserId;
+    }
+
+    public Long getCreateUserId() 
+    {
+        return createUserId;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("groupId", getGroupId())
+            .append("name", getName())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("createUserId", getCreateUserId())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsMaterialScrm.java

@@ -0,0 +1,125 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 素材库对象 fs_material
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@TableName("fs_material")
+public class FsMaterialScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long materialId;
+
+    /** 类型1、图片；2、视频 */
+    @Excel(name = "类型1、图片；2、视频")
+    private String type;
+
+    /** 分组ID */
+    @Excel(name = "分组ID")
+    private Long groupId;
+
+    /** 素材名 */
+    @Excel(name = "素材名")
+    private String name;
+
+    /** 素材链接 */
+    @Excel(name = "素材链接")
+    private String url;
+
+    /** $column.columnComment */
+    @Excel(name = "素材链接")
+    private Integer isDel;
+
+    /** 创建者ID */
+    @Excel(name = "创建者ID")
+    private Long createUserId;
+
+    public void setMaterialId(Long materialId) 
+    {
+        this.materialId = materialId;
+    }
+
+    public Long getMaterialId() 
+    {
+        return materialId;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setGroupId(Long groupId) 
+    {
+        this.groupId = groupId;
+    }
+
+    public Long getGroupId() 
+    {
+        return groupId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setUrl(String url) 
+    {
+        this.url = url;
+    }
+
+    public String getUrl() 
+    {
+        return url;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+    public void setCreateUserId(Long createUserId) 
+    {
+        this.createUserId = createUserId;
+    }
+
+    public Long getCreateUserId() 
+    {
+        return createUserId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("materialId", getMaterialId())
+            .append("type", getType())
+            .append("groupId", getGroupId())
+            .append("name", getName())
+            .append("url", getUrl())
+            .append("isDel", getIsDel())
+            .append("createUserId", getCreateUserId())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsMedicatedFoodScrm.java

@@ -0,0 +1,61 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 药膳食疗对象 fs_medicated_food
+ *
+ * @author fs
+ * @date 2023-10-23
+ */
+@Data
+@TableName("fs_medicated_food")
+public class FsMedicatedFoodScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 药膳名称 */
+    @Excel(name = "药膳名称")
+    private String foodName;
+
+    @Excel(name = "功效概述")
+    private String actionTitle;
+
+    /** 图片 */
+    @Excel(name = "图片")
+    private String imgUrl;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 功效 */
+    @Excel(name = "功效")
+    private String action;
+
+    /** 食材 */
+    @Excel(name = "食材")
+    private String food;
+
+    /** 主治疾病 */
+    @Excel(name = "疾病")
+    private String indications;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String descs;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    @Excel(name = "拼音")
+    private String pinyin;
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsMenuScrm.java

@@ -0,0 +1,37 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 用户端菜单管理对象 fs_menu
+ *
+ * @author fs
+ * @date 2022-03-15
+ */
+@Data
+@TableName("fs_menu")
+public class FsMenuScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long menuId;
+
+    private String menuName;
+
+    private String icon;
+
+    private Integer isShow;
+
+    private Integer linkType;
+
+    private String linkUrl;
+
+    private Integer sort;
+
+    private Integer menuType;//菜单类型
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsPatientScrm.java

@@ -0,0 +1,155 @@
+package com.fs.hisStore.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 病人对象 fs_patient
+ * 
+ * @author fs
+ * @date 2022-03-23
+ */
+@TableName("fs_patient")
+public class FsPatientScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long patientId;
+
+    /** 患者姓名 */
+    @Excel(name = "患者姓名")
+    private String patientName;
+
+    /** 所属会员 */
+    @Excel(name = "所属会员")
+    private Long userId;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 出生年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthday;
+
+    /** 性别 */
+    @Excel(name = "性别")
+    private Integer gender;
+
+    /** 状态 1正常 2禁用 */
+    @Excel(name = "状态 1正常 2禁用")
+    private Integer status;
+
+    /** 是否删除  */
+    @Excel(name = "是否删除 ")
+    private Integer isDel;
+
+    /** 病人关系 1自己 2父母 3子女 4爱人 5其他 */
+    @Excel(name = "病人关系 1自己 2父母 3子女 4爱人 5其他")
+    private Integer patientRelation;
+
+    public void setPatientId(Long patientId) 
+    {
+        this.patientId = patientId;
+    }
+
+    public Long getPatientId() 
+    {
+        return patientId;
+    }
+    public void setPatientName(String patientName) 
+    {
+        this.patientName = patientName;
+    }
+
+    public String getPatientName() 
+    {
+        return patientName;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setIdCard(String idCard) 
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard() 
+    {
+        return idCard;
+    }
+    public void setBirthday(Date birthday) 
+    {
+        this.birthday = birthday;
+    }
+
+    public Date getBirthday() 
+    {
+        return birthday;
+    }
+    public void setGender(Integer gender) 
+    {
+        this.gender = gender;
+    }
+
+    public Integer getGender() 
+    {
+        return gender;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+    public void setPatientRelation(Integer patientRelation) 
+    {
+        this.patientRelation = patientRelation;
+    }
+
+    public Integer getPatientRelation() 
+    {
+        return patientRelation;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("patientId", getPatientId())
+            .append("patientName", getPatientName())
+            .append("userId", getUserId())
+            .append("idCard", getIdCard())
+            .append("birthday", getBirthday())
+            .append("gender", getGender())
+            .append("status", getStatus())
+            .append("isDel", getIsDel())
+            .append("patientRelation", getPatientRelation())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsPayConfigScrm.java

@@ -0,0 +1,28 @@
+package com.fs.hisStore.domain;
+
+import lombok.Data;
+
+@Data
+public class FsPayConfigScrm {
+    private String ybAccount;
+    private String ybKey;
+    private String type;
+    private String appId;
+    private String ybNotifyUrl;
+    private String tzPayDecrypt;
+    private String tzRefundDecrypt;
+    private String tzOrderShareDecrypt;
+
+    private String wxMchId;
+    private String wxMchKey;
+
+    private String hfProductId;
+    private String hfSysId;
+    private String huifuId;
+    private String hfRsaPrivateKey;
+    private String hfRsaPublicKey;
+    private String hfPayNotifyUrl;
+    private String hfPayOnlineNotifyUrl;
+    private String hfRefundNotifyUrl;
+    private String hfOnlineRefundNotifyUrl;
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsPrescribeDrugScrm.java

@@ -0,0 +1,221 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 处方药品对象 fs_prescribe_drug
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@TableName("fs_prescribe_drug")
+public class FsPrescribeDrugScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long drugId;
+
+    /** $column.columnComment */
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private Long prescribeId;
+
+    /** 药品名称 */
+    @Excel(name = "药品名称")
+    private String drugCommonName;
+
+    /** 规格 */
+    @Excel(name = "规格")
+    private String drugSpecification;
+
+    /** 使⽤⽅法 */
+    @Excel(name = "使⽤⽅法")
+    private String usageMethod;
+
+    /** 药品频次 */
+    @Excel(name = "药品频次")
+    private String usageFrequencyUnit;
+
+    /** 每次⽤药数量 */
+    @Excel(name = "每次⽤药数量")
+    private String usagePerUseCount;
+
+    /** 每次⽤药单位 */
+    @Excel(name = "每次⽤药单位")
+    private String usagePerUseUnit;
+
+    /** 天数 */
+    @Excel(name = "天数")
+    private String usageDays;
+
+    /** 药品数量 */
+    @Excel(name = "药品数量")
+    private String saleAmount;
+
+    /** 药品数量单位 */
+    @Excel(name = "药品数量单位")
+    private String saleUnit;
+
+    /** 药品说明书 */
+    @Excel(name = "药品说明书")
+    private String instructions;
+
+    /** $column.columnComment */
+    @Excel(name = "药品说明书")
+    private String approvalNumber;
+
+    /** 产品ID */
+    @Excel(name = "产品ID")
+    private Integer productId;
+
+    public void setDrugId(Long drugId) 
+    {
+        this.drugId = drugId;
+    }
+
+    public Long getDrugId() 
+    {
+        return drugId;
+    }
+    public void setPrescribeId(Long prescribeId) 
+    {
+        this.prescribeId = prescribeId;
+    }
+
+    public Long getPrescribeId() 
+    {
+        return prescribeId;
+    }
+    public void setDrugCommonName(String drugCommonName) 
+    {
+        this.drugCommonName = drugCommonName;
+    }
+
+    public String getDrugCommonName() 
+    {
+        return drugCommonName;
+    }
+    public void setDrugSpecification(String drugSpecification) 
+    {
+        this.drugSpecification = drugSpecification;
+    }
+
+    public String getDrugSpecification() 
+    {
+        return drugSpecification;
+    }
+    public void setUsageMethod(String usageMethod) 
+    {
+        this.usageMethod = usageMethod;
+    }
+
+    public String getUsageMethod() 
+    {
+        return usageMethod;
+    }
+    public void setUsageFrequencyUnit(String usageFrequencyUnit) 
+    {
+        this.usageFrequencyUnit = usageFrequencyUnit;
+    }
+
+    public String getUsageFrequencyUnit() 
+    {
+        return usageFrequencyUnit;
+    }
+    public void setUsagePerUseCount(String usagePerUseCount) 
+    {
+        this.usagePerUseCount = usagePerUseCount;
+    }
+
+    public String getUsagePerUseCount() 
+    {
+        return usagePerUseCount;
+    }
+    public void setUsagePerUseUnit(String usagePerUseUnit) 
+    {
+        this.usagePerUseUnit = usagePerUseUnit;
+    }
+
+    public String getUsagePerUseUnit() 
+    {
+        return usagePerUseUnit;
+    }
+    public void setUsageDays(String usageDays) 
+    {
+        this.usageDays = usageDays;
+    }
+
+    public String getUsageDays() 
+    {
+        return usageDays;
+    }
+    public void setSaleAmount(String saleAmount) 
+    {
+        this.saleAmount = saleAmount;
+    }
+
+    public String getSaleAmount() 
+    {
+        return saleAmount;
+    }
+    public void setSaleUnit(String saleUnit) 
+    {
+        this.saleUnit = saleUnit;
+    }
+
+    public String getSaleUnit() 
+    {
+        return saleUnit;
+    }
+    public void setInstructions(String instructions) 
+    {
+        this.instructions = instructions;
+    }
+
+    public String getInstructions() 
+    {
+        return instructions;
+    }
+    public void setApprovalNumber(String approvalNumber) 
+    {
+        this.approvalNumber = approvalNumber;
+    }
+
+    public String getApprovalNumber() 
+    {
+        return approvalNumber;
+    }
+    public void setProductId(Integer productId) 
+    {
+        this.productId = productId;
+    }
+
+    public Integer getProductId() 
+    {
+        return productId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("drugId", getDrugId())
+            .append("prescribeId", getPrescribeId())
+            .append("drugCommonName", getDrugCommonName())
+            .append("drugSpecification", getDrugSpecification())
+            .append("usageMethod", getUsageMethod())
+            .append("usageFrequencyUnit", getUsageFrequencyUnit())
+            .append("usagePerUseCount", getUsagePerUseCount())
+            .append("usagePerUseUnit", getUsagePerUseUnit())
+            .append("usageDays", getUsageDays())
+            .append("saleAmount", getSaleAmount())
+            .append("saleUnit", getSaleUnit())
+            .append("instructions", getInstructions())
+            .append("approvalNumber", getApprovalNumber())
+            .append("productId", getProductId())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsPrescribeScrm.java

@@ -0,0 +1,445 @@
+package com.fs.hisStore.domain;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 处方对象 fs_prescribe
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@Data
+@TableName("fs_prescribe")
+public class FsPrescribeScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long prescribeId;
+
+    /** 处方类型 1订单 2问诊 */
+    @Excel(name = "处方类型 1订单 2问诊")
+    private Integer prescribeType;
+
+    /** 订单ID */
+    @Excel(name = "订单ID")
+    private Long orderId;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    /** 患者ID */
+    @Excel(name = "患者ID")
+    private Long patientId;
+
+    /** 处⽅单ID（唯⼀ID） */
+    @Excel(name = "处⽅单ID", readConverterExp = "唯=⼀ID")
+    private String rpId;
+
+    /** 门店标识 */
+    @Excel(name = "门店标识")
+    private String pharmacyCode;
+
+    /** ⻔店名称 */
+    @Excel(name = "⻔店名称")
+    private String pharmacyName;
+
+    /** 病情描述(主诉） */
+    @Excel(name = "病情描述(主诉）")
+    private String chiefComplaint;
+
+    /** 现病史 */
+    @Excel(name = "现病史")
+    private String nowIllness;
+
+    /** 既往史 */
+    @Excel(name = "既往史")
+    private String historyIllness;
+
+    /** 患者年龄 */
+    @Excel(name = "患者年龄")
+    private String patientAge;
+
+    /** 患者姓名 */
+    @Excel(name = "患者姓名")
+    private String patientName;
+
+    /** 体重 */
+    @Excel(name = "体重")
+    private String weight;
+
+    /** 是否有过敏史（传值：是/否） */
+    @Excel(name = "是否有过敏史", readConverterExp = "传=值：是/否")
+    private String isHistoryAllergic;
+
+    /** 过敏史 */
+    @Excel(name = "过敏史")
+    private String historyAllergic;
+
+    /** 肝功能是否异常（传值：是/否） */
+    @Excel(name = "肝功能是否异常", readConverterExp = "传=值：是/否")
+    private String liverUnusual;
+
+    /** 肾功能是否异常（传值：是/否） */
+    @Excel(name = "肾功能是否异常", readConverterExp = "传=值：是/否")
+    private String renalUnusual;
+
+    /** 是否是备孕/怀孕/哺乳期（传值：是 */
+    @Excel(name = "是否是备孕/怀孕/哺乳期", readConverterExp = "是否是备孕/怀孕/哺乳期（传值：是")
+    private String lactationFlag;
+
+    /** 患者电话 */
+    @Excel(name = "患者电话")
+    private String patientTel;
+
+    /** 患者性别(传数字，1男 2⼥) */
+    @Excel(name = "患者性别(传数字，1男 2⼥)")
+    private String patientGender;
+
+    /** 复诊凭证 */
+    @Excel(name = "复诊凭证")
+    private String recordPic;
+
+    /** 处方图片地址 */
+    @Excel(name = "处方图片地址")
+    private String rpUrl;
+
+    /** 处⽅开具时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "处⽅开具时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date rpCreateTime;
+    @Excel(name = "拒绝原因")
+    private String auditReason;
+
+
+    /** 诊断 */
+    @Excel(name = "诊断")
+    private String diagnose;
+
+    /** 药品列表 JSON */
+    @Excel(name = "药品列表 JSON")
+    private String drugs;
+
+    /** 医生名称 */
+    @Excel(name = "医生名称")
+    private String doctorName;
+
+    /** 科室名称 */
+    @Excel(name = "科室名称")
+    private String doctorId;
+
+    private Integer status;
+
+    public String getAuditReason() {
+        return auditReason;
+    }
+
+    public void setAuditReason(String auditReason) {
+        this.auditReason = auditReason;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setPrescribeId(Long prescribeId)
+    {
+        this.prescribeId = prescribeId;
+    }
+
+    public Long getPrescribeId() 
+    {
+        return prescribeId;
+    }
+    public void setPrescribeType(Integer prescribeType) 
+    {
+        this.prescribeType = prescribeType;
+    }
+
+    public Integer getPrescribeType() 
+    {
+        return prescribeType;
+    }
+    public void setOrderId(Long orderId) 
+    {
+        this.orderId = orderId;
+    }
+
+    public Long getOrderId() 
+    {
+        return orderId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setPatientId(Long patientId) 
+    {
+        this.patientId = patientId;
+    }
+
+    public Long getPatientId() 
+    {
+        return patientId;
+    }
+    public void setRpId(String rpId) 
+    {
+        this.rpId = rpId;
+    }
+
+    public String getRpId() 
+    {
+        return rpId;
+    }
+    public void setPharmacyCode(String pharmacyCode) 
+    {
+        this.pharmacyCode = pharmacyCode;
+    }
+
+    public String getPharmacyCode() 
+    {
+        return pharmacyCode;
+    }
+    public void setPharmacyName(String pharmacyName) 
+    {
+        this.pharmacyName = pharmacyName;
+    }
+
+    public String getPharmacyName() 
+    {
+        return pharmacyName;
+    }
+    public void setChiefComplaint(String chiefComplaint) 
+    {
+        this.chiefComplaint = chiefComplaint;
+    }
+
+    public String getChiefComplaint() 
+    {
+        return chiefComplaint;
+    }
+    public void setNowIllness(String nowIllness) 
+    {
+        this.nowIllness = nowIllness;
+    }
+
+    public String getNowIllness() 
+    {
+        return nowIllness;
+    }
+    public void setHistoryIllness(String historyIllness) 
+    {
+        this.historyIllness = historyIllness;
+    }
+
+    public String getHistoryIllness() 
+    {
+        return historyIllness;
+    }
+    public void setPatientAge(String patientAge) 
+    {
+        this.patientAge = patientAge;
+    }
+
+    public String getPatientAge() 
+    {
+        return patientAge;
+    }
+    public void setPatientName(String patientName) 
+    {
+        this.patientName = patientName;
+    }
+
+    public String getPatientName() 
+    {
+        return patientName;
+    }
+    public void setWeight(String weight) 
+    {
+        this.weight = weight;
+    }
+
+    public String getWeight() 
+    {
+        return weight;
+    }
+    public void setIsHistoryAllergic(String isHistoryAllergic) 
+    {
+        this.isHistoryAllergic = isHistoryAllergic;
+    }
+
+    public String getIsHistoryAllergic() 
+    {
+        return isHistoryAllergic;
+    }
+    public void setHistoryAllergic(String historyAllergic) 
+    {
+        this.historyAllergic = historyAllergic;
+    }
+
+    public String getHistoryAllergic() 
+    {
+        return historyAllergic;
+    }
+    public void setLiverUnusual(String liverUnusual) 
+    {
+        this.liverUnusual = liverUnusual;
+    }
+
+    public String getLiverUnusual() 
+    {
+        return liverUnusual;
+    }
+    public void setRenalUnusual(String renalUnusual) 
+    {
+        this.renalUnusual = renalUnusual;
+    }
+
+    public String getRenalUnusual() 
+    {
+        return renalUnusual;
+    }
+    public void setLactationFlag(String lactationFlag) 
+    {
+        this.lactationFlag = lactationFlag;
+    }
+
+    public String getLactationFlag() 
+    {
+        return lactationFlag;
+    }
+    public void setPatientTel(String patientTel) 
+    {
+        this.patientTel = patientTel;
+    }
+
+    public String getPatientTel() 
+    {
+        return patientTel;
+    }
+    public void setPatientGender(String patientGender) 
+    {
+        this.patientGender = patientGender;
+    }
+
+    public String getPatientGender() 
+    {
+        return patientGender;
+    }
+    public void setRecordPic(String recordPic) 
+    {
+        this.recordPic = recordPic;
+    }
+
+    public String getRecordPic() 
+    {
+        return recordPic;
+    }
+    public void setRpUrl(String rpUrl) 
+    {
+        this.rpUrl = rpUrl;
+    }
+
+    public String getRpUrl() 
+    {
+        return rpUrl;
+    }
+    public void setRpCreateTime(Date rpCreateTime) 
+    {
+        this.rpCreateTime = rpCreateTime;
+    }
+
+    public Date getRpCreateTime() 
+    {
+        return rpCreateTime;
+    }
+    public void setDiagnose(String diagnose) 
+    {
+        this.diagnose = diagnose;
+    }
+
+    public String getDiagnose() 
+    {
+        return diagnose;
+    }
+    public void setDrugs(String drugs) 
+    {
+        this.drugs = drugs;
+    }
+
+    public String getDrugs() 
+    {
+        return drugs;
+    }
+    public void setDoctorName(String doctorName) 
+    {
+        this.doctorName = doctorName;
+    }
+
+    public String getDoctorName() 
+    {
+        return doctorName;
+    }
+    public void setDoctorId(String doctorId) 
+    {
+        this.doctorId = doctorId;
+    }
+
+    public String getDoctorId() 
+    {
+        return doctorId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("prescribeId", getPrescribeId())
+            .append("prescribeType", getPrescribeType())
+            .append("orderId", getOrderId())
+            .append("userId", getUserId())
+            .append("patientId", getPatientId())
+            .append("rpId", getRpId())
+            .append("pharmacyCode", getPharmacyCode())
+            .append("pharmacyName", getPharmacyName())
+            .append("chiefComplaint", getChiefComplaint())
+            .append("nowIllness", getNowIllness())
+            .append("historyIllness", getHistoryIllness())
+            .append("patientAge", getPatientAge())
+            .append("patientName", getPatientName())
+            .append("weight", getWeight())
+            .append("isHistoryAllergic", getIsHistoryAllergic())
+            .append("historyAllergic", getHistoryAllergic())
+            .append("liverUnusual", getLiverUnusual())
+            .append("renalUnusual", getRenalUnusual())
+            .append("lactationFlag", getLactationFlag())
+            .append("patientTel", getPatientTel())
+            .append("patientGender", getPatientGender())
+            .append("recordPic", getRecordPic())
+            .append("rpUrl", getRpUrl())
+            .append("rpCreateTime", getRpCreateTime())
+            .append("diagnose", getDiagnose())
+            .append("drugs", getDrugs())
+            .append("doctorName", getDoctorName())
+            .append("doctorId", getDoctorId())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsQuestionsScrm.java

@@ -0,0 +1,49 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 问答专区对象 fs_questions
+ *
+ * @author fs
+ * @date 2023-10-23
+ */
+@Data
+@TableName("fs_questions")
+public class FsQuestionsScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 题目ID */
+    private Long id;
+
+    /** 题目 */
+    @Excel(name = "题目")
+    private String title;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 答案 */
+    @Excel(name = "答案")
+    private String answers;
+
+    /** 词条 */
+    @Excel(name = "词条")
+    private String tags;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+    @Excel(name = "浏览量")
+    private Integer views;
+    @Excel(name = "类别")
+    private Integer questionsType;
+    @Excel(name = "科室id")
+    private Integer deptId;
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsShippingTemplatesFreeScrm.java

@@ -0,0 +1,116 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+/**
+ * 免邮费对象 fs_shipping_templates_free
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@Data
+@TableName("fs_shipping_templates_free")
+public class FsShippingTemplatesFreeScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 模板ID */
+    @Excel(name = "模板ID")
+    private Long tempId;
+
+    /** 省ID */
+    @Excel(name = "省ID")
+    private Long provinceId;
+
+    /** 城市ID */
+    @Excel(name = "城市ID")
+    private Long cityId;
+
+    /** 包邮件数 */
+    @Excel(name = "包邮件数")
+    private BigDecimal number;
+
+    /** 包邮金额 */
+    @Excel(name = "包邮金额")
+    private BigDecimal price;
+
+    /** 计费方式 */
+    @Excel(name = "计费方式")
+    private Integer type;
+
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTempId(Long tempId) 
+    {
+        this.tempId = tempId;
+    }
+
+    public Long getTempId() 
+    {
+        return tempId;
+    }
+    public void setProvinceId(Long provinceId) 
+    {
+        this.provinceId = provinceId;
+    }
+
+    public Long getProvinceId() 
+    {
+        return provinceId;
+    }
+    public void setCityId(Long cityId) 
+    {
+        this.cityId = cityId;
+    }
+
+    public Long getCityId() 
+    {
+        return cityId;
+    }
+    public void setNumber(BigDecimal number) 
+    {
+        this.number = number;
+    }
+
+    public BigDecimal getNumber() 
+    {
+        return number;
+    }
+    public void setPrice(BigDecimal price) 
+    {
+        this.price = price;
+    }
+
+    public BigDecimal getPrice() 
+    {
+        return price;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsShippingTemplatesRegionScrm.java

@@ -0,0 +1,141 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Builder;
+import lombok.Data;
+
+@Builder
+/**
+ * 邮费区域对象 fs_shipping_templates_region
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@TableName("fs_shipping_templates_region")
+public class FsShippingTemplatesRegionScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private Long id;
+
+    /** 省ID */
+    @Excel(name = "省ID")
+    private Long provinceId;
+
+    /** 模板ID */
+    @Excel(name = "模板ID")
+    private Long tempId;
+
+    /** 城市ID */
+    @Excel(name = "城市ID")
+    private Long cityId;
+
+    /** 首件 */
+    @Excel(name = "首件")
+    private BigDecimal first;
+
+    /** 首件运费 */
+    @Excel(name = "首件运费")
+    private BigDecimal firstPrice;
+
+    /** 续件 */
+    @Excel(name = "续件")
+    private BigDecimal continues;
+
+    /** 续件运费 */
+    @Excel(name = "续件运费")
+    private BigDecimal continuePrice;
+
+    /** 计费方式 */
+    @Excel(name = "计费方式")
+    private Integer type;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProvinceId(Long provinceId) 
+    {
+        this.provinceId = provinceId;
+    }
+
+    public Long getProvinceId() 
+    {
+        return provinceId;
+    }
+    public void setTempId(Long tempId) 
+    {
+        this.tempId = tempId;
+    }
+
+    public Long getTempId() 
+    {
+        return tempId;
+    }
+    public void setCityId(Long cityId) 
+    {
+        this.cityId = cityId;
+    }
+
+    public Long getCityId() 
+    {
+        return cityId;
+    }
+    public void setFirst(BigDecimal first) 
+    {
+        this.first = first;
+    }
+
+    public BigDecimal getFirst() 
+    {
+        return first;
+    }
+    public void setFirstPrice(BigDecimal firstPrice) 
+    {
+        this.firstPrice = firstPrice;
+    }
+
+    public BigDecimal getFirstPrice() 
+    {
+        return firstPrice;
+    }
+    public void setContinues(BigDecimal continues) 
+    {
+        this.continues = continues;
+    }
+
+    public BigDecimal getContinues() 
+    {
+        return continues;
+    }
+    public void setContinuePrice(BigDecimal continuePrice) 
+    {
+        this.continuePrice = continuePrice;
+    }
+
+    public BigDecimal getContinuePrice() 
+    {
+        return continuePrice;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsShippingTemplatesScrm.java

@@ -0,0 +1,122 @@
+package com.fs.hisStore.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+
+/**
+ * 运费模板对象 fs_shipping_templates
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+@TableName("fs_shipping_templates")
+public class FsShippingTemplatesScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 模板ID */
+    private Long id;
+
+    /** 模板名称 */
+    @Excel(name = "模板名称")
+    private String name;
+
+    /** 计费方式 */
+    @Excel(name = "计费方式")
+    private Integer type;
+
+    /** 地域以及费用 */
+    @Excel(name = "地域以及费用")
+    private String regionInfo;
+
+    /** 指定包邮开关 */
+    @Excel(name = "指定包邮开关")
+    private Integer appoint;
+
+    /** 指定包邮内容 */
+    @Excel(name = "指定包邮内容")
+    private String appointInfo;
+
+    /** $column.columnComment */
+    @Excel(name = "指定包邮内容")
+    private Integer isDel;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+    public void setRegionInfo(String regionInfo) 
+    {
+        this.regionInfo = regionInfo;
+    }
+
+    public String getRegionInfo() 
+    {
+        return regionInfo;
+    }
+    public void setAppoint(Integer appoint) 
+    {
+        this.appoint = appoint;
+    }
+
+    public Integer getAppoint() 
+    {
+        return appoint;
+    }
+    public void setAppointInfo(String appointInfo) 
+    {
+        this.appointInfo = appointInfo;
+    }
+
+    public String getAppointInfo() 
+    {
+        return appointInfo;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+    public void setSort(Long sort) 
+    {
+        this.sort = sort;
+    }
+
+    public Long getSort() 
+    {
+        return sort;
+    }
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreActivityScrm.java

@@ -0,0 +1,131 @@
+package com.fs.hisStore.domain;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+
+/**
+ * 活动对象 fs_store_activity
+ * 
+ * @author fs
+ * @date 2022-11-18
+ */
+public class FsStoreActivityScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long activityId;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 描述 */
+    @Excel(name = "描述")
+    private String descs;
+
+    /** 封面图 */
+    @Excel(name = "封面图")
+    private String logoUrl;
+
+    /** 活动图 */
+    @Excel(name = "活动图")
+    private String images;
+
+    /** 活动商品 */
+    @Excel(name = "活动商品")
+    private String productIds;
+
+    /** 活动内容 */
+    @Excel(name = "活动内容")
+    private String content;
+
+    /** 状态 0禁用 1启用 */
+    @Excel(name = "状态 0禁用 1启用")
+    private Integer status;
+
+    private Integer shareNumber;
+
+    public Integer getShareNumber() {
+        return shareNumber;
+    }
+
+    public void setShareNumber(Integer shareNumber) {
+        this.shareNumber = shareNumber;
+    }
+
+    public String getDescs() {
+        return descs;
+    }
+
+    public void setDescs(String descs) {
+        this.descs = descs;
+    }
+
+    public void setActivityId(Long activityId)
+    {
+        this.activityId = activityId;
+    }
+
+    public Long getActivityId() 
+    {
+        return activityId;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+
+    public void setLogoUrl(String logoUrl) 
+    {
+        this.logoUrl = logoUrl;
+    }
+
+    public String getLogoUrl() 
+    {
+        return logoUrl;
+    }
+    public void setImages(String images) 
+    {
+        this.images = images;
+    }
+
+    public String getImages() 
+    {
+        return images;
+    }
+    public void setProductIds(String productIds) 
+    {
+        this.productIds = productIds;
+    }
+
+    public String getProductIds() 
+    {
+        return productIds;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreAfterSalesItemScrm.java

@@ -0,0 +1,89 @@
+package com.fs.hisStore.domain;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+
+/**
+ * 售后子对象 fs_store_after_sales_item
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreAfterSalesItemScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键id */
+    private Long id;
+
+    /** 售后id */
+    @Excel(name = "售后id")
+    private Long storeAfterSalesId;
+
+    /** 商品id */
+    @Excel(name = "商品id")
+    private Long productId;
+
+    /** 数量 */
+    private Integer num;
+
+    /** 退货东西的详情信息 */
+    @Excel(name = "退货东西的详情信息")
+    private String jsonInfo;
+
+    /** 逻辑删除 */
+    @Excel(name = "逻辑删除")
+    private Integer isDel;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getStoreAfterSalesId() {
+        return storeAfterSalesId;
+    }
+
+    public void setStoreAfterSalesId(Long storeAfterSalesId) {
+        this.storeAfterSalesId = storeAfterSalesId;
+    }
+
+    public Long getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Long productId) {
+        this.productId = productId;
+    }
+
+    public String getJsonInfo() {
+        return jsonInfo;
+    }
+
+    public void setJsonInfo(String jsonInfo) {
+        this.jsonInfo = jsonInfo;
+    }
+
+    public Integer getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Integer isDel) {
+        this.isDel = isDel;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreAfterSalesScrm.java

@@ -0,0 +1,339 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+
+/**
+ * 售后记录对象 fs_store_after_sales
+ *
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreAfterSalesScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderCode;
+
+    /** 退款金额 */
+    @Excel(name = "退款金额")
+    private BigDecimal refundAmount;
+
+    /** 服务类型0仅退款1退货退款 */
+    @Excel(name = "服务类型0仅退款1退货退款")
+    private Integer serviceType;
+
+    /** 申请原因 */
+    @Excel(name = "申请原因")
+    private String reasons;
+
+    /** 说明 */
+    @Excel(name = "说明")
+    private String explains;
+
+    /** 说明图片->多个用逗号分割 */
+    @Excel(name = "说明图片->多个用逗号分割")
+    private String explainImg;
+
+    /** 物流公司编码 */
+    @Excel(name = "物流公司编码")
+    private String shipperCode;
+
+    /** 物流单号 */
+    @Excel(name = "物流单号")
+    private String deliverySn;
+
+    /** 物流名称 */
+    @Excel(name = "物流名称")
+    private String deliveryName;
+
+    /** 状态 0已提交等待平台审核 1平台已审核 等待用户发货/退款 2 用户已发货 3退款成功 */
+    @Excel(name = "状态 0已提交等待平台审核 1平台已审核 等待用户发货/退款 2 用户已发货 3退款成功")
+    private Integer status;
+
+    /** 售后状态-0正常1用户取消2商家拒绝 */
+    @Excel(name = "售后状态-0正常1用户取消2商家拒绝")
+    private Integer salesStatus;
+
+    @Excel(name = "订单当前状态")
+    private Integer orderStatus;
+
+    /** 逻辑删除 */
+    @Excel(name = "逻辑删除")
+    private Integer isDel;
+
+    /** 用户id */
+    @Excel(name = "用户id")
+    private Long userId;
+
+    /** 商家收货人 */
+    @Excel(name = "商家收货人")
+    private String consignee;
+
+    /** 商家手机号 */
+    @Excel(name = "商家手机号")
+    private String phoneNumber;
+
+    /** 商家地址 */
+    @Excel(name = "商家地址")
+    private String address;
+
+    private Long companyId;
+
+    private Long companyUserId;
+
+    private Integer isPackage;
+
+    private String packageJson;
+
+    private String companyUserNickName;
+
+    private Integer deliveryStatus;
+
+    private Long deptId;
+    private String consigneePhone;
+
+    /** 开始时间 */
+    @JsonIgnore
+    private String beginTime;
+
+    /** 结束时间 */
+    @JsonIgnore
+    private String endTime;
+
+    @Override
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    @Override
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    @Override
+    public String getEndTime() {
+        return endTime;
+    }
+
+    @Override
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getConsigneePhone() {
+        return consigneePhone;
+    }
+
+    public void setConsigneePhone(String consigneePhone) {
+        this.consigneePhone = consigneePhone;
+    }
+
+    public Integer getDeliveryStatus() {
+        return deliveryStatus;
+    }
+
+    public void setDeliveryStatus(Integer deliveryStatus) {
+        this.deliveryStatus = deliveryStatus;
+    }
+
+    public String getCompanyUserNickName() {
+        return companyUserNickName;
+    }
+
+    public void setCompanyUserNickName(String companyUserNickName) {
+        this.companyUserNickName = companyUserNickName;
+    }
+
+    public Integer getIsPackage() {
+        return isPackage;
+    }
+
+    public void setIsPackage(Integer isPackage) {
+        this.isPackage = isPackage;
+    }
+
+    public String getPackageJson() {
+        return packageJson;
+    }
+
+    public void setPackageJson(String packageJson) {
+        this.packageJson = packageJson;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Long getCompanyUserId() {
+        return companyUserId;
+    }
+
+    public void setCompanyUserId(Long companyUserId) {
+        this.companyUserId = companyUserId;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public BigDecimal getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(BigDecimal refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public Integer getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(Integer serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getReasons() {
+        return reasons;
+    }
+
+    public void setReasons(String reasons) {
+        this.reasons = reasons;
+    }
+
+    public String getExplains() {
+        return explains;
+    }
+
+    public void setExplains(String explains) {
+        this.explains = explains;
+    }
+
+    public String getExplainImg() {
+        return explainImg;
+    }
+
+    public void setExplainImg(String explainImg) {
+        this.explainImg = explainImg;
+    }
+
+    public String getShipperCode() {
+        return shipperCode;
+    }
+
+    public void setShipperCode(String shipperCode) {
+        this.shipperCode = shipperCode;
+    }
+
+    public String getDeliverySn() {
+        return deliverySn;
+    }
+
+    public void setDeliverySn(String deliverySn) {
+        this.deliverySn = deliverySn;
+    }
+
+    public String getDeliveryName() {
+        return deliveryName;
+    }
+
+    public void setDeliveryName(String deliveryName) {
+        this.deliveryName = deliveryName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getSalesStatus() {
+        return salesStatus;
+    }
+
+    public void setSalesStatus(Integer salesStatus) {
+        this.salesStatus = salesStatus;
+    }
+
+    public Integer getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(Integer orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public Integer getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(Integer isDel) {
+        this.isDel = isDel;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getConsignee() {
+        return consignee;
+    }
+
+    public void setConsignee(String consignee) {
+        this.consignee = consignee;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Long getDeptId() {return deptId;}
+
+    public void setDeptId(Long deptId) {this.deptId = deptId;}
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreAfterSalesStatusScrm.java

@@ -0,0 +1,122 @@
+package com.fs.hisStore.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import com.vdurmont.emoji.EmojiParser;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 售后订单操作对象 fs_store_after_sales_status
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreAfterSalesStatusScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 售后id */
+    @Excel(name = "售后id")
+    private Long storeAfterSalesId;
+
+    /** 操作类型 */
+    @Excel(name = "操作类型")
+    private Integer changeType;
+
+    /** 操作备注 */
+    @Excel(name = "操作备注")
+    private String changeMessage;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date changeTime;
+
+    /** 操作人 */
+    @Excel(name = "操作人")
+    private String operator;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setStoreAfterSalesId(Long storeAfterSalesId) 
+    {
+        this.storeAfterSalesId = storeAfterSalesId;
+    }
+
+    public Long getStoreAfterSalesId() 
+    {
+        return storeAfterSalesId;
+    }
+    public void setChangeType(Integer changeType) 
+    {
+        this.changeType = changeType;
+    }
+
+    public Integer getChangeType() 
+    {
+        return changeType;
+    }
+    public void setChangeMessage(String changeMessage) 
+    {
+        this.changeMessage = changeMessage;
+    }
+
+    public String getChangeMessage() 
+    {
+        return changeMessage;
+    }
+    public void setChangeTime(Date changeTime) 
+    {
+        this.changeTime = changeTime;
+    }
+
+    public Date getChangeTime() 
+    {
+        return changeTime;
+    }
+    public void setOperator(String operator) 
+    {
+        if(StringUtils.isNotEmpty(operator)){
+            this.operator= EmojiParser.parseToHtmlDecimal(operator);
+        }
+        else{
+            this.operator= operator;
+        }
+    }
+
+    public String getOperator() 
+    {
+        if(StringUtils.isNotEmpty(operator)){
+            return EmojiParser.parseToUnicode(operator);
+        }
+        else{
+            return operator;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("storeAfterSalesId", getStoreAfterSalesId())
+            .append("changeType", getChangeType())
+            .append("changeMessage", getChangeMessage())
+            .append("changeTime", getChangeTime())
+            .append("operator", getOperator())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCanvasScrm.java

@@ -0,0 +1,109 @@
+package com.fs.hisStore.domain;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 画布信息对象 fs_store_canvas
+ * 
+ * @author fs
+ * @date 2022-08-29
+ */
+public class FsStoreCanvasScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 画布id */
+    private Long canvasId;
+
+    /** 终端 1-小程序 */
+    @Excel(name = "终端 1-小程序")
+    private Integer terminal;
+
+    /** 画布json数据 */
+    @Excel(name = "画布json数据")
+    private String json;
+
+    /** 类型 1-系统画布 2-自定义页面 3-商家店铺装修 */
+    @Excel(name = "类型 1-系统画布 2-自定义页面 3-商家店铺装修")
+    private Integer type;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String name;
+
+    /** 删除标识 */
+    @Excel(name = "删除标识")
+    private Integer isDel;
+
+    public void setCanvasId(Long canvasId) 
+    {
+        this.canvasId = canvasId;
+    }
+
+    public Long getCanvasId() 
+    {
+        return canvasId;
+    }
+    public void setTerminal(Integer terminal) 
+    {
+        this.terminal = terminal;
+    }
+
+    public Integer getTerminal() 
+    {
+        return terminal;
+    }
+    public void setJson(String json) 
+    {
+        this.json = json;
+    }
+
+    public String getJson() 
+    {
+        return json;
+    }
+    public void setType(Integer type) 
+    {
+        this.type = type;
+    }
+
+    public Integer getType() 
+    {
+        return type;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+            .append("canvasId", getCanvasId())
+            .append("terminal", getTerminal())
+            .append("json", getJson())
+            .append("type", getType())
+            .append("name", getName())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/store/domain/FsStoreCartScrm.java → fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCartScrm.java

@@ -1,12 +1,14 @@
-package com.fs.store.domain;
+package com.fs.hisStore.domain;
 
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.*;
 
+import java.math.BigDecimal;
+
 /**
  * 购物车对象 fs_store_cart
- * 
+ *
  * @author fs
  * @date 2022-03-21
  */
@@ -54,5 +56,9 @@ public class FsStoreCartScrm extends BaseEntity
     @Excel(name = "是否为立即购买")
     private Integer isBuy;
 
+    /** 改价(商品单价) */
+    @Excel(name = "改价(商品单价)")
+    private BigDecimal changePrice;
+
 
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCouponIssueScrm.java

@@ -0,0 +1,174 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+
+/**
+ * 优惠券领取对象 fs_store_coupon_issue
+ *
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreCouponIssueScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** $column.columnComment */
+    private String couponName;
+
+    /** 优惠券ID */
+    @Excel(name = "优惠券ID")
+    private Long couponId;
+
+    /** 优惠券类型 0-通用 1-商品券 */
+    @Excel(name = "优惠券类型 0-通用 1-商品券")
+    private Integer couponType;
+
+    /** 优惠券领取开启时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "优惠券领取开启时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date startTime;
+
+    /** 优惠券领取结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "优惠券领取结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date limitTime;
+
+    /** 优惠券领取数量 */
+    @Excel(name = "优惠券领取数量")
+    private Integer totalCount;
+
+    /** 优惠券剩余领取数量 */
+    @Excel(name = "优惠券剩余领取数量")
+    private Integer remainCount;
+
+    /** 是否无限张数 */
+    @Excel(name = "是否无限张数")
+    private Integer isPermanent;
+
+    /** 1 正常 0 未开启 -1 已无效 */
+    @Excel(name = "1 正常 0 未开启 -1 已无效")
+    private Integer status;
+
+    /** $column.columnComment */
+    @Excel(name = "1 正常 0 未开启 -1 已无效")
+    private Integer isDel;
+
+    private BigDecimal couponPrice;
+
+    public BigDecimal getCouponPrice() {
+        return couponPrice;
+    }
+
+    public void setCouponPrice(BigDecimal couponPrice) {
+        this.couponPrice = couponPrice;
+    }
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setCouponName(String couponName)
+    {
+        this.couponName = couponName;
+    }
+
+    public String getCouponName()
+    {
+        return couponName;
+    }
+    public void setCouponId(Long couponId)
+    {
+        this.couponId = couponId;
+    }
+
+    public Long getCouponId()
+    {
+        return couponId;
+    }
+
+
+
+    public Integer getCouponType() {
+        return couponType;
+    }
+
+    public void setCouponType(Integer couponType) {
+        this.couponType = couponType;
+    }
+
+    public void setStartTime(Date startTime)
+    {
+        this.startTime = startTime;
+    }
+
+    public Date getStartTime()
+    {
+        return startTime;
+    }
+
+    public void setTotalCount(Integer totalCount)
+    {
+        this.totalCount = totalCount;
+    }
+
+    public Integer getTotalCount()
+    {
+        return totalCount;
+    }
+    public void setRemainCount(Integer remainCount)
+    {
+        this.remainCount = remainCount;
+    }
+
+    public Integer getRemainCount()
+    {
+        return remainCount;
+    }
+    public void setIsPermanent(Integer isPermanent)
+    {
+        this.isPermanent = isPermanent;
+    }
+
+    public Integer getIsPermanent()
+    {
+        return isPermanent;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+    public void setIsDel(Integer isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel()
+    {
+        return isDel;
+    }
+
+    public Date getLimitTime() {
+        return limitTime;
+    }
+
+    public void setLimitTime(Date limitTime) {
+        this.limitTime = limitTime;
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCouponIssueUserScrm.java

@@ -0,0 +1,81 @@
+package com.fs.hisStore.domain;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 优惠券用户领取记录对象 fs_store_coupon_issue_user
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreCouponIssueUserScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 领取优惠券用户ID */
+    @Excel(name = "领取优惠券用户ID")
+    private Long userId;
+
+    /** 优惠券领取ID */
+    @Excel(name = "优惠券领取ID")
+    private Long issueId;
+
+    /** $column.columnComment */
+    @Excel(name = "优惠券领取ID")
+    private Integer isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setIssueId(Long issueId) 
+    {
+        this.issueId = issueId;
+    }
+
+    public Long getIssueId() 
+    {
+        return issueId;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("userId", getUserId())
+            .append("issueId", getIssueId())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCouponScrm.java

@@ -0,0 +1,191 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 优惠券对象 fs_store_coupon
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreCouponScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 优惠券表ID */
+    private Long couponId;
+
+    /** 优惠券名称 */
+    @Excel(name = "优惠券名称")
+    private String title;
+
+    /** 兑换消耗积分值 */
+    @Excel(name = "兑换消耗积分值")
+    private Long integral;
+
+    /** 兑换的优惠券面值 */
+    @Excel(name = "兑换的优惠券面值")
+    private BigDecimal couponPrice;
+
+    /** 最低消费多少金额可用优惠券 */
+    @Excel(name = "最低消费多少金额可用优惠券")
+    private BigDecimal useMinPrice;
+
+    /** 优惠券有效期限（单位：天） */
+    @Excel(name = "优惠券有效期限", readConverterExp = "单=位：天")
+    private Long couponTime;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sort;
+
+    /** 状态（0：关闭，1：开启） */
+    @Excel(name = "状态", readConverterExp = "0=：关闭，1：开启")
+    private Integer status;
+
+    /** 商品ids */
+    @Excel(name = "商品ids")
+    private String productIds;
+
+    @Excel(name = "套餐分类IDS")
+    private String packageCateIds;
+
+    /** 优惠券类型 0-通用 1-商品券 */
+    @Excel(name = "优惠券类型 0-通用 1-商品券")
+    private Integer type;
+
+    /** 是否删除 */
+    @Excel(name = "是否删除")
+    private Integer isDel;
+
+    public String getPackageCateIds() {
+        return packageCateIds;
+    }
+
+    public void setPackageCateIds(String packageCateIds) {
+        this.packageCateIds = packageCateIds;
+    }
+
+    public void setCouponId(Long couponId)
+    {
+        this.couponId = couponId;
+    }
+
+    public Long getCouponId() 
+    {
+        return couponId;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setIntegral(Long integral) 
+    {
+        this.integral = integral;
+    }
+
+    public Long getIntegral() 
+    {
+        return integral;
+    }
+    public void setCouponPrice(BigDecimal couponPrice) 
+    {
+        this.couponPrice = couponPrice;
+    }
+
+    public BigDecimal getCouponPrice() 
+    {
+        return couponPrice;
+    }
+    public void setUseMinPrice(BigDecimal useMinPrice) 
+    {
+        this.useMinPrice = useMinPrice;
+    }
+
+    public BigDecimal getUseMinPrice() 
+    {
+        return useMinPrice;
+    }
+    public void setCouponTime(Long couponTime) 
+    {
+        this.couponTime = couponTime;
+    }
+
+    public Long getCouponTime() 
+    {
+        return couponTime;
+    }
+    public void setSort(Long sort) 
+    {
+        this.sort = sort;
+    }
+
+    public Long getSort() 
+    {
+        return sort;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+    public void setProductIds(String productIds) 
+    {
+        this.productIds = productIds;
+    }
+
+    public String getProductIds() 
+    {
+        return productIds;
+    }
+    public void setType(Integer type)
+    {
+        this.type = type;
+    }
+
+    public Integer getType()
+    {
+        return type;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("couponId", getCouponId())
+            .append("title", getTitle())
+            .append("integral", getIntegral())
+            .append("couponPrice", getCouponPrice())
+            .append("useMinPrice", getUseMinPrice())
+            .append("couponTime", getCouponTime())
+            .append("sort", getSort())
+            .append("status", getStatus())
+            .append("productIds", getProductIds())
+            .append("type", getType())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreCouponUserScrm.java

@@ -0,0 +1,178 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+
+/**
+ * 优惠券发放记录对象 fs_store_coupon_user
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreCouponUserScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 优惠券发放记录id */
+    private Long id;
+
+    /** 兑换的项目id */
+    @Excel(name = "兑换的项目id")
+    private Long couponId;
+
+    /** 优惠券所属用户 */
+    @Excel(name = "优惠券所属用户")
+    private Long userId;
+
+    /** 优惠券名称 */
+    @Excel(name = "优惠券名称")
+    private String couponTitle;
+
+    /** 优惠券的面值 */
+    @Excel(name = "优惠券的面值")
+    private BigDecimal couponPrice;
+
+    /** 最低消费多少金额可用优惠券 */
+    @Excel(name = "最低消费多少金额可用优惠券")
+    private BigDecimal useMinPrice;
+
+    /** 优惠券结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "优惠券结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date limitTime;
+
+    /** 使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date useTime;
+
+    /** 获取方式 */
+    @Excel(name = "获取方式")
+    private String type;
+
+    /** 状态（0：未使用，1：已使用, 2:已过期） */
+    @Excel(name = "状态", readConverterExp = "0=：未使用，1：已使用,,2=:已过期")
+    private Integer status;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Integer isFail;
+
+    /** $column.columnComment */
+    @Excel(name = "是否有效")
+    private Integer isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCouponId(Long couponId) 
+    {
+        this.couponId = couponId;
+    }
+
+    public Long getCouponId() 
+    {
+        return couponId;
+    }
+    public void setUserId(Long userId) 
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId() 
+    {
+        return userId;
+    }
+    public void setCouponTitle(String couponTitle) 
+    {
+        this.couponTitle = couponTitle;
+    }
+
+    public String getCouponTitle() 
+    {
+        return couponTitle;
+    }
+    public void setCouponPrice(BigDecimal couponPrice) 
+    {
+        this.couponPrice = couponPrice;
+    }
+
+    public BigDecimal getCouponPrice() 
+    {
+        return couponPrice;
+    }
+    public void setUseMinPrice(BigDecimal useMinPrice) 
+    {
+        this.useMinPrice = useMinPrice;
+    }
+
+    public BigDecimal getUseMinPrice() 
+    {
+        return useMinPrice;
+    }
+
+    public Date getLimitTime() {
+        return limitTime;
+    }
+
+    public void setLimitTime(Date limitTime) {
+        this.limitTime = limitTime;
+    }
+
+    public void setUseTime(Date useTime)
+    {
+        this.useTime = useTime;
+    }
+
+    public Date getUseTime() 
+    {
+        return useTime;
+    }
+    public void setType(String type) 
+    {
+        this.type = type;
+    }
+
+    public String getType() 
+    {
+        return type;
+    }
+    public void setStatus(Integer status) 
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus() 
+    {
+        return status;
+    }
+    public void setIsFail(Integer isFail) 
+    {
+        this.isFail = isFail;
+    }
+
+    public Integer getIsFail() 
+    {
+        return isFail;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderAuditLogScrm.java

@@ -0,0 +1,38 @@
+package com.fs.hisStore.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;
+
+@TableName("fs_store_order_audit_log")
+@Data
+public class FsStoreOrderAuditLogScrm {
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 审核ID
+     */
+    private Long auditId;
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+    /**
+     * 审核人ID
+     */
+    private Long auditUserId;
+    /**
+     * 备注
+     */
+    private String content;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderAuditScrm.java

@@ -0,0 +1,58 @@
+package com.fs.hisStore.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;
+
+@Data
+@TableName("fs_store_order_audit")
+public class FsStoreOrderAuditScrm {
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+    /**
+     * 公司ID
+     */
+    private Long companyId;
+    /**
+     * 销售ID
+     */
+    private Long companyUserId;
+    /**
+     * 审核状态 0:待销售审核 1:销售审核拒绝 2:待总后台审核 3:总后台审核拒绝 4:审核通过
+     */
+    private Integer auditStatus;
+    /**
+     * 销售审核时间
+     */
+    private LocalDateTime companyAuditTime;
+    /**
+     * 销售审核人ID
+     */
+    private Long companyAuditUserId;
+    /**
+     * 总后台审核时间
+     */
+    private LocalDateTime adminAuditTime;
+    /**
+     * 总后台审核人ID
+     */
+    private Long adminAuditUserId;
+    /**
+     * 拒绝原因
+     */
+    private String reason;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+}

fs-service/src/main/java/com/fs/store/domain/FsStoreOrderItemScrm.java → fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderItemScrm.java

@@ -1,10 +1,10 @@
-package com.fs.store.domain;
+package com.fs.hisStore.domain;
 
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 
 /**
- * 订单详情对象 fs_store_order_item_scrm
+ * 订单详情对象 fs_store_order_item
  * 
  * @author fs
  * @date 2022-03-21

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderNoticeScrm.java

@@ -0,0 +1,96 @@
+package com.fs.hisStore.domain;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 订单通知用户 接收订单通知的用户对象 fs_store_order_notice
+ * 
+ * @author fs
+ * @date 2022-03-15
+ */
+public class FsStoreOrderNoticeScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** 用户昵称 */
+    @Excel(name = "用户昵称")
+    private String nickName;
+
+    /** openId */
+    @Excel(name = "openId")
+    private String openId;
+
+    /** $column.columnComment */
+    @Excel(name = "openId")
+    private Integer isDel;
+
+    /** 是否启用 */
+    @Excel(name = "是否启用")
+    private Integer isEnable;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setNickName(String nickName) 
+    {
+        this.nickName = nickName;
+    }
+
+    public String getNickName() 
+    {
+        return nickName;
+    }
+    public void setOpenId(String openId) 
+    {
+        this.openId = openId;
+    }
+
+    public String getOpenId() 
+    {
+        return openId;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+    public void setIsEnable(Integer isEnable) 
+    {
+        this.isEnable = isEnable;
+    }
+
+    public Integer getIsEnable() 
+    {
+        return isEnable;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("nickName", getNickName())
+            .append("openId", getOpenId())
+            .append("remark", getRemark())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("isEnable", getIsEnable())
+            .toString();
+    }
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderOfflineItemScrm.java

@@ -0,0 +1,41 @@
+package com.fs.hisStore.domain;
+
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 线下订单详情对象 fs_store_order_offline_item
+ *
+ * @author fs
+ * @date 2024-10-29
+ */
+@Data
+public class FsStoreOrderOfflineItemScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long itemId;
+
+    /** 订单id */
+    @Excel(name = "订单id")
+    private Long orderId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderCode;
+
+    /** 商品ID */
+    @Excel(name = "商品ID")
+    private Long productId;
+
+    /** $column.columnComment */
+    @Excel(name = "商品ID")
+    private String jsonInfo;
+
+    /** $column.columnComment */
+    @Excel(name = "商品ID")
+    private Integer num;
+
+}

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderOfflineScrm.java

@@ -0,0 +1,83 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+/**
+ * 线下订单对象 fs_store_order_offline
+ *
+ * @author fs
+ * @date 2024-10-29
+ */
+@Data
+public class FsStoreOrderOfflineScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long orderId;
+
+    /** 订单id */
+    @Excel(name = "订单id")
+    private Long crmId;
+
+    /** 订单号 */
+    @Excel(name = "订单号")
+    private String orderCode;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    private Long status;
+
+    /** 应付金额 */
+    @Excel(name = "应付金额")
+    private BigDecimal payPrice;
+
+    /** 实付金额 */
+    @Excel(name = "实付金额")
+    private BigDecimal payMoney;
+
+    /** 凭证小票 */
+    @Excel(name = "凭证小票")
+    private String certificates;
+
+    /** 上传时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "上传时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date uploadTime;
+
+    /** 员工id */
+    @Excel(name = "员工id")
+    private Long companyUserId;
+
+    /** 上传小票员工id */
+    @Excel(name = "上传小票员工id")
+    private Long uploadUserId;
+
+    private Long companyId;
+
+    private Date auditTime;//审核时间
+
+    private String auditBy;//审核人
+
+
+    /** 购买药店 */
+    @Excel(name = "购买药店")
+    private String storeName;
+
+    /** 药店地址 */
+    @Excel(name = "药店地址")
+    private String storeAddress;
+
+    /** 批号 */
+    @Excel(name = "批号")
+    private String batchNo;
+
+    /** 监管码 */
+    @Excel(name = "监管码")
+    private String businessCode;
+}

fs-service/src/main/java/com/fs/store/domain/FsStoreOrderScrm.java → fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderScrm.java

@@ -1,13 +1,14 @@
-package com.fs.store.domain;
+package com.fs.hisStore.domain;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * 订单对象 fs_store_order
  *
@@ -244,6 +245,11 @@ public class FsStoreOrderScrm extends BaseEntity
 
     private Integer isPayRemain;
 
+
+    @Excel(name = "剩余金额")
+    @TableField(exist = false)
+    private BigDecimal payRemain;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "发货时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliverySendTime;
@@ -260,4 +266,6 @@ public class FsStoreOrderScrm extends BaseEntity
 
     private BigDecimal serviceFee;
 
+    private Integer orderMedium; //媒体来源
+
 }

fs-service/src/main/java/com/fs/store/domain/FsStoreOrderStatusScrm.java → fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderStatusScrm.java

@@ -1,13 +1,12 @@
-package com.fs.store.domain;
+package com.fs.hisStore.domain;
 
+import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.Date;
-
 /**
  * 订单操作记录对象 fs_store_order_status
  * 

fs-service/src/main/java/com/fs/hisStore/domain/FsStorePaymentScrm.java

@@ -0,0 +1,280 @@
+package com.fs.hisStore.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntity;
+
+/**
+ * 支付明细对象 fs_store_payment
+ *
+ * @author fs
+ * @date 2022-06-20
+ */
+public class FsStorePaymentScrm extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long paymentId;
+
+    /** 支付订单号 */
+    @Excel(name = "支付订单号")
+    private String payCode;
+
+    /** 支付类型 weixin alipay */
+    @Excel(name = "支付类型 weixin alipay")
+    private String payTypeCode;
+
+    /** 支付金额 */
+    @Excel(name = "支付金额")
+    private BigDecimal payMoney;
+
+    /** 支付时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date payTime;
+
+    /** 外部订单号 */
+    @Excel(name = "外部订单号")
+    private String tradeNo;
+
+    /** 用户ID */
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    /** OPENID */
+    @Excel(name = "OPENID")
+    private String openId;
+
+    /** 业务类型 1收款 */
+    @Excel(name = "业务类型 1收款")
+    private Integer businessType;
+
+    /** 关联业务ID */
+    @Excel(name = "关联业务ID")
+    private String businessOrderId;
+
+    /** 状态 0未支付 1已支付 -1 已退款 */
+    @Excel(name = "状态 0未支付 1已支付 -1 已退款")
+    private Integer status;
+
+    private String remark;
+
+    private Long companyId;
+
+    private Long companyUserId;
+
+    private Long deptId;
+
+    private String bankTransactionId;
+
+    private String bankSerialNo;
+
+    private BigDecimal refundMoney;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "退款时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date refundTime;
+
+    private String payMode;
+    private Long orderId;
+
+    private Integer isPayRemain;
+
+    public String getPayMode() {
+        return payMode;
+    }
+
+    public void setPayMode(String payMode) {
+        this.payMode = payMode;
+    }
+
+    public Integer getIsPayRemain() {
+        return isPayRemain;
+    }
+
+    public void setIsPayRemain(Integer isPayRemain) {
+        this.isPayRemain = isPayRemain;
+    }
+
+    public Long getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long orderId) {
+        this.orderId = orderId;
+    }
+
+    public BigDecimal getRefundMoney() {
+        return refundMoney;
+    }
+
+    public void setRefundMoney(BigDecimal refundMoney) {
+        this.refundMoney = refundMoney;
+    }
+
+    public Date getRefundTime() {
+        return refundTime;
+    }
+
+    public void setRefundTime(Date refundTime) {
+        this.refundTime = refundTime;
+    }
+
+    public String getBankTransactionId() {
+        return bankTransactionId;
+    }
+
+    public void setBankTransactionId(String bankTransactionId) {
+        this.bankTransactionId = bankTransactionId;
+    }
+
+    public String getBankSerialNo() {
+        return bankSerialNo;
+    }
+
+    public void setBankSerialNo(String bankSerialNo) {
+        this.bankSerialNo = bankSerialNo;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    public Long getCompanyUserId() {
+        return companyUserId;
+    }
+
+    public void setCompanyUserId(Long companyUserId) {
+        this.companyUserId = companyUserId;
+    }
+
+    public void setPaymentId(Long paymentId)
+    {
+        this.paymentId = paymentId;
+    }
+
+    public Long getPaymentId()
+    {
+        return paymentId;
+    }
+    public void setPayCode(String payCode)
+    {
+        this.payCode = payCode;
+    }
+
+    public String getPayCode()
+    {
+        return payCode;
+    }
+    public void setPayTypeCode(String payTypeCode)
+    {
+        this.payTypeCode = payTypeCode;
+    }
+
+    public String getPayTypeCode()
+    {
+        return payTypeCode;
+    }
+    public void setPayMoney(BigDecimal payMoney)
+    {
+        this.payMoney = payMoney;
+    }
+
+    public BigDecimal getPayMoney()
+    {
+        return payMoney;
+    }
+    public void setPayTime(Date payTime)
+    {
+        this.payTime = payTime;
+    }
+
+    public Date getPayTime()
+    {
+        return payTime;
+    }
+    public void setTradeNo(String tradeNo)
+    {
+        this.tradeNo = tradeNo;
+    }
+
+    public String getTradeNo()
+    {
+        return tradeNo;
+    }
+    public void setUserId(Long userId)
+    {
+        this.userId = userId;
+    }
+
+    public Long getUserId()
+    {
+        return userId;
+    }
+    public void setOpenId(String openId)
+    {
+        this.openId = openId;
+    }
+
+    public String getOpenId()
+    {
+        return openId;
+    }
+    public void setBusinessType(Integer businessType)
+    {
+        this.businessType = businessType;
+    }
+
+    public Integer getBusinessType()
+    {
+        return businessType;
+    }
+    public void setBusinessOrderId(String businessOrderId)
+    {
+        this.businessOrderId = businessOrderId;
+    }
+
+    public String getBusinessOrderId()
+    {
+        return businessOrderId;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+
+
+}

fs-service/src/main/java/com/fs/store/domain/FsStoreProductAttrScrm.java → fs-service/src/main/java/com/fs/hisStore/domain/FsStoreProductAttrScrm.java

@@ -1,4 +1,4 @@
-package com.fs.store.domain;
+package com.fs.hisStore.domain;
 
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;