增加通用子订单查询业务接口

pz-system/src/main/java/com/pz/merchant/domain/vo/OrderInfoVO.java

 package com.pz.merchant.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 /**
@@ -46,4 +47,7 @@ public class OrderInfoVO {
      */
     private String userName;
 
+    @JsonIgnore
+    private Integer bid;
+
 }

pz-system/src/main/java/com/pz/merchant/domain/vo/SonOrderVo.java

+package com.pz.merchant.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 子订单数据实体
+ * <p>created in  2023/9/11 17:18
+ *
+ * @author WangMin
+ * @version 1.0
+ */
+@Data
+public class SonOrderVo {
+
+    /**
+     * 就诊人员姓名
+     */
+    private String userName;
+
+    /**
+     * 服务状态，0：已发布，1：已接单，2：已完成，3：退款中 ，4：已退款,6：进行中
+     */
+    private Integer orderStatus;
+
+}

pz-system/src/main/java/com/pz/merchant/service/ISonOrderService.java

+package com.pz.merchant.service;
+
+import com.pz.merchant.domain.vo.SonOrderVo;
+
+/**
+ * 子订单业务
+ * <p>created in  2023/9/11 17:16
+ *
+ * @author WangMin
+ * @version 1.0
+ */
+public interface ISonOrderService {
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    SonOrderVo getSonOrderInfoByTotalId(Integer totalId);
+
+}

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

@@ -62,16 +62,16 @@ public class EmployeesServiceImpl implements IEmployeesService {
         Page<EmployeesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Optional.ofNullable(result.getRecords()).ifPresent(employeesVos -> {
             employeesVos.forEach(employeesVo -> {
-                //获取商户名称
+                // 获取商户名称
                 Optional.ofNullable(companyMapper.selectVoById(employeesVo.getCompanyId()))
                     .ifPresent(companyVo -> employeesVo.setCompanyName(companyVo.getName()));
 
-                //获取用户名称
+                // 获取用户名称
                 Optional.ofNullable(sysUserMapper.selectUserById(employeesVo.getUid().longValue())).ifPresent(
                     sysUser -> employeesVo.setUserName(sysUser.getNickName())
                 );
 
-                //获取城市
+                // 获取城市
                 Optional.ofNullable(cityMapper.selectVoById(employeesVo.getCityId())).ifPresent(
                     cityVo -> employeesVo.setCityName(cityVo.getName())
                 );
@@ -177,7 +177,9 @@ public class EmployeesServiceImpl implements IEmployeesService {
     @Override
     public TodayOrderListVo queryEmployeesInfo(Integer emId) {
         TodayOrderListVo result = baseMapper.selectEmployeesInfoById(emId);
-
+        List<OrderInfoVO> orders = baseMapper.selectTodayOrderByEid(emId);
+        result.setTodayOrderList(orders);
+        result.setTodayOrderNum(orders.size());
         return result;
     }
 

pz-system/src/main/java/com/pz/system/mapper/DbghOrderMapper.java

@@ -2,6 +2,7 @@ package com.pz.system.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.system.domain.DbghOrder;
 import com.pz.system.domain.YypzOrder;
 import com.pz.system.domain.bo.DbghOrderBo;
@@ -9,6 +10,7 @@ import com.pz.system.domain.bo.YypzOrderBo;
 import com.pz.system.domain.vo.DbghOrderVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
 import com.pz.system.domain.vo.YypzOrderVo;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -17,7 +19,15 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2023-09-11
  */
+@Mapper
 public interface DbghOrderMapper extends BaseMapperPlus<DbghOrderMapper, DbghOrder, DbghOrderVo> {
 
     Page<DbghOrderVo> findDbghOrderVoPage(IPage<DbghOrder> iPage, @Param("bo") DbghOrderBo bo);
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/mapper/DbwzOrderMapper.java

@@ -2,6 +2,7 @@ package com.pz.system.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.system.domain.DbghOrder;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.bo.DbghOrderBo;
@@ -9,6 +10,7 @@ import com.pz.system.domain.bo.DbwzOrderBo;
 import com.pz.system.domain.vo.DbghOrderVo;
 import com.pz.system.domain.vo.DbwzOrderVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -17,6 +19,15 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2023-09-11
  */
+@Mapper
 public interface DbwzOrderMapper extends BaseMapperPlus<DbwzOrderMapper, DbwzOrder, DbwzOrderVo> {
     Page<DbwzOrderVo> findDbwzOrderVoPage(IPage<DbwzOrder> iPage, @Param("bo") DbwzOrderBo bo);
+
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/mapper/UserVsitorMapper.java

@@ -3,6 +3,7 @@ package com.pz.system.mapper;
 import com.pz.system.domain.UserVsitor;
 import com.pz.system.domain.vo.UserVsitorVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 就诊人员Mapper接口
@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
  * @author ruoyi
  * @date 2023-09-10
  */
+@Mapper
 public interface UserVsitorMapper extends BaseMapperPlus<UserVsitorMapper, UserVsitor, UserVsitorVo> {
 
 }

pz-system/src/main/java/com/pz/system/mapper/YypzOrderMapper.java

@@ -2,10 +2,12 @@ package com.pz.system.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.system.domain.YypzOrder;
 import com.pz.system.domain.bo.YypzOrderBo;
 import com.pz.system.domain.vo.YypzOrderVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -14,7 +16,15 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2023-09-10
  */
+@Mapper
 public interface YypzOrderMapper extends BaseMapperPlus<YypzOrderMapper, YypzOrder, YypzOrderVo> {
 
     Page<YypzOrderVo> findYypzOrderVoPage(IPage<YypzOrder> iPage, @Param("bo")YypzOrderBo yypzOrderBo);
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/mapper/ZyphOrderMapper.java

@@ -2,6 +2,7 @@ package com.pz.system.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.system.domain.YypzOrder;
 import com.pz.system.domain.ZyphOrder;
 import com.pz.system.domain.bo.YypzOrderBo;
@@ -9,6 +10,7 @@ import com.pz.system.domain.bo.ZyphOrderBo;
 import com.pz.system.domain.vo.YypzOrderVo;
 import com.pz.system.domain.vo.ZyphOrderVo;
 import com.pz.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -17,7 +19,15 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2023-09-11
  */
+@Mapper
 public interface ZyphOrderMapper extends BaseMapperPlus<ZyphOrderMapper, ZyphOrder, ZyphOrderVo> {
 
     Page<ZyphOrderVo> findZyphOrderVoPage(IPage<ZyphOrder> iPage, @Param("bo") ZyphOrderBo zyphOrderBo);
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
 }

pz-system/src/main/java/com/pz/system/service/impl/DbghOrderServiceImpl.java

@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.merchant.domain.vo.SonOrderVo;
+import com.pz.merchant.service.ISonOrderService;
 import com.pz.system.mapper.UserVsitorMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -29,7 +31,7 @@ import java.util.Optional;
  */
 @RequiredArgsConstructor
 @Service
-public class DbghOrderServiceImpl implements IDbghOrderService {
+public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService {
 
     private final DbghOrderMapper baseMapper;
 
@@ -52,8 +54,8 @@ public class DbghOrderServiceImpl implements IDbghOrderService {
         Optional.ofNullable(result.getRecords()).ifPresent(dbghOrderVos -> {
             dbghOrderVos.forEach(dbghOrderVo -> {
                 Optional.ofNullable(userVsitorMapper.selectVoById(dbghOrderVo.getVisitor())).ifPresent(
-                    //就诊人员
-                    userVsitorVo -> dbghOrderVo.setUserVsitorVo(userVsitorVo)
+                    // 就诊人员
+                    dbghOrderVo::setUserVsitorVo
                 );
             });
         });
@@ -111,7 +113,7 @@ public class DbghOrderServiceImpl implements IDbghOrderService {
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(DbghOrder entity) {
-        //TODO 做一些数据校验,如唯一约束
+        // TODO 做一些数据校验,如唯一约束
     }
 
     /**
@@ -120,8 +122,13 @@ public class DbghOrderServiceImpl implements IDbghOrderService {
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
         if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
+            // TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) {
+        return baseMapper.selectSonOrderInfoByTotalId(totalId);
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/DbwzOrderServiceImpl.java

@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.merchant.domain.vo.SonOrderVo;
+import com.pz.merchant.service.ISonOrderService;
 import com.pz.system.mapper.UserVsitorMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -29,7 +31,7 @@ import java.util.Optional;
  */
 @RequiredArgsConstructor
 @Service
-public class DbwzOrderServiceImpl implements IDbwzOrderService {
+public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService {
 
     private final DbwzOrderMapper baseMapper;
 
@@ -52,8 +54,8 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService {
         Optional.ofNullable(result.getRecords()).ifPresent(dbwzOrderVos -> {
             dbwzOrderVos.forEach(dbwzOrderVo -> {
                 Optional.ofNullable(userVsitorMapper.selectVoById(dbwzOrderVo.getVisitor())).ifPresent(
-                    //就诊人员
-                    userVsitorVo -> dbwzOrderVo.setUserVsitorVo(userVsitorVo)
+                    // 就诊人员
+                    dbwzOrderVo::setUserVsitorVo
                 );
             });
         });
@@ -118,7 +120,7 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService {
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(DbwzOrder entity) {
-        //TODO 做一些数据校验,如唯一约束
+        // TODO 做一些数据校验,如唯一约束
     }
 
     /**
@@ -127,8 +129,13 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService {
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
         if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
+            // TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) {
+        return baseMapper.selectSonOrderInfoByTotalId(totalId);
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/YypzOrderServiceImpl.java

@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.merchant.domain.vo.SonOrderVo;
+import com.pz.merchant.service.ISonOrderService;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.UserVsitorMapper;
@@ -32,7 +34,7 @@ import java.util.Optional;
  */
 @RequiredArgsConstructor
 @Service
-public class YypzOrderServiceImpl implements IYypzOrderService {
+public class YypzOrderServiceImpl implements IYypzOrderService, ISonOrderService {
 
     private final YypzOrderMapper baseMapper;
     private final UserVsitorMapper userVsitorMapper;
@@ -53,11 +55,9 @@ public class YypzOrderServiceImpl implements IYypzOrderService {
         Page<YypzOrderVo> result = baseMapper.findYypzOrderVoPage(pageQuery.build(), bo);
         Optional.ofNullable(result.getRecords()).ifPresent(yypzOrderVos -> {
             yypzOrderVos.forEach(yypzOrderVo -> {
-                Optional.ofNullable(userVsitorMapper.selectVoById(yypzOrderVo.getVisitor())).ifPresent(
-                    userVsitorVo ->
-                        //就诊人员
-                        yypzOrderVo.setUserVsitorVo(userVsitorVo)
-                );
+                // 就诊人员
+                Optional.ofNullable(userVsitorMapper.selectVoById(yypzOrderVo.getVisitor()))
+                    .ifPresent(yypzOrderVo::setUserVsitorVo);
             });
         });
         return TableDataInfo.build(result);
@@ -115,7 +115,7 @@ public class YypzOrderServiceImpl implements IYypzOrderService {
      * 保存前的数据校验
      */
     private void validEntityBeforeSave(YypzOrder entity) {
-        //TODO 做一些数据校验,如唯一约束
+        // TODO 做一些数据校验,如唯一约束
     }
 
     /**
@@ -124,8 +124,19 @@ public class YypzOrderServiceImpl implements IYypzOrderService {
     @Override
     public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
         if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
+            // TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     *
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    @Override
+    public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) {
+        return baseMapper.selectSonOrderInfoByTotalId(totalId);
+    }
 }

pz-system/src/main/java/com/pz/system/service/impl/ZyphOrderServiceImpl.java

@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.pz.merchant.domain.vo.SonOrderVo;
+import com.pz.merchant.service.ISonOrderService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.ZyphOrderBo;
@@ -27,7 +29,7 @@ import java.util.Collection;
  */
 @RequiredArgsConstructor
 @Service
-public class ZyphOrderServiceImpl implements IZyphOrderService {
+public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderService {
 
     private final ZyphOrderMapper baseMapper;
 
@@ -115,4 +117,15 @@ public class ZyphOrderServiceImpl implements IZyphOrderService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    /**
+     * 根据主订单ID查询子订单相关信息
+     *
+     * @param totalId 主订单ID
+     * @return 子订单相关信息
+     */
+    @Override
+    public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) {
+        return baseMapper.selectSonOrderInfoByTotalId(totalId);
+    }
 }

pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml

@@ -63,7 +63,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTodayOrderByEid" resultType="com.pz.merchant.domain.vo.OrderInfoVO">
-
+        select total_order.id                                                                                as orderId,
+               total_order.status                                                                            as orderStatus,
+               services.name                                                                                 as project,
+               services.cover,
+               services.price,
+               CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission,
+               services.bid
+        from total_order
+                 left join services on total_order.service_id = services.id
+        <where>
+            date_format(total_order.create_time,'%Y-%m-%d')
+            <if test="id != null and id > 0">
+                and total_order.id = #{id}
+            </if>
+        </where>
     </select>
 
 

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -50,5 +50,14 @@
         </if>
     </select>
 
+    <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
+        select user.nick_name    as userName,
+               dbgh_order.status as orderStatus
+        from dbgh_order
+                 left join sys_user as user on user.user_id = dbgh_order.visitor
+        where dbgh_order.order_id = #{id}
+
+    </select>
+
 
 </mapper>

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -55,5 +55,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
+        select user.nick_name    as userName,
+               dbwz_order.status as orderStatus
+        from dbwz_order
+                 left join sys_user as user on user.user_id = dbwz_order.visitor
+        where dbwz_order.order_id = #{id}
+
+    </select>
+
 
 </mapper>

pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml

@@ -51,4 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
         </if>
     </select>
+
+    <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
+        select user.nick_name    as userName,
+               yypz_order.status as orderStatus
+        from yypz_order
+                 left join sys_user as user on user.user_id = yypz_order.visitor
+        where yypz_order.order_id = #{id}
+    </select>
 </mapper>

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -56,5 +56,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="selectSonOrderInfoByTotalId" resultType="com.pz.merchant.domain.vo.SonOrderVo">
+        select user.nick_name    as userName,
+               zyph_order.status as orderStatus
+        from zyph_order
+                 left join sys_user as user on user.user_id = zyph_order.visitor
+        where zyph_order.order_id = #{id}
+    </select>
+
 
 </mapper>