修改配置文件

fs-admin/src/main/java/com/fs/company/controller/CompanyController.java

@@ -147,9 +147,11 @@ public class CompanyController extends BaseController
                 callerService.updateCompanyVoiceCaller(caller);
             }
         }else {
-            CompanyUser companyUser1 = userService.selectCompanyUserAdminByCompanyId(company.getCompanyId());
-            companyUser1.setStatus("0");
-            userService.updateCompanyUser(companyUser1);
+//            CompanyUser companyUser1 = userService.selectCompanyUserAdminByCompanyId(company.getCompanyId());
+//            if(companyUser1 != null){
+//                companyUser1.setStatus("0");
+//                userService.updateCompanyUser(companyUser1);
+//            }
         }
         return toAjax(companyService.updateCompany(company));
     }

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

@@ -9,6 +9,7 @@ import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsUserCourseVideo;
 import com.fs.course.mapper.FsUserCourseVideoMapper;
+import com.fs.course.param.BatchRedUpdate;
 import com.fs.course.param.BatchVideoSvae;
 import com.fs.course.param.CourseVideoUpdates;
 import com.fs.course.service.IFsUserCourseVideoService;
@@ -131,4 +132,9 @@ public class FsUserCourseVideoController extends BaseController
         fsUserCourseVideoService.batchSaveVideo(vo);
         return R.ok();
     }
+    @PostMapping("/batchUpdateRed")
+    public R batchUpdateRed(@RequestBody List<BatchRedUpdate> list){
+        fsUserCourseVideoService.batchUpdateRed(list);
+        return R.ok();
+    }
 }

fs-admin/src/main/java/com/fs/store/controller/FsTestReportController.java

@@ -5,6 +5,7 @@ import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.store.domain.FsTestReport;
 import com.fs.store.param.FsTestReportParam;
@@ -39,9 +40,7 @@ public class FsTestReportController extends BaseController
     {
         startPage();
         List<FsTestReportListVO> list = fsTestReportService.selectFsTestReportListVO(fsTestReport);
-        for (FsTestReportListVO vo : list) {
-            vo.setPhone(vo.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-        }
+        list.stream().filter(e -> StringUtils.isNotEmpty(e.getPhone())).forEach(e -> e.setPhone(e.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2")));
         return getDataTable(list);
     }
 

fs-admin/src/main/resources/application.yml

@@ -46,7 +46,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: dev
+#    active: dev
+    active: druid-fby
     include: config
   # 文件上传
   servlet:

fs-company-app/src/main/resources/application.yml

@@ -54,6 +54,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: dev
+    #    active: druid-fby
     include: config
   # 文件上传
   servlet:

fs-company/src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: dev
-#    active: druid
+    #    active: druid-fby
     include: config
   # 文件上传
   servlet:

fs-qw-api/src/main/resources/application.yml

@@ -43,8 +43,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-#    active: dev
     active: dev
+    #    active: druid-fby
     include: config
   # 文件上传
   servlet:

fs-qw-task/src/main/resources/application.yml

@@ -43,8 +43,8 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-#    active: druid
     active: dev
+    #    active: druid-fby
     include: config
   # 文件上传
   servlet:

fs-qwhook/src/main/resources/application.yml

@@ -44,8 +44,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: dev
-#    active: druid
-#    active: dev
+    #    active: druid-fby
     include: config
   # 文件上传
   servlet:

fs-service-system/src/main/java/com/fs/course/mapper/FsUserCourseVideoMapper.java

@@ -1,5 +1,6 @@
 package com.fs.course.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -170,4 +171,6 @@ public interface FsUserCourseVideoMapper
     void updates(CourseVideoUpdates vo);
 
     void insertBatchFsUserCourseVideo(@Param("collect") List<FsUserCourseVideo> collect);
+
+    void updateRedPacketMoney(@Param("videoId") Long videoId, @Param("redPacketMoney") BigDecimal redPacketMoney);
 }

fs-service-system/src/main/java/com/fs/course/mapper/FsUserCourseVideoRedPackageMapper.java

@@ -95,4 +95,6 @@ public interface FsUserCourseVideoRedPackageMapper
     List<FsUserCourseVideoRedPackage> selectByParamsList(@Param("list") List<FsUserCourseVideoRedPackage> list);
 
     int updateRedPackageByParams(FsUserCourseVideoRedPackage videoRedPackage);
+
+    List<FsUserCourseVideoRedPackage> selectByRuleIds(@Param("ruleIds") List<Long> ruleIds);
 }

fs-service-system/src/main/java/com/fs/course/param/BatchRedUpdate.java

@@ -0,0 +1,12 @@
+package com.fs.course.param;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class BatchRedUpdate {
+    private Long videoId;
+    private BigDecimal redPacketMoney;
+}

fs-service-system/src/main/java/com/fs/course/param/BatchVideoSvae.java

@@ -3,6 +3,7 @@ package com.fs.course.param;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.util.List;
 

fs-service-system/src/main/java/com/fs/course/service/IFsUserCourseVideoRedPackageService.java

@@ -91,4 +91,5 @@ public interface IFsUserCourseVideoRedPackageService
      */
     void batchRedPacketByPeriod(List<FsBatchPeriodRedPackageParam> periodRedPackageList);
 
+    List<FsUserCourseVideoRedPackage> selectByRuleIds(List<Long> ruleIds);
 }

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

@@ -147,4 +147,6 @@ public interface IFsUserCourseVideoService
     void updates(CourseVideoUpdates vo);
 
     void batchSaveVideo(BatchVideoSvae vo);
+
+    void batchUpdateRed(List<BatchRedUpdate> list);
 }

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoRedPackageServiceImpl.java

@@ -239,5 +239,10 @@ public class FsUserCourseVideoRedPackageServiceImpl implements IFsUserCourseVide
         this.batchSaveCompanyRedPackage(fsRedPackageList);
     }
 
+    @Override
+    public List<FsUserCourseVideoRedPackage> selectByRuleIds(List<Long> ruleIds) {
+        return fsUserCourseVideoRedPackageMapper.selectByRuleIds(ruleIds);
+    }
+
 
 }

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

@@ -1059,6 +1059,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         fsUserCourseVideoMapper.insertBatchFsUserCourseVideo(collect);
     }
 
+    @Override
+    public void batchUpdateRed(List<BatchRedUpdate> list) {
+        list.forEach(e -> {
+            fsUserCourseVideoMapper.updateRedPacketMoney(e.getVideoId(), e.getRedPacketMoney());
+        });
+    }
+
     //会员-更新心跳时间
     public void updateHeartbeatWx(FsUserCourseVideoUParam param) {
         String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId();

fs-service-system/src/main/java/com/fs/course/vo/FsUserCourseVideoQVO.java

@@ -6,6 +6,7 @@ import com.fs.common.core.domain.BaseEntity;
 import com.fs.course.domain.FsCourseQuestionBank;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.time.LocalTime;
 import java.util.List;
 
@@ -68,7 +69,7 @@ public class FsUserCourseVideoQVO extends BaseEntity {
     private String lineTwo; //线路二 电信 前缀ctev
     private String lineThree; //线路三 华为云obs
     private Integer uploadType;
-    private String redPacketMoney;
+    private BigDecimal redPacketMoney;
     private Long fileSize;//文件大小  字节
     private String fileKey;//文件key 对用存储桶
     private String round;//轮次

fs-service-system/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -148,8 +148,8 @@ public interface QwUserMapper extends BaseMapper<QwUser>
             "\tqd.dept_name AS bindDepartmentName,\n" +
             "\tqu.corp_id AS bindCropId,\n" +
             "\tqc.corp_name AS bindCropName,\n" +
-            "\tcu.address_id AS value,\n" +
-            "\tfs.city_name AS label \n" +
+            "\tcu.address_id AS value\n" +
+//            "\tfs.city_name AS label \n" +
             "FROM\n" +
             "\tqw_user qu\n" +
             "\tLEFT JOIN company_user cu ON cu.user_id = qu.company_user_id\n" +

fs-service-system/src/main/java/com/fs/sop/domain/QwSopTempRules.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
+import com.fs.course.domain.FsUserCourseVideoRedPackage;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -77,4 +78,6 @@ public class QwSopTempRules{
 
     @TableField(exist = false)
     private Integer dayNum;
+    @TableField(exist = false)
+    private FsUserCourseVideoRedPackage red;
 }

fs-service-system/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -468,11 +468,15 @@ public class QwSopTempServiceImpl implements IQwSopTempService
         qwSopTempMapper.insertQwSopTemp(qwSopTemp);
         List<QwSopTempDay> dayList = qwSopTempRulesService.listByTempIdAll(oldId);
         if(dayList.isEmpty()) return;
-//        List<QwSopTempRules> rulesList = qwSopTempRulesService.listByTempId(oldId);
+        List<QwSopTempRules> ruleList = dayList.stream().filter(e -> e.getList() != null).flatMap(e -> e.getList().stream()).collect(Collectors.toList());
+        if(ruleList.isEmpty()) return;
+        List<FsUserCourseVideoRedPackage> redList = fsUserCourseVideoRedPackageService.selectByRuleIds(PubFun.listToNewList(ruleList, QwSopTempRules::getId));
+        Map<Long, FsUserCourseVideoRedPackage> redMap = PubFun.listToMapByGroupObject(redList, FsUserCourseVideoRedPackage::getRuleId);
         dayList.forEach(day -> {
             day.setTempId(newId);
             if(day.getList() != null && !day.getList().isEmpty()){
                 day.getList().forEach(e -> {
+                    e.setRed(redMap.get(e.getId()));
                     e.setTempId(newId);
                     if(e.getSettingList() != null && !e.getSettingList().isEmpty()){
                         e.getSettingList().forEach(item -> {
@@ -491,6 +495,11 @@ public class QwSopTempServiceImpl implements IQwSopTempService
             item.setDayId(e.getDayId());
         }));
         qwSopTempContentService.insertBatch(collect.stream().flatMap(e ->e.getSettingList().stream()).collect(Collectors.toList()));
+        List<FsUserCourseVideoRedPackage> redSaveList = collect.stream().filter(e -> e.getRed() != null).peek(e -> e.getRed().setRuleId(e.getId())).map(QwSopTempRules::getRed).collect(Collectors.toList());
+        if(!redSaveList.isEmpty()){
+            fsUserCourseVideoRedPackageService.batchSaveCompanyRedPackage(redSaveList);
+        }
+
     }
 
     @Override

fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -252,4 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by video.course_sort
     </select>
 
+    <update id="updateRedPacketMoney">
+        update fs_user_course_video set red_packet_money = #{redPacketMoney} where video_id = #{videoId}
+    </update>
 </mapper>

fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoRedPackageMapper.xml

@@ -136,4 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and data_type = 2
     </update>
 
+    <select id="selectByRuleIds" resultType="com.fs.course.domain.FsUserCourseVideoRedPackage">
+        select * from fs_user_course_video_red_package where data_type = 3 and rule_id in <foreach collection="ruleIds" open="(" separator="," close=")" item="item">#{item}</foreach>
+    </select>
 </mapper>

fs-service-system/src/main/resources/mapper/store/FsFollowMapper.xml

@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.store.mapper.FsFollowMapper">
+
+    <resultMap type="FsFollow" id="FsFollowResult">
+        <result property="followId"    column="follow_id"    />
+        <result property="tempId"    column="temp_id"    />
+        <result property="patientId"    column="patient_id"    />
+        <result property="patientName"    column="patient_name"    />
+        <result property="patientPhone"    column="patient_phone"    />
+        <result property="userId"    column="user_id"    />
+        <result property="doctorId"    column="doctor_id"    />
+        <result property="totalNum"    column="total_num"    />
+        <result property="num"    column="num"    />
+        <result property="pushStatus"    column="push_status"    />
+        <result property="writeStatus"    column="write_status"    />
+        <result property="planTime"    column="plan_time"    />
+        <result property="formJson"    column="form_json"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="packageOrderId"    column="package_order_id"    />
+        <result property="inquiryOrderId"    column="inquiry_order_id"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="companyUserId"    column="company_user_id"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="writeUserName"    column="write_user_name"    />
+        <result property="storeOrderId"    column="store_order_id"    />
+    </resultMap>
+
+    <sql id="selectFsFollowVo">
+        select follow_id,temp_id,store_order_id,company_id,company_user_id,dept_id,write_user_name,patient_id,package_order_id,inquiry_order_id, patient_name, patient_phone, user_id, doctor_id, total_num, num, push_status, write_status, plan_time, form_json, create_time, update_time from fs_follow
+    </sql>
+
+    <select id="selectFsFollowList" parameterType="FsFollow" resultMap="FsFollowResult">
+        <include refid="selectFsFollowVo"/>
+        <where>
+            <if test="patientName != null  and patientName != ''"> and patient_name like concat('%', #{patientName}, '%')</if>
+            <if test="patientPhone != null  and patientPhone != ''"> and patient_phone like concat('%', #{patientPhone}, '%')</if>
+            <if test="pushStatus != null "> and push_status = #{pushStatus}</if>
+            <if test="writeStatus != null "> and write_status = #{writeStatus}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+        </where>
+    </select>
+
+    <select id="selectFsFollowByFollowId" parameterType="Long" resultMap="FsFollowResult">
+        <include refid="selectFsFollowVo"/>
+        where follow_id = #{followId}
+    </select>
+
+    <insert id="insertFsFollow" parameterType="FsFollow" useGeneratedKeys="true" keyProperty="followId">
+        insert into fs_follow
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="followId != null">follow_id,</if>
+            <if test="tempId != null">temp_id,</if>
+            <if test="patientId != null">patient_id,</if>
+            <if test="patientName != null">patient_name,</if>
+            <if test="patientPhone != null">patient_phone,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="doctorId != null">doctor_id,</if>
+            <if test="totalNum != null">total_num,</if>
+            <if test="num != null">num,</if>
+            <if test="pushStatus != null">push_status,</if>
+            <if test="writeStatus != null">write_status,</if>
+            <if test="planTime != null">plan_time,</if>
+            <if test="formJson != null">form_json,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="packageOrderId != null">package_order_id,</if>
+            <if test="inquiryOrderId != null">inquiry_order_id,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="companyUserId != null">company_user_id,</if>
+            <if test="deptId != null">dept_id,</if>
+            <if test="writeUserName != null">write_user_name,</if>
+            <if test="storeOrderId != null">store_order_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="followId != null">#{followId},</if>
+            <if test="tempId != null">#{tempId},</if>
+            <if test="patientId != null">#{patientId},</if>
+            <if test="patientName != null">#{patientName},</if>
+            <if test="patientPhone != null">#{patientPhone},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="doctorId != null">#{doctorId},</if>
+            <if test="totalNum != null">#{totalNum},</if>
+            <if test="num != null">#{num},</if>
+            <if test="pushStatus != null">#{pushStatus},</if>
+            <if test="writeStatus != null">#{writeStatus},</if>
+            <if test="planTime != null">#{planTime},</if>
+            <if test="formJson != null">#{formJson},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="packageOrderId != null">#{packageOrderId},</if>
+            <if test="inquiryOrderId != null">#{inquiryOrderId},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="companyUserId != null">#{companyUserId},</if>
+            <if test="deptId != null">#{deptId},</if>
+            <if test="writeUserName != null">#{writeUserName},</if>
+            <if test="storeOrderId != null">#{storeOrderId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFsFollow" parameterType="FsFollow">
+        update fs_follow
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="tempId != null">temp_id = #{tempId},</if>
+            <if test="patientId != null">patient_id = #{patientId},</if>
+            <if test="patientName != null">patient_name = #{patientName},</if>
+            <if test="patientPhone != null">patient_phone = #{patientPhone},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="doctorId != null">doctor_id = #{doctorId},</if>
+            <if test="totalNum != null">total_num = #{totalNum},</if>
+            <if test="num != null">num = #{num},</if>
+            <if test="pushStatus != null">push_status = #{pushStatus},</if>
+            <if test="writeStatus != null">write_status = #{writeStatus},</if>
+            <if test="planTime != null">plan_time = #{planTime},</if>
+            <if test="formJson != null">form_json = #{formJson},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="packageOrderId != null">package_order_id = #{packageOrderId},</if>
+            <if test="inquiryOrderId != null">inquiry_order_id = #{inquiryOrderId},</if>
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="writeUserName != null">write_user_name = #{writeUserName},</if>
+            <if test="storeOrderId != null">store_order_id = #{storeOrderId},</if>
+        </trim>
+        where follow_id = #{followId}
+    </update>
+
+    <delete id="deleteFsFollowByFollowId" parameterType="Long">
+        delete from fs_follow where follow_id = #{followId}
+    </delete>
+
+    <delete id="deleteFsFollowByFollowIds" parameterType="String">
+        delete from fs_follow where follow_id in
+        <foreach item="followId" collection="array" open="(" separator="," close=")">
+            #{followId}
+        </foreach>
+    </delete>
+
+    <select id="selectFsFollowListVO_COUNT" parameterType="com.fs.store.param.FsFollowParam" resultType="Long">
+    select count(1) from fs_follow ff
+        <if test="doctorAccount != null "> LEFT JOIN fs_doctor fd ON fd.doctor_id=ff.doctor_id  </if>
+        <if test="orderCode != null ">  LEFT JOIN fs_store_order fso ON fso.order_id=ff.store_order_id </if>
+        <if test="companyUserName != null "> LEFT JOIN company_user cu ON cu.user_id =ff.company_user_id </if>
+        where 1=1
+        <if test="patientName != null  and patientName != ''"> and ff.patient_name like concat('%', #{patientName}, '%')</if>
+        <if test="patientPhone != null  and patientPhone != ''"> and ff.patient_phone like concat('%', #{patientPhone}, '%')</if>
+        <if test="orderCode != null "> and fso.order_code = #{orderCode}</if>
+        <if test="userId != null "> and ff.user_id = #{userId}</if>
+        <if test="companyUserName != null "> and cu.nick_name = #{companyUserName}</if>
+        <if test="doctorAccount != null "> and fd.account = #{doctorAccount}</if>
+        <if test="pushStatus != null "> and ff.push_status = #{pushStatus}</if>
+        <if test="companyId != null "> and ff.company_id = #{companyId}</if>
+        <if test="companyUserId != null "> and ff.company_user_id = #{companyUserId}</if>
+        <if test="writeStatus != null "> and ff.write_status = #{writeStatus}</if>
+        <if test="sTime != null ">  and DATE(ff.plan_time) &gt;= DATE(#{sTime})</if>
+        <if test="eTime != null ">  and DATE(ff.plan_time) &lt;= DATE(#{eTime})</if>
+    </select>
+
+</mapper>

fs-service-system/src/main/resources/mapper/store/FsFollowTempMapper.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.store.mapper.FsFollowTempMapper">
+
+    <resultMap type="FsFollowTemp" id="FsFollowTempResult">
+        <result property="tempId"    column="temp_id"    />
+        <result property="name"    column="name"    />
+        <result property="secondName"    column="second_name"    />
+        <result property="formJson"    column="form_json"    />
+        <result property="sort"    column="sort"    />
+        <result property="status"    column="status"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectFsFollowTempVo">
+        select temp_id, name, second_name, form_json, sort, status, create_by, create_time, update_by, update_time from fs_follow_temp
+    </sql>
+
+    <select id="selectFsFollowTempList" parameterType="FsFollowTemp" resultMap="FsFollowTempResult">
+        <include refid="selectFsFollowTempVo"/>
+        <where>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="secondName != null  and secondName != ''"> and second_name like concat('%', #{secondName}, '%')</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+        </where>
+        order by sort,temp_id desc
+    </select>
+
+    <select id="selectFsFollowTempByTempId" parameterType="Long" resultMap="FsFollowTempResult">
+        <include refid="selectFsFollowTempVo"/>
+        where temp_id = #{tempId}
+    </select>
+
+    <insert id="insertFsFollowTemp" parameterType="FsFollowTemp">
+        insert into fs_follow_temp
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="tempId != null">temp_id,</if>
+            <if test="name != null">name,</if>
+            <if test="secondName != null">second_name,</if>
+            <if test="formJson != null">form_json,</if>
+            <if test="sort != null">sort,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="tempId != null">#{tempId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="secondName != null">#{secondName},</if>
+            <if test="formJson != null">#{formJson},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFsFollowTemp" parameterType="FsFollowTemp">
+        update fs_follow_temp
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="name != null">name = #{name},</if>
+            <if test="secondName != null">second_name = #{secondName},</if>
+            <if test="formJson != null">form_json = #{formJson},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where temp_id = #{tempId}
+    </update>
+
+    <delete id="deleteFsFollowTempByTempId" parameterType="Long">
+        delete from fs_follow_temp where temp_id = #{tempId}
+    </delete>
+
+    <delete id="deleteFsFollowTempByTempIds" parameterType="String">
+        delete from fs_follow_temp where temp_id in
+        <foreach item="tempId" collection="array" open="(" separator="," close=")">
+            #{tempId}
+        </foreach>
+    </delete>
+</mapper>

fs-service-system/src/main/resources/mapper/store/FsIntegralGoodsMapper.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.store.mapper.FsIntegralGoodsMapper">
+
+    <resultMap type="FsIntegralGoods" id="FsIntegralGoodsResult">
+        <result property="goodsId"    column="goods_id"    />
+        <result property="imgUrl"    column="img_url"    />
+        <result property="images"    column="images"    />
+        <result property="goodsName"    column="goods_name"    />
+        <result property="otPrice"    column="ot_price"    />
+        <result property="goodsType"    column="goods_type"    />
+        <result property="status"    column="status"    />
+        <result property="integral"    column="integral"    />
+        <result property="sort"    column="sort"    />
+        <result property="stock"    column="stock"    />
+        <result property="descs"    column="descs"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="barCode"    column="bar_code"    />
+    </resultMap>
+
+    <sql id="selectFsIntegralGoodsVo">
+        select goods_id, img_url, images,bar_code, goods_name, ot_price, goods_type, status, integral, sort, stock, descs, create_time from fs_integral_goods
+    </sql>
+
+    <select id="selectFsIntegralGoodsList" parameterType="FsIntegralGoods" resultMap="FsIntegralGoodsResult">
+        <include refid="selectFsIntegralGoodsVo"/>
+        <where>
+            <if test="goodsName != null  and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
+            <if test="goodsType != null "> and goods_type = #{goodsType}</if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="integral != null "> and integral = #{integral}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+        </where>
+    </select>
+
+    <select id="selectFsIntegralGoodsByGoodsId" parameterType="Long" resultMap="FsIntegralGoodsResult">
+        <include refid="selectFsIntegralGoodsVo"/>
+        where goods_id = #{goodsId}
+    </select>
+
+    <insert id="insertFsIntegralGoods" parameterType="FsIntegralGoods">
+        insert into fs_integral_goods
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="goodsId != null">goods_id,</if>
+            <if test="imgUrl != null and imgUrl != ''">img_url,</if>
+            <if test="images != null">images,</if>
+            <if test="goodsName != null and goodsName != ''">goods_name,</if>
+            <if test="otPrice != null">ot_price,</if>
+            <if test="goodsType != null">goods_type,</if>
+            <if test="status != null">status,</if>
+            <if test="integral != null">integral,</if>
+            <if test="sort != null">sort,</if>
+            <if test="stock != null">stock,</if>
+            <if test="descs != null">descs,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="barCode != null">bar_code,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="goodsId != null">#{goodsId},</if>
+            <if test="imgUrl != null and imgUrl != ''">#{imgUrl},</if>
+            <if test="images != null">#{images},</if>
+            <if test="goodsName != null and goodsName != ''">#{goodsName},</if>
+            <if test="otPrice != null">#{otPrice},</if>
+            <if test="goodsType != null">#{goodsType},</if>
+            <if test="status != null">#{status},</if>
+            <if test="integral != null">#{integral},</if>
+            <if test="sort != null">#{sort},</if>
+            <if test="stock != null">#{stock},</if>
+            <if test="descs != null">#{descs},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="barCode != null">#{barCode},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFsIntegralGoods" parameterType="FsIntegralGoods">
+        update fs_integral_goods
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="imgUrl != null and imgUrl != ''">img_url = #{imgUrl},</if>
+            <if test="images != null">images = #{images},</if>
+            <if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if>
+            <if test="otPrice != null">ot_price = #{otPrice},</if>
+            <if test="goodsType != null">goods_type = #{goodsType},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="integral != null">integral = #{integral},</if>
+            <if test="sort != null">sort = #{sort},</if>
+            <if test="stock != null">stock = #{stock},</if>
+            <if test="descs != null">descs = #{descs},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="barCode != null">bar_code = #{barCode},</if>
+        </trim>
+        where goods_id = #{goodsId}
+    </update>
+
+    <delete id="deleteFsIntegralGoodsByGoodsId" parameterType="Long">
+        delete from fs_integral_goods where goods_id = #{goodsId}
+    </delete>
+
+    <delete id="deleteFsIntegralGoodsByGoodsIds" parameterType="String">
+        delete from fs_integral_goods where goods_id in
+        <foreach item="goodsId" collection="array" open="(" separator="," close=")">
+            #{goodsId}
+        </foreach>
+    </delete>
+</mapper>

fs-service-system/src/main/resources/mapper/store/FsIntegralOrderMapper.xml

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.store.mapper.FsIntegralOrderMapper">
+
+    <resultMap type="FsIntegralOrder" id="FsIntegralOrderResult">
+        <result property="orderId"    column="order_id"    />
+        <result property="orderCode"    column="order_code"    />
+        <result property="userId"    column="user_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userPhone"    column="user_phone"    />
+        <result property="userAddress"    column="user_address"    />
+        <result property="itemJson"    column="item_json"    />
+        <result property="integral"    column="integral"    />
+        <result property="status"    column="status"    />
+        <result property="deliveryCode"    column="delivery_code"    />
+        <result property="deliveryName"    column="delivery_name"    />
+        <result property="deliverySn"    column="delivery_sn"    />
+        <result property="deliveryTime"    column="delivery_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="remark"    column="remark"    />
+        <result property="barCode"    column="bar_code"    />
+    </resultMap>
+
+    <sql id="selectFsIntegralOrderVo">
+        select order_id, order_code, user_id,bar_code, user_name, user_phone, user_address, item_json, integral, status, delivery_code, delivery_name, delivery_sn, delivery_time, create_time, remark from fs_integral_order
+    </sql>
+
+    <select id="selectFsIntegralOrderList" parameterType="FsIntegralOrder" resultMap="FsIntegralOrderResult">
+        <include refid="selectFsIntegralOrderVo"/>
+        <where>
+            <if test="orderCode != null  and orderCode != ''"> and order_code = #{orderCode}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
+            <if test="integral != null  and integral != ''"> and integral = #{integral}</if>
+            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="deliverySn != null  and deliverySn != ''"> and delivery_sn like concat('%', #{deliverySn}, '%')</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+        </where>
+    </select>
+
+    <select id="selectFsIntegralOrderByOrderId" parameterType="Long" resultMap="FsIntegralOrderResult">
+        <include refid="selectFsIntegralOrderVo"/>
+        where order_id = #{orderId}
+    </select>
+
+    <insert id="insertFsIntegralOrder" parameterType="FsIntegralOrder" useGeneratedKeys="true" keyProperty="orderId">
+        insert into fs_integral_order
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderCode != null">order_code,</if>
+            <if test="userId != null">user_id,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="userPhone != null">user_phone,</if>
+            <if test="userAddress != null">user_address,</if>
+            <if test="itemJson != null">item_json,</if>
+            <if test="integral != null">integral,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="deliveryCode != null">delivery_code,</if>
+            <if test="deliveryName != null">delivery_name,</if>
+            <if test="deliverySn != null">delivery_sn,</if>
+            <if test="deliveryTime != null">delivery_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="remark != null">remark,</if>
+            <if test="barCode != null">bar_code,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">#{orderId},</if>
+            <if test="orderCode != null">#{orderCode},</if>
+            <if test="userId != null">#{userId},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="userPhone != null">#{userPhone},</if>
+            <if test="userAddress != null">#{userAddress},</if>
+            <if test="itemJson != null">#{itemJson},</if>
+            <if test="integral != null">#{integral},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="deliveryCode != null">#{deliveryCode},</if>
+            <if test="deliveryName != null">#{deliveryName},</if>
+            <if test="deliverySn != null">#{deliverySn},</if>
+            <if test="deliveryTime != null">#{deliveryTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="barCode != null">#{barCode},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFsIntegralOrder" parameterType="FsIntegralOrder">
+        update fs_integral_order
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderCode != null">order_code = #{orderCode},</if>
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="userPhone != null">user_phone = #{userPhone},</if>
+            <if test="userAddress != null">user_address = #{userAddress},</if>
+            <if test="itemJson != null">item_json = #{itemJson},</if>
+            <if test="integral != null">integral = #{integral},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="deliveryCode != null">delivery_code = #{deliveryCode},</if>
+            <if test="deliveryName != null">delivery_name = #{deliveryName},</if>
+            <if test="deliverySn != null">delivery_sn = #{deliverySn},</if>
+            <if test="deliveryTime != null">delivery_time = #{deliveryTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="barCode != null">bar_code = #{barCode},</if>
+        </trim>
+        where order_id = #{orderId}
+    </update>
+
+    <delete id="deleteFsIntegralOrderByOrderId" parameterType="Long">
+        delete from fs_integral_order where order_id = #{orderId}
+    </delete>
+
+    <delete id="deleteFsIntegralOrderByOrderIds" parameterType="String">
+        delete from fs_integral_order where order_id in
+        <foreach item="orderId" collection="array" open="(" separator="," close=")">
+            #{orderId}
+        </foreach>
+    </delete>
+</mapper>

fs-user-app/src/main/resources/application.yml

@@ -63,7 +63,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: dev
-    #    active: druid
+    #    active: druid-fby
     include: config
   # 文件上传
   servlet: