diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java index 1b5115e94..c0fc78090 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/controller/ClientController.java @@ -1,16 +1,19 @@ package com.ruoyi.system.fantang.controller; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.fantang.domain.FtStaffInfoDao; import com.ruoyi.system.fantang.service.IFtConfigDaoService; +import com.ruoyi.system.fantang.service.IFtOrderDaoService; import com.ruoyi.system.fantang.service.IFtStaffDemandDaoService; import com.ruoyi.system.fantang.service.IFtStaffInfoDaoService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.List; import java.util.Map; @@ -30,6 +33,9 @@ public class ClientController extends BaseController { @Autowired private IFtStaffDemandDaoService staffDemandDaoService; + @Autowired + private IFtOrderDaoService orderDaoService; + @GetMapping("/getDinnerTimeSetting") public AjaxResult getDinnerTimeSetting() { return AjaxResult.success(iFtConfigDaoService.getDinnerTimeSetting()); @@ -41,7 +47,7 @@ public class ClientController extends BaseController { } @GetMapping("/getWeekMenu") - public AjaxResult getWeekMenu(){ + public AjaxResult getWeekMenu() { return AjaxResult.success("调用每周菜谱成功"); } @@ -50,16 +56,29 @@ public class ClientController extends BaseController { return AjaxResult.success("调用有效订单成功"); } + /** + * 推送订单信息 + * + * @param params + * @return + */ @PostMapping("/PostOrder") - public AjaxResult postOrder() { + public AjaxResult postOrder(JSONArray params) { +// for(int i : params.size()) { +// +// } +// Long staffId = params.getLong("staffId"); +// Integer type = params.getInteger("type"); +// Date demandDate = params.getDate("demandDate"); +// orderDaoService.postOrder(); + return AjaxResult.success("调用提交订单成功"); } // 获取配置信息 @GetMapping("/getConfiguration/{staffId}") - public AjaxResult getConfiguration(@PathVariable("staffId") Integer staffId) { - staffDemandDaoService.getConfiguration(staffId); - return AjaxResult.success("调用个人配置"); + public AjaxResult getConfiguration(@PathVariable("staffId") Long staffId) { + return AjaxResult.success(staffDemandDaoService.getConfiguration(staffId)); } // 获取配置信息 @@ -73,6 +92,7 @@ public class ClientController extends BaseController { public AjaxResult login(String tel, String password) { return staffInfoDaoService.login(tel, password); } + @PostMapping("/logout/{staffId}") public AjaxResult logout(@PathVariable("staffId") Long staffId) { staffInfoDaoService.logout(staffId); @@ -93,18 +113,22 @@ public class ClientController extends BaseController { public AjaxResult getOtherProduct() { return null; } + @PostMapping("/postProductOrder") public AjaxResult postProductOrder() { return null; } + @PostMapping("/postCurrentOrder") public AjaxResult postCurrentOrder() { return null; } + @PostMapping("/postStopOrder") public AjaxResult postStopOrder() { return null; } + @PostMapping("/postRestoreOrder") public AjaxResult postRestoreOrder() { return null; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java index b892b5120..4dd1fd3cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/domain/FtStaffInfoDao.java @@ -128,5 +128,5 @@ public class FtStaffInfoDao { private Boolean loginFlag; - private Long expiredFlag; + private String expired; } \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java index c14f2cb70..f80cf3230 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/mapper/FtStaffInfoDaoMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.system.fantang.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.system.fantang.domain.FtStaffInfoDao; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -16,4 +17,7 @@ public interface FtStaffInfoDaoMapper extends BaseMapper { @Select("SELECT a.*, b.depart_name from ft_staff_info a LEFT JOIN ft_depart b on a.depart_id = b.depart_id where staff_type = 1") List selectStaffInfoWithDepart(); + + @Update("update ft_staff_info set token=#{token}, login_flag=1 where staff_id=#{staff_id}") + void updateLoginStatus(FtStaffInfoDao dao); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java index a2eb747df..9e46b453f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/IFtStaffDemandDaoService.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IFtStaffDemandDaoService extends IService { - AjaxResult getConfiguration(Integer staffId); + AjaxResult getConfiguration(Long staffId); AjaxResult setDemandMode(Long id, Boolean demandModeFlag); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java index 65aa3a6ca..22140d422 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffDemandDaoServiceImpl.java @@ -18,7 +18,7 @@ import com.ruoyi.system.fantang.service.IFtStaffDemandDaoService; public class FtStaffDemandDaoServiceImpl extends ServiceImpl implements IFtStaffDemandDaoService { @Override - public AjaxResult getConfiguration(Integer staffId) { + public AjaxResult getConfiguration(Long staffId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("staff_id", staffId); FtStaffDemandDao dao = this.baseMapper.selectOne(wrapper); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java index 42bee926d..6a4f782a4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/fantang/service/impl/FtStaffInfoDaoServiceImpl.java @@ -36,7 +36,7 @@ public class FtStaffInfoDaoServiceImpl extends ServiceImpl