恢复代码

pz-accompany/src/main/java/com/pz/accompany/EmployeesIncomeController.java

 package com.pz.accompany;
 package com.pz.accompany;
 
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.pz.common.annotation.Log;
-import com.pz.common.annotation.RepeatSubmit;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.controller.BaseController;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.PageQuery;
 import com.pz.common.core.domain.R;
 import com.pz.common.core.domain.R;
 import com.pz.common.core.page.TableDataInfo;
 import com.pz.common.core.page.TableDataInfo;
-import com.pz.common.core.validate.AddGroup;
-import com.pz.common.core.validate.EditGroup;
-import com.pz.common.enums.BusinessType;
-import com.pz.common.utils.poi.ExcelUtil;
-import com.pz.merchant.domain.Employees;
 import com.pz.merchant.domain.vo.EmployeesVo;
 import com.pz.merchant.domain.vo.EmployeesVo;
-import com.pz.merchant.mapper.EmployeesMapper;
 import com.pz.merchant.service.IEmployeesService;
 import com.pz.merchant.service.IEmployeesService;
-import com.pz.system.domain.bo.ArticleBo;
-import com.pz.system.domain.bo.DoctorBo;
 import com.pz.system.domain.bo.IncomeBo;
 import com.pz.system.domain.bo.IncomeBo;
-import com.pz.system.domain.vo.ArticleVo;
-import com.pz.system.domain.vo.DoctorVo;
 import com.pz.system.domain.vo.IncomeVo;
 import com.pz.system.domain.vo.IncomeVo;
-import com.pz.system.service.IArticleService;
 import com.pz.system.service.IIncomeService;
 import com.pz.system.service.IIncomeService;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-import java.util.Arrays;
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 /**
 /**
  * 陪诊员-财务收益
  * 陪诊员-财务收益

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -319,8 +319,9 @@ public class EmployeesServiceImpl implements IEmployeesService {
     public TodayOrderListVo queryEmployeesInfo(Integer emId) {
     public TodayOrderListVo queryEmployeesInfo(Integer emId) {
         TodayOrderListVo result = baseMapper.selectEmployeesInfoById(emId);
         TodayOrderListVo result = baseMapper.selectEmployeesInfoById(emId);
         QueryWrapper<Employees> query = Wrappers.query();
         QueryWrapper<Employees> query = Wrappers.query();
-        query.apply("date_format(total_order.create_time,'%Y-%m-%d') = current_date")
-            .eq("total_order.em_id", emId);
+        query.apply(" to_days(current_date) = to_days(total_order.create_time)")// 查询当天数据
+            .eq("total_order.em_id", emId)
+            .ne("total_order.business_id", 0);  // 排除商城订单
         IPage<OrderInfoVO> page = baseMapper.selectOrder(new PageQuery().build(), query);
         IPage<OrderInfoVO> page = baseMapper.selectOrder(new PageQuery().build(), query);
         // 根据不同子订单装载就诊人员信息和子订单状态
         // 根据不同子订单装载就诊人员信息和子订单状态
         List<OrderInfoVO> orders = page.getRecords();
         List<OrderInfoVO> orders = page.getRecords();
@@ -347,7 +348,8 @@ public class EmployeesServiceImpl implements IEmployeesService {
     public TableDataInfo<OrderInfoVO> queryAllOrder(OrderBo bo, PageQuery pageQuery) {
     public TableDataInfo<OrderInfoVO> queryAllOrder(OrderBo bo, PageQuery pageQuery) {
         QueryWrapper<Employees> query = Wrappers.query();
         QueryWrapper<Employees> query = Wrappers.query();
         query.eq(bo.getEmId() != null, "total_order.em_id", bo.getEmId())
         query.eq(bo.getEmId() != null, "total_order.em_id", bo.getEmId())
-            .eq(bo.getServiceStatus() != null, "total_order.status", bo.getServiceStatus());
+            .eq(bo.getServiceStatus() != null, "total_order.status", bo.getServiceStatus())
+            .ne("total_order.business_id", 0);  // 排除商城订单
         IPage<OrderInfoVO> page = baseMapper.selectOrder(pageQuery.build(), query);
         IPage<OrderInfoVO> page = baseMapper.selectOrder(pageQuery.build(), query);
         // 根据不同子订单装载就诊人员信息和子订单状态
         // 根据不同子订单装载就诊人员信息和子订单状态
         page.getRecords().forEach(suborder -> {
         page.getRecords().forEach(suborder -> {