1
This commit is contained in:
parent
fa8a8181b8
commit
f9edc8af57
@ -219,7 +219,7 @@ export function getDicts(dictType) {
|
|||||||
// 根据字典类型查询字典数据信息
|
// 根据字典类型查询字典数据信息
|
||||||
export function getStaffByStorId() {
|
export function getStaffByStorId() {
|
||||||
return request({
|
return request({
|
||||||
url: 'business/allOrderInfo/getStaffByStorId',
|
url: '/business/allOrderInfo/getStaffByStorId',
|
||||||
method: 'get'
|
method: 'get'
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -423,4 +423,15 @@ public class AllOrderInfoController extends BaseController {
|
|||||||
public ResponseObject queryByOrderNo(String orderNo){
|
public ResponseObject queryByOrderNo(String orderNo){
|
||||||
return getSuccessResult(allOrderInfoService.queryByOrderNo(orderNo));
|
return getSuccessResult(allOrderInfoService.queryByOrderNo(orderNo));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询这个油站的所有员工
|
||||||
|
*
|
||||||
|
* @param storeId
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@PostMapping("getStaffByStorId")
|
||||||
|
public ResponseObject getStaffByStorId(){
|
||||||
|
return getSuccessResult(allOrderInfoService.getStaffByStorId());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -10,6 +10,7 @@ import com.fuint.business.order.entity.CashierOrder;
|
|||||||
import com.fuint.business.order.entity.HandoverRecord;
|
import com.fuint.business.order.entity.HandoverRecord;
|
||||||
import com.fuint.business.order.vo.*;
|
import com.fuint.business.order.vo.*;
|
||||||
import com.fuint.framework.exception.BusinessCheckException;
|
import com.fuint.framework.exception.BusinessCheckException;
|
||||||
|
import com.fuint.repository.model.MtStaff;
|
||||||
import com.fuint.system.dept.vo.SysDeptVo;
|
import com.fuint.system.dept.vo.SysDeptVo;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
@ -203,4 +204,6 @@ AllOrderActivityVo getOneByOrderId(Integer orderId);
|
|||||||
HomeDataShowVo getDataCount(String startTime, String endTime);
|
HomeDataShowVo getDataCount(String startTime, String endTime);
|
||||||
|
|
||||||
Object cashierRefund(Map<String, String> map) throws Exception;
|
Object cashierRefund(Map<String, String> map) throws Exception;
|
||||||
|
|
||||||
|
List<MtStaff> getStaffByStorId();
|
||||||
}
|
}
|
||||||
|
@ -96,7 +96,8 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
|||||||
@Autowired
|
@Autowired
|
||||||
OilNumberMapper oilNumberMapper;
|
OilNumberMapper oilNumberMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private MtUserMapper mtUserMapper;
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Object> orderStatistics(AllOrderInfoRes allOrderInfoRes) {
|
public Map<String, Object> orderStatistics(AllOrderInfoRes allOrderInfoRes) {
|
||||||
return allOrderInfoMapper.orderStatistics(allOrderInfoRes);
|
return allOrderInfoMapper.orderStatistics(allOrderInfoRes);
|
||||||
@ -769,8 +770,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
|||||||
StaffService staffService;
|
StaffService staffService;
|
||||||
@Resource
|
@Resource
|
||||||
MemberService memberService;
|
MemberService memberService;
|
||||||
@Resource
|
|
||||||
private MtUserMapper mtUserMapper;
|
|
||||||
|
|
||||||
|
|
||||||
public AllOrderInfoVo getTradingData(AllOrderInfoDto allOrderInfo) {
|
public AllOrderInfoVo getTradingData(AllOrderInfoDto allOrderInfo) {
|
||||||
@ -2410,4 +2410,18 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据storid查询员工
|
||||||
|
*
|
||||||
|
* @param
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public List getStaffByStorId() {
|
||||||
|
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||||
|
nowAccountInfo.getStoreId();
|
||||||
|
List<MtStaff> mtStaffs= mtStaffMapper.getStaffByStorId(nowAccountInfo.getStoreId());
|
||||||
|
return mtStaffs;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
|||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 店铺员工表 Mapper 接口
|
* 店铺员工表 Mapper 接口
|
||||||
@ -20,4 +21,5 @@ public interface MtStaffMapper extends BaseMapper<MtStaff> {
|
|||||||
|
|
||||||
MtStaff queryStaffByUserId(@Param("userId") Integer userId);
|
MtStaff queryStaffByUserId(@Param("userId") Integer userId);
|
||||||
MtStaff queryStaffById(@Param("id") Integer id);
|
MtStaff queryStaffById(@Param("id") Integer id);
|
||||||
|
List getStaffByStorId(@Param("id") Integer id);
|
||||||
}
|
}
|
||||||
|
@ -16,4 +16,7 @@
|
|||||||
<select id="queryStaffById" resultType="com.fuint.repository.model.MtStaff">
|
<select id="queryStaffById" resultType="com.fuint.repository.model.MtStaff">
|
||||||
select * from mt_staff t where t.id = #{id}
|
select * from mt_staff t where t.id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
<select id="getStaffByStorId" resultType="com.fuint.repository.model.MtStaff">
|
||||||
|
select * from mt_staff t where t.store_id = #{id}
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
Loading…
Reference in New Issue
Block a user