From f9edc8af57f8d193d48950ed7141865c929f39d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Thu, 31 Oct 2024 09:22:23 +0800
Subject: [PATCH] 1

---
 fuintAdmin/src/api/allOrder.js                |  2 +-
 .../controller/AllOrderInfoController.java    | 11 ++++++++++
 .../order/service/AllOrderInfoService.java    |  3 +++
 .../service/impl/AllOrderInfoServiceImpl.java | 20 ++++++++++++++++---
 .../repository/mapper/MtStaffMapper.java      |  2 ++
 .../main/resources/mapper/MtStaffMapper.xml   |  3 +++
 6 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/fuintAdmin/src/api/allOrder.js b/fuintAdmin/src/api/allOrder.js
index ff703815f..c6ac65cfb 100644
--- a/fuintAdmin/src/api/allOrder.js
+++ b/fuintAdmin/src/api/allOrder.js
@@ -219,7 +219,7 @@ export function getDicts(dictType) {
 // 根据字典类型查询字典数据信息
 export function getStaffByStorId() {
   return request({
-    url: 'business/allOrderInfo/getStaffByStorId',
+    url: '/business/allOrderInfo/getStaffByStorId',
     method: 'get'
   })
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index c7f282c5f..45221fcd6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -423,4 +423,15 @@ public class AllOrderInfoController extends BaseController {
     public ResponseObject queryByOrderNo(String orderNo){
         return getSuccessResult(allOrderInfoService.queryByOrderNo(orderNo));
     }
+
+    /**
+     * 查询这个油站的所有员工
+     *
+     * @param storeId
+     * @return
+     */
+    @PostMapping("getStaffByStorId")
+    public ResponseObject getStaffByStorId(){
+        return getSuccessResult(allOrderInfoService.getStaffByStorId());
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
index c2292c0e4..50f031823 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
@@ -10,6 +10,7 @@ import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.entity.HandoverRecord;
 import com.fuint.business.order.vo.*;
 import com.fuint.framework.exception.BusinessCheckException;
+import com.fuint.repository.model.MtStaff;
 import com.fuint.system.dept.vo.SysDeptVo;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -203,4 +204,6 @@ AllOrderActivityVo getOneByOrderId(Integer orderId);
     HomeDataShowVo getDataCount(String startTime, String endTime);
 
     Object cashierRefund(Map<String, String> map) throws Exception;
+
+    List<MtStaff> getStaffByStorId();
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 9d8189908..c418d41c0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -96,7 +96,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
     @Autowired
     OilNumberMapper oilNumberMapper;
 
-
+    @Resource
+    private MtUserMapper mtUserMapper;
     @Override
     public Map<String, Object> orderStatistics(AllOrderInfoRes allOrderInfoRes) {
         return allOrderInfoMapper.orderStatistics(allOrderInfoRes);
@@ -769,8 +770,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
     StaffService staffService;
     @Resource
     MemberService memberService;
-    @Resource
-    private MtUserMapper mtUserMapper;
+
 
 
     public AllOrderInfoVo getTradingData(AllOrderInfoDto allOrderInfo) {
@@ -2410,4 +2410,18 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
         }
         return null;
     }
+
+    /**
+     * 根据storid查询员工
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public List getStaffByStorId() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        nowAccountInfo.getStoreId();
+        List<MtStaff> mtStaffs= mtStaffMapper.getStaffByStorId(nowAccountInfo.getStoreId());
+        return mtStaffs;
+    }
 }
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtStaffMapper.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtStaffMapper.java
index e223a40a5..1810e8a77 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtStaffMapper.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/mapper/MtStaffMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 店铺员工表 Mapper 接口
@@ -20,4 +21,5 @@ public interface MtStaffMapper extends BaseMapper<MtStaff> {
 
     MtStaff queryStaffByUserId(@Param("userId") Integer userId);
     MtStaff queryStaffById(@Param("id") Integer id);
+    List getStaffByStorId(@Param("id") Integer id);
 }
diff --git a/fuintBackend/fuint-repository/src/main/resources/mapper/MtStaffMapper.xml b/fuintBackend/fuint-repository/src/main/resources/mapper/MtStaffMapper.xml
index 837d0bc87..c1a61e97d 100644
--- a/fuintBackend/fuint-repository/src/main/resources/mapper/MtStaffMapper.xml
+++ b/fuintBackend/fuint-repository/src/main/resources/mapper/MtStaffMapper.xml
@@ -16,4 +16,7 @@
     <select id="queryStaffById" resultType="com.fuint.repository.model.MtStaff">
         select * from mt_staff t where t.id = #{id}
     </select>
+    <select id="getStaffByStorId" resultType="com.fuint.repository.model.MtStaff">
+        select * from mt_staff t where t.store_id = #{id}
+    </select>
 </mapper>