用户信息删除后 重新录入问题 修改

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

@@ -61,7 +61,9 @@ public class FsUserInfoController extends AppBaseController {
         FsUserInfo fsUserInfo = fsUserInfoService.selectFsUserInfoById(userId);
         if (fsUserInfo == null) {
             return R.error("用户不存在");
-        } else {
+        } else if(fsUserInfo.getIsDel()!=0){
+            return R.error("用户信息已删除");
+        }else{
             if(fsUserInfo.getBirthdate()!=null){
                 fsUserInfo.setAge(DateUtils.getAge(fsUserInfo.getBirthdate()));
             }
@@ -69,6 +71,7 @@ public class FsUserInfoController extends AppBaseController {
         return R.ok().put("data", fsUserInfo);
     }
 
+
     /**
      * 新增用户信息
      */
@@ -100,7 +103,7 @@ public class FsUserInfoController extends AppBaseController {
     @Transactional
     public R remove(@RequestParam("userId") Long userId) {
         // 更新fsUser表状态
-        if (fsUserService.deleteFsUserByUserId(userId) <= 0) {
+        if (fsUserInfoService.deleteFsUserInfoByUserId(userId) <= 0) {
             return R.error("用户信息删除原表失败");
         }
         return R.ok();

fs-service/src/main/java/com/fs/his/domain/FsUserInfo.java

@@ -220,4 +220,6 @@ public class FsUserInfo extends BaseEntity {
     @ApiModelProperty("健康建议")
     private String healthSuggestions;
 
+    private Integer isDel;
+
 }

fs-service/src/main/java/com/fs/his/domain/FsUserItinerary.java

@@ -36,6 +36,9 @@ public class FsUserItinerary extends BaseEntity{
     @ApiModelProperty("行程日期")
     private Date itineraryDate;
 
+    /** 行程类型 0-今天 1-行程开始 2-行程结束 3-待完成*/
+    private Integer status;
+
     /** 行程时间 */
     @JsonFormat(pattern = "HH:mm:ss")
     @ApiModelProperty("行程时间")

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

@@ -48,4 +48,7 @@ public interface FsUserInfoMapper extends BaseMapper<FsUserInfo> {
     FsUserInfo selectFsUserInfoByPhone(String phone);
 
     FsUserInfo selectFsUserInfoByIdOnle(Long userId);
+
+
+    int deleteFsUserInfoByUserId(Long userId);
 }

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

@@ -46,4 +46,6 @@ public interface IFsUserInfoService extends IService<FsUserInfo> {
     void updateFsUserInfo(FsUserInfo fsUserInfo);
 
     void add(FsUserInfo fsUserInfo);
+
+    int deleteFsUserInfoByUserId(Long userId);
 }

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

@@ -518,7 +518,7 @@ public class FsUserHealthDataServiceImpl extends ServiceImpl<FsUserHealthDataMap
             // 查询用户信息获取 性别
             FsUserInfo fsUserInfo = fsUserInfoService.selectFsUserInfoById(fsUserHealthProfile.getUserId());
             if (fsUserInfo == null || fsUserInfo.getSex()==null) {
-                throw new ServiceException("用户已注销或健康档案未维护性别不存在");
+                throw new ServiceException("用户已注销或基础信息未维护性别不存在");
             }
 
             /** 测量类型（0-腰围，1-臀围，2-血糖，3-血压，4-尿酸 5-BMI） */

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

@@ -1,7 +1,6 @@
 package com.fs.his.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fs.common.core.domain.R;
 import com.fs.common.exception.ServiceException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
@@ -17,8 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
-import static com.fs.his.utils.PhoneUtil.encryptPhone;
-
 /**
  * 用户信息Service业务层处理
  *
@@ -77,46 +74,49 @@ public class FsUserInfoServiceImpl extends ServiceImpl<FsUserInfoMapper, FsUserI
     @Override
     @Transactional
     public void updateFsUserInfo(FsUserInfo fsUserInfo) {
-        // 微信小程序的用户 没有登录fs_user表
+        // 微信小程序的用户 没有登录fs_user_info表 更新做插入
         FsUser userQuery = fsUserService.selectFsUserById(fsUserInfo.getUserId());
-        if(userQuery==null){
+        if (userQuery == null || userQuery.getIsDel() == 1) {
             throw new ServiceException("用户已注销或不存在");
         }
 
         FsUserInfo userInfo = baseMapper.selectFsUserInfoByIdOnle(fsUserInfo.getUserId());
-        if(userInfo==null){
-            if(StringUtils.isEmpty(fsUserInfo.getPhone())){
+        if (userInfo == null) {// 没有记录需要登记
+            if (StringUtils.isEmpty(fsUserInfo.getPhone())) {
                 throw new ServiceException("手机号不能为空");
             }
 
             // 查询手机号
             FsUserInfo queryByPhone = baseMapper.selectFsUserInfoByPhone(fsUserInfo.getPhone());
-            if(queryByPhone!=null){
+            if (queryByPhone != null) {
                 throw new ServiceException("该手机号用户已存在");
             }
 
             // 需登记FsUserInfo 信息
-            if (baseMapper.insertFsUserInfo(fsUserInfo)<=0){
+            if (baseMapper.insertFsUserInfo(fsUserInfo) <= 0) {
                 throw new ServiceException("用户信息登记失败");
             }
-        }else {
+        } else {
             // 若手机号有修改 需校验手机号是否已存在 且不修改fs_user表的手机号
-            if(StringUtils.isNotEmpty(fsUserInfo.getPhone())){
-                if(!userInfo.getPhone().equals(fsUserInfo.getPhone())){// 若要修改手机号需要验证新的手机号是否存在
+            if (StringUtils.isNotEmpty(fsUserInfo.getPhone())) {
+                if (!userInfo.getPhone().equals(fsUserInfo.getPhone())) {// 若要修改手机号需要验证新的手机号是否存在
                     FsUserInfo queryByPhone = baseMapper.selectFsUserInfoByPhone(fsUserInfo.getPhone());
-                    if(queryByPhone!=null){
+                    if (queryByPhone != null) {
                         throw new ServiceException("该手机号用户已存在");
                     }
                 }
             }
+            if (userInfo.getIsDel() != 0) {// 用户被伪删除
+                fsUserInfo.setIsDel(0);// 恢复
+            }
             fsUserInfo.setUpdateTime(DateUtils.getNowDate());
-            if(baseMapper.updateFsUserInfo(fsUserInfo)<=0){
+            if (baseMapper.updateFsUserInfo(fsUserInfo) <= 0) {
                 throw new ServiceException("用户信息修改失败");
             }
         }
 
         // 更新用户信息 不修改手机号
-        if(StringUtils.isNotEmpty(fsUserInfo.getAvatar()) || fsUserInfo.getSex()!= null || fsUserInfo.getCompanyUserId()!= null) {
+        if (StringUtils.isNotEmpty(fsUserInfo.getAvatar()) || fsUserInfo.getSex() != null || fsUserInfo.getCompanyUserId() != null) {
             FsUser user = new FsUser();
             user.setUserId(fsUserInfo.getUserId());
             user.setAvatar(fsUserInfo.getAvatar());
@@ -129,6 +129,38 @@ public class FsUserInfoServiceImpl extends ServiceImpl<FsUserInfoMapper, FsUserI
         }
     }
 
+
+    private void updateUser(FsUserInfo fsUserInfo, FsUser user) {
+        // 判断头像和姓名 性别是否一致 销售id
+        boolean updateFlag = false;
+        if (StringUtils.isNotEmpty(fsUserInfo.getAvatar())) {
+            if (!fsUserInfo.getAvatar().equals(user.getAvatar())) {
+                updateFlag = true;
+            }
+        }
+        if (fsUserInfo.getSex() != null) {
+            if (!fsUserInfo.getSex().equals(user.getSex())) {
+                updateFlag = true;
+            }
+        }
+        if (fsUserInfo.getCompanyUserId() != null) {
+            if (!fsUserInfo.getCompanyUserId().equals(user.getCompanyUserId())) {
+                updateFlag = true;
+            }
+        }
+
+        if (updateFlag) {
+            // 更新用户信息 不修改手机号
+            user.setAvatar(fsUserInfo.getAvatar());
+            user.setSex(fsUserInfo.getSex());
+            user.setCompanyUserId(fsUserInfo.getCompanyUserId());
+            user.setUpdateTime(DateUtils.getNowDate());
+            if (fsUserMapper.updateFsUser(user) <= 0) {
+                throw new ServiceException("用户信息修改失败");
+            }
+        }
+    }
+
     /**
      * @Description: 新增用户
      * @Param:
@@ -141,78 +173,82 @@ public class FsUserInfoServiceImpl extends ServiceImpl<FsUserInfoMapper, FsUserI
     public void add(FsUserInfo fsUserInfo) {
 
         // 判断手机号是否已经存在
-        if(StringUtils.isEmpty(fsUserInfo.getPhone())){
+        if (StringUtils.isEmpty(fsUserInfo.getPhone())) {
             throw new ServiceException("手机号不能为空");
         }
         // 查询手机号
-        FsUserInfo userInfo = baseMapper.selectFsUserInfoByPhone(fsUserInfo.getPhone());
-        if(userInfo!=null){
-            throw new ServiceException("该手机号用户已存在");
-        }
         FsUser user;
-        if(fsUserInfo.getUserId()!=null){ // 根据userId 绑定用户信息
-            user=fsUserService.selectFsUserById(fsUserInfo.getUserId());
-            if(user==null){
-                throw new ServiceException("该用户id不存在");
+        FsUserInfo userInfo = baseMapper.selectFsUserInfoByPhone(fsUserInfo.getPhone());
+        if (userInfo != null) {// 用户存在
+            if (userInfo.getIsDel() == 0) {
+                throw new ServiceException("该手机号用户已存在");
             }
-        }else { // 根据手机号 绑定用户信息
-            user = fsUserService.selectFsUserByPhone(fsUserInfo.getPhone());
-        }
-        if(user!=null){
-            // 判断头像和姓名 性别是否一致 销售id
-            boolean updateFlag=false;
-            if(StringUtils.isNotEmpty(fsUserInfo.getAvatar())){
-                if(!fsUserInfo.getAvatar().equals(user.getAvatar())){
-                    updateFlag=true;
+            {// 用户被删除重新新增
+                // 查询原用户信息
+                user = fsUserService.selectFsUserById(userInfo.getUserId());
+                if (user == null || user.getIsDel() != 0) {
+                    throw new ServiceException("该用户id不存在或已注销");
                 }
-            }
-            if(fsUserInfo.getSex()!= null){
-                if(!fsUserInfo.getSex().equals(user.getSex())){
-                    updateFlag=true;
+                // 更新用户信息
+                updateUser(fsUserInfo, user);
+
+                // 更新用户信息
+                fsUserInfo.setUserId(user.getUserId());
+                fsUserInfo.setIsDel(0);
+                if (baseMapper.updateFsUserInfo(fsUserInfo) <= 0) {
+                    throw new ServiceException("用户信息登记失败");
                 }
             }
-            if(fsUserInfo.getCompanyUserId()!= null){
-                if(!fsUserInfo.getCompanyUserId().equals(user.getCompanyUserId())){
-                    updateFlag=true;
+        } else {// 用户不存在
+            // 判断原FsUser是否存在记录
+            if (fsUserInfo.getUserId() != null) { // 客户端根据userId 绑定用户信息
+                user = fsUserService.selectFsUserById(fsUserInfo.getUserId());
+                if (user == null) {
+                    throw new ServiceException("该用户id不存在");
                 }
+            } else { // 根据手机号 绑定用户信息
+                user = fsUserService.selectFsUserByPhone(fsUserInfo.getPhone());
             }
+            if (user != null) {
+                if (user.getIsDel() != 0) {
+                    throw new ServiceException("该用户已注销");
+                }
+
+                // 更新用户信息
+                updateUser(fsUserInfo, user);
 
-            if(updateFlag) {
-                // 更新用户信息 不修改手机号
-                user.setAvatar(fsUserInfo.getAvatar());
-                user.setSex(fsUserInfo.getSex());
-                user.setCompanyUserId(fsUserInfo.getCompanyUserId());
-                user.setUpdateTime(DateUtils.getNowDate());
-                if (fsUserMapper.updateFsUser(user) <= 0) {
-                    throw new ServiceException("用户信息修改失败");
+                // 登记同一个userId
+                fsUserInfo.setUserId(user.getUserId());
+                if (insertFsUserInfo(fsUserInfo) <= 0) {
+                    throw new ServiceException("用户信息登记失败");
                 }
-            }
-            // 登记同一个userId
-            fsUserInfo.setUserId(user.getUserId());
-            if (insertFsUserInfo(fsUserInfo) <= 0) {
-                throw new ServiceException("用户信息登记失败");
-            }
 
-        }else {
-            // 新增用户信息
-            FsUser fsUser = new FsUser();
-            fsUser.setCompanyUserId(fsUserInfo.getCompanyUserId());
-            fsUser.setAvatar(fsUserInfo.getAvatar());
-            fsUser.setPhone(fsUserInfo.getPhone());
-            fsUser.setSex(fsUserInfo.getSex());
-            fsUser.setCreateTime(DateUtils.getNowDate());
-            // 登记fsUser表
-            if (fsUserMapper.insertFsUser(fsUser) <= 0) {
-                throw new ServiceException("用户信息登记失败");
-            }
-            // 登记同一个userId
-            fsUserInfo.setUserId(fsUser.getUserId());
-            // 登记fsUserInfo表
-            if (insertFsUserInfo(fsUserInfo) <= 0) {
-                throw new ServiceException("用户信息登记失败");
-            }
+            } else {
+                // 新增用户信息
+                FsUser fsUser = new FsUser();
+                fsUser.setCompanyUserId(fsUserInfo.getCompanyUserId());
+                fsUser.setAvatar(fsUserInfo.getAvatar());
+                fsUser.setPhone(fsUserInfo.getPhone());
+                fsUser.setSex(fsUserInfo.getSex());
+                fsUser.setCreateTime(DateUtils.getNowDate());
+                // 登记fsUser表
+                if (fsUserMapper.insertFsUser(fsUser) <= 0) {
+                    throw new ServiceException("用户信息登记失败");
+                }
+                // 登记同一个userId
+                fsUserInfo.setUserId(fsUser.getUserId());
+                // 登记fsUserInfo表
+                if (insertFsUserInfo(fsUserInfo) <= 0) {
+                    throw new ServiceException("用户信息登记失败");
+                }
 
+            }
         }
     }
 
+    @Override
+    public int deleteFsUserInfoByUserId(Long userId) {
+        return baseMapper.deleteFsUserInfoByUserId(userId);
+    }
+
 }

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

@@ -1,5 +1,7 @@
 package com.fs.his.service.impl;
 
+import java.text.ParseException;
+import java.util.Calendar;
 import java.util.List;
 import com.fs.common.utils.DateUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -39,7 +41,37 @@ public class FsUserItineraryServiceImpl extends ServiceImpl<FsUserItineraryMappe
     @Override
     public List<FsUserItinerary> selectFsUserItineraryList(FsUserItinerary fsUserItinerary)
     {
-        return baseMapper.selectFsUserItineraryList(fsUserItinerary);
+        List<FsUserItinerary> list =baseMapper.selectFsUserItineraryList(fsUserItinerary);
+        // 状态处理
+        list.forEach(item -> {
+            // 如果时间在今天之前
+            // 行程类型 0-今天 1-行程开始 2-行程结束 3-待完成
+            try {
+                if(DateUtils.truncatedCompareTo(DateUtils.parseDate("2025-09-06", "yyyy-MM-dd"), DateUtils.getNowDate(), Calendar.DATE) < 0){
+                    item.setStatus(2); // 已结束
+                }else if (DateUtils.truncatedCompareTo(item.getItineraryDate(), DateUtils.getNowDate(), Calendar.DATE) == 0){
+                    // 判断时间
+                    if(DateUtils.truncatedCompareTo(item.getItineraryTime(), DateUtils.getNowDate(), Calendar.SECOND) < 0){}
+                }
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return list;
+    }
+
+    public static void main(String[] args) {
+        try {
+            System.out.println(DateUtils.parseDate("24:59:00", "HH:mm:ss"));
+            System.out.println(DateUtils.getNowDate());
+            String currentDate = DateUtils.parseDateToStr("yyyy-MM-dd",DateUtils.getNowDate());
+
+            // 拼接完整日期时间字符串
+            String dateTimeStr = currentDate + " " + "17:15:00";
+            System.out.println(DateUtils.truncatedCompareTo(DateUtils.parseDate(dateTimeStr, "yyyy-MM-dd HH:mm:ss"), DateUtils.getNowDate(), Calendar.MINUTE));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**

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

@@ -39,6 +39,7 @@
         <result property="healthSuggestions" column="health_suggestions"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="isDel" column="is_del"/>
     </resultMap>
 
     <sql id="selectFsUserInfoVo">
@@ -75,9 +76,13 @@
                problems_to_solve,
                health_suggestions,
                create_time,
-               update_time
+               update_time,
+               is_del
         from fs_user_info
     </sql>
+    <update id="deleteFsUserInfoByUserId">
+        update fs_user_info set is_del=1 where user_id=#{userId}
+    </update>
 
     <!-- 根据企业用户信息查询用户列表信息   -->
     <select id="selectFsUserInfoList" resultMap="FsUserInfoResult">
@@ -116,7 +121,7 @@
                 fs.avatar
             from fs_user_info info
                 right join fs_user fs on info.user_id = fs.user_id
-            where fs.is_del=0
+            where fs.is_del=0 and info.is_del=0
                 <if test="companyUserId != null and companyUserId != ''">
                     and fs.company_user_id = #{companyUserId}
                 </if>
@@ -156,7 +161,8 @@
                 info.problems_to_solve,
                 info.health_suggestions,
                 info.create_time,
-                fs.avatar
+                fs.avatar,
+                info.is_del
          from fs_user_info info
          right join fs_user fs on info.user_id = fs.user_id
          where fs.user_id = #{userId} and fs.is_del=0
@@ -281,6 +287,7 @@
             <if test="healthSuggestions != null">health_suggestions = #{healthSuggestions},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel !=null">is_del = #{isDel},</if>
         </trim>
         where user_id = #{userId}
     </update>

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

@@ -72,18 +72,4 @@ public class FsUserInfoController extends AppBaseController {
         return R.ok();
     }
 
-    /**
-     * 删除用户信息
-     */
-    @Login
-    @GetMapping("/delete")
-    @ApiOperation("删除用户信息")
-    @Transactional
-    public R remove(@RequestParam("userId") Long userId) {
-        // 更新fsUser表状态
-        if (fsUserService.deleteFsUserByUserId(userId) <= 0) {
-            return R.error("用户信息删除原表失败");
-        }
-        return R.ok();
-    }
 }

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

@@ -1,36 +1,31 @@
 package com.fs.app.controller;
 
-import java.util.List;
-
 import com.fs.app.annotation.Login;
 import com.fs.common.core.domain.R;
+import com.fs.common.utils.DateUtils;
+import com.fs.his.domain.FsUserItinerary;
+import com.fs.his.service.IFsUserItineraryService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.his.domain.FsUserItinerary;
-import com.fs.his.service.IFsUserItineraryService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
+
+import java.text.ParseException;
+import java.time.LocalDate;
+import java.util.Calendar;
+import java.util.List;
 
 /**
  * 用户日期行程Controller
- * 
+ *
  * @author fs
  * @date 2025-09-04
  */
 @RestController
 @RequestMapping("/app/fs/itinerary")
 @Api("用户行程相关接口")
-public class FsUserItineraryController extends AppBaseController
-{
+public class FsUserItineraryController extends AppBaseController {
     @Autowired
     private IFsUserItineraryService fsUserItineraryService;
 
@@ -40,13 +35,20 @@ public class FsUserItineraryController extends AppBaseController
     @Login
     @ApiOperation("查询用户日期行程列表")
     @GetMapping("/list")
-    public R list(FsUserItinerary fsUserItinerary)
-    {
+    public R list(FsUserItinerary fsUserItinerary) {
         startPage();
         List<FsUserItinerary> list = fsUserItineraryService.selectFsUserItineraryList(fsUserItinerary);
-        return R.ok().put("data",  new PageInfo<>(list));
+
+        return R.ok().put("data", new PageInfo<>(list));
     }
 
+    public static void main(String[] args) {
+        try {
+            System.out.println(DateUtils.truncatedCompareTo(DateUtils.parseDate("2025-09-06", "yyyy-MM-dd"), DateUtils.getNowDate(), Calendar.DATE));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     /**
      * 获取用户日期行程详细信息
@@ -54,9 +56,9 @@ public class FsUserItineraryController extends AppBaseController
     @Login
     @ApiOperation("获取用户日期行程详细信息")
     @GetMapping(value = "/info")
-    public R getInfo(@RequestParam("id") Long id)
-    {
+    public R getInfo(@RequestParam("id") Long id) {
         FsUserItinerary fsUserItinerary = fsUserItineraryService.selectFsUserItineraryById(id);
+        // 计算状态
         return R.ok().put("data", fsUserItinerary);
     }
 
@@ -66,9 +68,8 @@ public class FsUserItineraryController extends AppBaseController
     @Login
     @ApiOperation("新增用户日期行程")
     @PostMapping("/add")
-    public R add(@RequestBody FsUserItinerary fsUserItinerary)
-    {
-        if(fsUserItineraryService.insertFsUserItinerary(fsUserItinerary)<=0){
+    public R add(@RequestBody FsUserItinerary fsUserItinerary) {
+        if (fsUserItineraryService.insertFsUserItinerary(fsUserItinerary) <= 0) {
             return R.error("新增用户日期行程失败");
         }
         return R.ok();
@@ -80,9 +81,8 @@ public class FsUserItineraryController extends AppBaseController
     @Login
     @ApiOperation("修改用户日期行程")
     @PostMapping("/update")
-    public R edit(@RequestBody FsUserItinerary fsUserItinerary)
-    {
-        if(fsUserItineraryService.updateFsUserItinerary(fsUserItinerary)<=0){
+    public R edit(@RequestBody FsUserItinerary fsUserItinerary) {
+        if (fsUserItineraryService.updateFsUserItinerary(fsUserItinerary) <= 0) {
             return R.error("修改用户日期行程失败");
         }
         return R.ok();
@@ -93,10 +93,9 @@ public class FsUserItineraryController extends AppBaseController
      */
     @Login
     @ApiOperation("删除用户日期行程")
-	@GetMapping("/delete")
-    public R remove(@RequestParam("id") Long id)
-    {
-        if(fsUserItineraryService.deleteFsUserItineraryById(id)<=0){
+    @GetMapping("/delete")
+    public R remove(@RequestParam("id") Long id) {
+        if (fsUserItineraryService.deleteFsUserItineraryById(id) <= 0) {
             return R.error("删除用户日期行程失败");
         }
         return R.ok();